From 16f2716eefd5b87316e3f9be4027cc984cffee40 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Wed, 8 Jul 2020 16:35:47 +0200 Subject: [PATCH] Switch to Xext instead of xcb-shape. Signed-off-by: gregory guy --- ConfigureChecks.cmake | 10 +++++----- client/CMakeLists.txt | 6 +++--- domino/CMakeLists.txt | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index c89e244..988d4ab 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -38,13 +38,13 @@ if( NOT XFT_FOUND ) endif( NOT XFT_FOUND ) -##### check for xcb-shape +##### check for Xext -pkg_search_module( XCB_SHAPE xcb-shape ) +pkg_search_module( XEXT xext ) -if( NOT XCB_SHAPE_FOUND ) - tde_message_fatal("xcb-shape is required but was not found on your system" ) -endif( NOT XCB_SHAPE_FOUND ) +if( NOT XEXT_FOUND ) + tde_message_fatal("Xext is required but was not found on your system" ) +endif( NOT XEXT_FOUND ) ##### check for freetype2 diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index c9f8372..01ad925 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -8,13 +8,13 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} - ${XCB_SHAPE_INCLUDE_DIRS} + ${XEXT_INCLUDE_DIRS} ) link_directories( ${TQT_LIBRARY_DIRS} ${TDE_LIBRARY_DIRS} - ${XCB_SHAPE_LIBRARY_DIRS} + ${XEXT_LIBRARY_DIRS} ) @@ -28,7 +28,7 @@ tde_add_kpart( twin3_domino AUTOMOC tdecore-shared tdecorations-shared ${X11_LIBRARIES} - ${XCB_SHAPE_LIBRARIES} + ${XEXT_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/domino/CMakeLists.txt b/domino/CMakeLists.txt index 0c2285f..bdad05a 100644 --- a/domino/CMakeLists.txt +++ b/domino/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories( ${TQT_INCLUDE_DIRS} ${X11_INCLUDE_DIR} ${XFT_INCLUDE_DIRS} - ${XCB_SHAPE_INCLUDE_DIRS} + ${XEXT_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} ) @@ -15,7 +15,7 @@ link_directories( ${TDE_LIBRARY_DIRS} ${X11_LIBRARY_DIRS} ${XFT_LIBRARY_DIRS} - ${XCB_SHAPE_LIBRARY_DIRS} + ${XEXT_LIBRARY_DIRS} ${FREETYPE_LIBRARY_DIRS} ) @@ -29,7 +29,7 @@ tde_add_library( domino_style STATIC_PIC AUTOMOC LINK tdecore-shared tdeui-shared tdeutils-shared ${X11_LIBRARIES} ${XFT_LIBRARIES} - ${XCB_SHAPE_LIBRARIES} ${FREETYPE_LIBRARIES} + ${X11_Xrender_LIB} ${FREETYPE_LIBRARIES} )