diff options
Diffstat (limited to 'gentoo/trinity-base/kdelibs/files/kdelibs-3.5.13.1-make-xcomposite-optional.patch')
-rw-r--r-- | gentoo/trinity-base/kdelibs/files/kdelibs-3.5.13.1-make-xcomposite-optional.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/gentoo/trinity-base/kdelibs/files/kdelibs-3.5.13.1-make-xcomposite-optional.patch b/gentoo/trinity-base/kdelibs/files/kdelibs-3.5.13.1-make-xcomposite-optional.patch new file mode 100644 index 000000000..1b7e1c91a --- /dev/null +++ b/gentoo/trinity-base/kdelibs/files/kdelibs-3.5.13.1-make-xcomposite-optional.patch @@ -0,0 +1,28 @@ +--- CMakeLists.txt.orig 2012-10-25 09:20:57.773606598 +0400 ++++ CMakeLists.txt 2012-10-26 07:18:14.793762688 +0400 +@@ -81,5 +81,6 @@ + OPTION( WITH_ASPELL "Enable aspell support" OFF ) + OPTION( WITH_HSPELL "Enable hspell support" OFF ) ++OPTION( WITH_XCOMPOSITE "Enable xcomposite support" ${WITH_ALL_OPTIONS} ) + + + ##### set PKG_CONFIG_PATH ####################### +@@ -564,10 +565,14 @@ + + ##### 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 ###################### + |