Switch to Xext instead of xcb-shape.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
pull/1/head
gregory guy 4 years ago
parent c1e02c1bae
commit 16f2716eef
No known key found for this signature in database
GPG Key ID: 3BCCA0F7AB4536F4

@ -38,13 +38,13 @@ if( NOT XFT_FOUND )
endif( 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 ) if( NOT XEXT_FOUND )
tde_message_fatal("xcb-shape is required but was not found on your system" ) tde_message_fatal("Xext is required but was not found on your system" )
endif( NOT XCB_SHAPE_FOUND ) endif( NOT XEXT_FOUND )
##### check for freetype2 ##### check for freetype2

@ -8,13 +8,13 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${XCB_SHAPE_INCLUDE_DIRS} ${XEXT_INCLUDE_DIRS}
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TQT_LIBRARY_DIRS}
${TDE_LIBRARY_DIRS} ${TDE_LIBRARY_DIRS}
${XCB_SHAPE_LIBRARY_DIRS} ${XEXT_LIBRARY_DIRS}
) )
@ -28,7 +28,7 @@ tde_add_kpart( twin3_domino AUTOMOC
tdecore-shared tdecore-shared
tdecorations-shared tdecorations-shared
${X11_LIBRARIES} ${X11_LIBRARIES}
${XCB_SHAPE_LIBRARIES} ${XEXT_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -6,7 +6,7 @@ include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${X11_INCLUDE_DIR} ${X11_INCLUDE_DIR}
${XFT_INCLUDE_DIRS} ${XFT_INCLUDE_DIRS}
${XCB_SHAPE_INCLUDE_DIRS} ${XEXT_INCLUDE_DIRS}
${FREETYPE_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS}
) )
@ -15,7 +15,7 @@ link_directories(
${TDE_LIBRARY_DIRS} ${TDE_LIBRARY_DIRS}
${X11_LIBRARY_DIRS} ${X11_LIBRARY_DIRS}
${XFT_LIBRARY_DIRS} ${XFT_LIBRARY_DIRS}
${XCB_SHAPE_LIBRARY_DIRS} ${XEXT_LIBRARY_DIRS}
${FREETYPE_LIBRARY_DIRS} ${FREETYPE_LIBRARY_DIRS}
) )
@ -29,7 +29,7 @@ tde_add_library( domino_style STATIC_PIC AUTOMOC
LINK LINK
tdecore-shared tdeui-shared tdeutils-shared tdecore-shared tdeui-shared tdeutils-shared
${X11_LIBRARIES} ${XFT_LIBRARIES} ${X11_LIBRARIES} ${XFT_LIBRARIES}
${XCB_SHAPE_LIBRARIES} ${FREETYPE_LIBRARIES} ${X11_Xrender_LIB} ${FREETYPE_LIBRARIES}
) )

Loading…
Cancel
Save