Attachment 938 Details for Bug 1289 – patch to fix it.

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] patch to fix it.

tdelibs-make-xcomposite-optional.patch (text/plain), 1.18 KB, created by Alexander Golubev (Fat-Zer) on 2012-10-25 22:28:58 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Golubev (Fat-Zer)

Created: 2012-10-25 22:28:58 CDT

Size: 1.18 KB

patch

obsolete

>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index 78d72aa..9e37390 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -84,6 +84,7 @@ OPTION( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
> OPTION( WITH_INOTIFY "Enable inotify support for kio" ON )
> OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} )
> OPTION( WITH_NETWORK_MANAGER_BACKEND "Enable network-manager support" OFF )
>+OPTION( WITH_XCOMPOSITE "Enable xcomposite support" ${WITH_ALL_OPTIONS} )
> 
> OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} )
> OPTION( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} )
>@@ -570,10 +571,14 @@ endif( XRENDER_FOUND )
> 
> ##### check for xcomposite #########################
> 
>-pkg_search_module( XCOMPOSITE xcomposite )
>-if( XCOMPOSITE_FOUND )
>-  set( HAVE_XCOMPOSITE 1 )
>-endif( XCOMPOSITE_FOUND )
>+if( WITH_XCOMPOSITE )
>+  pkg_search_module( XCOMPOSITE xcomposite )
>+  if( XCOMPOSITE_FOUND )
>+    set( HAVE_XCOMPOSITE 1 )
>+  else()
>+    message(FATAL_ERROR "\nxcomposite support was requested, but xcomposite was not found on your system" )
>+  endif( XCOMPOSITE_FOUND )
>+endif( WITH_XCOMPOSITE )
> 
> ##### check for libxml-2.0 ######################
>

Actions: View | Diff

Attachments on bug 1289: 938 | 939 | 941 | 1314 | 1315 | 1316