[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace/frameworks-scratch] /: Drop X11_XCB library dependency
From:       Martin_Gräßlin <mgraesslin () kde ! org>
Date:       2013-07-24 8:06:32
Message-ID: E1V1u5g-0005ae-GC () scm ! kde ! org
[Download RAW message or body]

Git commit b24ab6875e581551e66fe52a2e8a2ed4bb6afd8a by Martin Gräßlin.
Committed on 23/07/2013 at 10:46.
Pushed by graesslin into branch 'frameworks-scratch'.

Drop X11_XCB library dependency

We don't need it anymore - the xcb connection is also provided by
QX11Info.

M  +0    -5    CMakeLists.txt
M  +0    -1    kwin/CMakeLists.txt
M  +0    -1    kwin/effects/CMakeLists.txt
M  +0    -1    kwin/kcmkwin/kwinrules/CMakeLists.txt
M  +0    -1    kwin/libkwineffects/CMakeLists.txt
M  +1    -2    kwin/libkwineffects/kwinglobals.h
M  +0    -3    kwin/tests/CMakeLists.txt

http://commits.kde.org/kde-workspace/b24ab6875e581551e66fe52a2e8a2ed4bb6afd8a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b6cdb1..69c0c60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,11 +113,6 @@ if(Q_WS_X11)
                          TYPE REQUIRED
                         )
 
-  find_package(X11_XCB)
-  set_package_properties(X11_XCB PROPERTIES DESCRIPTION "XCB X11 protocol client \
                library"
-                         TYPE REQUIRED
-                        )
-
   find_package(X11 REQUIRED)
   set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
                          URL "http://www.x.org"
diff --git a/kwin/CMakeLists.txt b/kwin/CMakeLists.txt
index 22b8cbb..8f1234b 100644
--- a/kwin/CMakeLists.txt
+++ b/kwin/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/kwin/effects/CMakeLists.txt b/kwin/effects/CMakeLists.txt
index bad09f6..3cfffbc 100644
--- a/kwin/effects/CMakeLists.txt
+++ b/kwin/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/kwin/kcmkwin/kwinrules/CMakeLists.txt \
b/kwin/kcmkwin/kwinrules/CMakeLists.txt index a9b809c..ec0cc9d 100644
--- a/kwin/kcmkwin/kwinrules/CMakeLists.txt
+++ b/kwin/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/kwin/libkwineffects/CMakeLists.txt b/kwin/libkwineffects/CMakeLists.txt
index c2e3b19..a02c1a3 100644
--- a/kwin/libkwineffects/CMakeLists.txt
+++ b/kwin/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/kwin/libkwineffects/kwinglobals.h b/kwin/libkwineffects/kwinglobals.h
index 1d2b225..866b279 100644
--- a/kwin/libkwineffects/kwinglobals.h
+++ b/kwin/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/kwin/tests/CMakeLists.txt b/kwin/tests/CMakeLists.txt
index 34d05c6..aa611d2 100644
--- a/kwin/tests/CMakeLists.txt
+++ b/kwin/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}
 )


[prev in list] [next in list] [prev in thread] [next in thread]