summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2010-05-04 00:51:38 +0000
committerMaciej Mrozowski <reavertm@gentoo.org>2010-05-04 00:51:38 +0000
commitd16bb4808fc57d630c29992f05b649d51cc76d45 (patch)
tree8ef00e18fcdd6509eb67ba55081f9af08afafbe1 /kde-base/kwin/files
parentRemoved old versions. (diff)
downloadgentoo-2-d16bb4808fc57d630c29992f05b649d51cc76d45.tar.gz
gentoo-2-d16bb4808fc57d630c29992f05b649d51cc76d45.tar.bz2
gentoo-2-d16bb4808fc57d630c29992f05b649d51cc76d45.zip
Fix Xinerama automagic
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kwin/files')
-rw-r--r--kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch b/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch
new file mode 100644
index 000000000000..5596f415d848
--- /dev/null
+++ b/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch
@@ -0,0 +1,18 @@
+diff -r -u kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake kdebase-workspace-4.4.2/ConfigureChecks.cmake
+--- kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake 2009-11-21 10:44:36.000000000 +0100
++++ kdebase-workspace-4.4.2/ConfigureChecks.cmake 2010-04-02 00:04:32.000000000 +0200
+@@ -71,7 +71,14 @@
+ 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
++
++if(NOT WITH_X11_Xinerama)
++ set(X11_Xinerama_FOUND FALSE)
++ MESSAGE(STATUS "Disabling Xinerama as requested on commandline.")
++endif(NOT WITH_X11_Xinerama)
++
+ macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA)
++
+ macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin
+ macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker
+ macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock