From 9ab751042ab8c7e09a6c44a2e199503e7c571753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Tue, 23 Jul 2013 12:46:04 +0200
Subject: [PATCH] Drop X11_XCB library dependency

We don't need it anymore - the xcb connection is also provided by
QX11Info.
---
 CMakeLists.txt                   | 1 -
 effects/CMakeLists.txt           | 1 -
 kcmkwin/kwinrules/CMakeLists.txt | 1 -
 libkwineffects/CMakeLists.txt    | 1 -
 libkwineffects/kwinglobals.h     | 3 +--
 tests/CMakeLists.txt             | 3 ---
 6 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22b8cbb1b8..8f1234bcf3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -247,7 +247,6 @@ set(kwin_XLIB_LIBS
 
 set(kwin_XCB_LIBS
     ${XCB_XCB_LIBRARIES}
-    ${X11_XCB_LIBRARIES}
     ${XCB_XFIXES_LIBRARIES}
     ${XCB_DAMAGE_LIBRARIES}
     ${XCB_COMPOSITE_LIBRARIES}
diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
index bad09f6640..3cfffbc602 100644
--- a/effects/CMakeLists.txt
+++ b/effects/CMakeLists.txt
@@ -19,7 +19,6 @@ set(kwin_effect_XLIB_LIBS
 
 set(kwin_effect_XCB_LIBS
     ${XCB_XCB_LIBRARIES}
-    ${X11_XCB_LIBRARIES}
     ${XCB_IMAGE_LIBRARIES}
     ${XCB_XFIXES_LIBRARIES}
 )
diff --git a/kcmkwin/kwinrules/CMakeLists.txt b/kcmkwin/kwinrules/CMakeLists.txt
index a9b809c6b4..ec0cc9dc73 100644
--- a/kcmkwin/kwinrules/CMakeLists.txt
+++ b/kcmkwin/kwinrules/CMakeLists.txt
@@ -13,7 +13,6 @@ kde4_add_kdeinit_executable( kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS}
 
 set(kwin_kcm_rules_XCB_LIBS
     ${XCB_XCB_LIBRARIES}
-    ${X11_XCB_LIBRARIES}
 )
 
 target_link_libraries(kdeinit_kwin_rules_dialog ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${KACTIVITIES_LIBRARY} ${kwin_kcm_rules_XCB_LIBS})
diff --git a/libkwineffects/CMakeLists.txt b/libkwineffects/CMakeLists.txt
index c2e3b1999e..a02c1a3172 100644
--- a/libkwineffects/CMakeLists.txt
+++ b/libkwineffects/CMakeLists.txt
@@ -29,7 +29,6 @@ set(kwineffects_XLIB_LIBS
 
 set(kwineffects_XCB_LIBS
     ${XCB_XCB_LIBRARIES}
-    ${X11_XCB_LIBRARIES}
     ${XCB_XFIXES_LIBRARIES}
     ${XCB_RENDER_LIBRARIES}
 )
diff --git a/libkwineffects/kwinglobals.h b/libkwineffects/kwinglobals.h
index 1d2b225dea..866b279b52 100644
--- a/libkwineffects/kwinglobals.h
+++ b/libkwineffects/kwinglobals.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kdemacros.h>
 
 #include <X11/Xlib.h>
-#include <X11/Xlib-xcb.h>
 #include <fixx11h.h>
 #include <xcb/xcb.h>
 
@@ -127,7 +126,7 @@ KWIN_EXPORT xcb_connection_t *connection()
 {
     static xcb_connection_t *s_con = NULL;
     if (!s_con) {
-        s_con = XGetXCBConnection(display());
+        s_con = QX11Info::connection();
     }
     return s_con;
 }
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 34d05c6a4f..aa611d2d77 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -56,7 +56,6 @@ target_link_libraries( testClientMachine
                        KF5::KWindowSystem
                        ${XCB_XCB_LIBRARIES}
                        ${XCB_XFIXES_LIBRARIES}
-                       ${X11_XCB_LIBRARIES}
                        ${X11_X11_LIB} # to make jenkins happy
                        ${X11_Xcursor_LIB}
 )
@@ -74,7 +73,6 @@ target_link_libraries( testXcbWrapper
                        ${Qt5X11Extras_LIBRARIES}
                        ${Qt5Widgets_LIBRARIES}
                        ${XCB_XCB_LIBRARIES}
-                       ${X11_XCB_LIBRARIES}
 )
 
 ########################################################
@@ -90,5 +88,4 @@ target_link_libraries( testXcbWindow
                        ${Qt5X11Extras_LIBRARIES}
                        ${Qt5Widgets_LIBRARIES}
                        ${XCB_XCB_LIBRARIES}
-                       ${X11_XCB_LIBRARIES}
 )