diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-15 15:03:04 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-15 15:03:04 +0000 |
commit | 25a6e231e30c84a01e177cd545b2e86d366f9050 (patch) | |
tree | 5dac1ca98e8503256ebb699cbac281e55cc53db8 /kde-base/kwin/files | |
parent | Bump to 0.9_rc3, from gnome overlay for great justice (and GNOME 3) (diff) | |
download | gentoo-2-25a6e231e30c84a01e177cd545b2e86d366f9050.tar.gz gentoo-2-25a6e231e30c84a01e177cd545b2e86d366f9050.tar.bz2 gentoo-2-25a6e231e30c84a01e177cd545b2e86d366f9050.zip |
Fix xcomposite automagic, bug 376785
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kwin/files')
-rw-r--r-- | kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch b/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch new file mode 100644 index 000000000000..726abe9a5962 --- /dev/null +++ b/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch @@ -0,0 +1,16 @@ +diff -ruN kwin-4.7.0.orig/ConfigureChecks.cmake kwin-4.7.0/ConfigureChecks.cmake +--- kwin-4.7.0.orig/ConfigureChecks.cmake 2011-05-20 22:32:06.000000000 +0200 ++++ kwin-4.7.0/ConfigureChecks.cmake 2011-08-15 16:56:52.165002024 +0200 +@@ -67,6 +67,12 @@ + macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM) # kwin, ksplash + macro_bool_to_01(X11_XTest_FOUND HAVE_XTEST) # khotkeys, kxkb, kdm + macro_bool_to_01(X11_Xcomposite_FOUND HAVE_XCOMPOSITE) # kicker, kwin ++ ++if(NOT WITH_X11_Xcomposite) ++ set(X11_Xcomposite_FOUND FALSE) ++ MESSAGE(STATUS "Disabling Xcomposite as requested on commandline.") ++endif(NOT WITH_X11_Xcomposite) ++ + macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses + macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin + macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin |