Attachment 2475 Details for Bug 2410 – Fix FTBFS when build without xcomposite support

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Fix FTBFS when build without xcomposite support

tdelibs-fix-build-without-xcomposite.diff (text/plain), 2.15 KB, created by Slávek Banko on 2015-04-04 08:59:24 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2015-04-04 08:59:24 CDT

Size: 2.15 KB

patch

obsolete

>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index f43dcb7..b8f384b 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -101,6 +101,7 @@ OPTION( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} )
> OPTION( WITH_LIBBFD "Enable pretty backtraces with libbfd from GNU binutils" OFF )
> OPTION( WITH_XRANDR "Build the tderandr library" ON )
> OPTION( WITH_XCOMPOSITE "Enable xcomposite support" ON )
>+OPTION( WITH_MITSHM "Use MIT-SHM for pixmap loading/saving" ${WITH_ALL_OPTIONS} )
> OPTION( WITH_KDE4_MENU_SUFFIX "Add [KDE4] tag to KDE4 menu items" OFF )
> 
> OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} )
>@@ -690,6 +691,7 @@ else( XRENDER_FOUND)
>   message(FATAL_ERROR "\nxrender support is required, but not found on your system" )
> endif( XRENDER_FOUND )
> 
>+
> ##### check for xcomposite #########################
> 
> if( WITH_XCOMPOSITE )
>@@ -699,13 +701,30 @@ if( WITH_XCOMPOSITE )
>   else( WITH_XCOMPOSITE )
>     tde_message_fatal( "xcomposite support was requested, but xcomposite was not found on your system" )
>   endif( XCOMPOSITE_FOUND )
>+endif( WITH_XCOMPOSITE )
>+
>+
>+##### check for mit-shm extension ##################
> 
>-  # xext (tderandr, tdestyles/keramik, tdeui)
>+if( WITH_MITSHM )
>+  tde_save_and_set( CMAKE_REQUIRED_FLAGS "-include X11/Xlib.h" )
>+  check_include_file( "X11/extensions/XShm.h" HAVE_MITSHM )
>+  tde_restore( CMAKE_REQUIRED_FLAGS )
>+  if( NOT HAVE_MITSHM )
>+    tde_message_fatal( "XShm extension is required, but was not found on your system" )
>+  endif( NOT HAVE_MITSHM )
>+endif( WITH_MITSHM )
>+
>+
>+##### check for xext ###############################
>+
>+if( HAVE_XRENDER OR WITH_XCOMPOSITE OR WITH_XRANDR OR HAVE_X11_EXTENSIONS_SHAPE_H OR WITH_MITSHM )
>+  # xext (tdecore, tdeui, tderandr, tdestyles/keramik)
>   pkg_search_module( XEXT xext )
>   if( NOT XEXT_FOUND )
>-    tde_message_fatal( "xext is required for xcomposite support, but was not found on your system" )
>+    tde_message_fatal( "xext is required, but was not found on your system" )
>   endif( )
>-endif( WITH_XCOMPOSITE )
>+endif( HAVE_XRENDER OR WITH_XCOMPOSITE OR WITH_XRANDR OR HAVE_X11_EXTENSIONS_SHAPE_H OR WITH_MITSHM )
> 
> 
> ##### check for libxml-2.0 ######################

Actions: View | Diff

Attachments on bug 2410: 2475