Fix Xinerama automagic, bug 312513, thanks for Andreas K. Huettel (dilfridge)

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 30 insertions, 2 deletions

diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index b561bfaf1da3..d5755ae1a8c0 100644
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/systemsettings
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.74 2010/05/03 05:45:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.75 2010/05/03 19:37:59 reavertm Exp $
+
+*systemsettings-4.4.2-r1 (03 May 2010)
+
+  03 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -systemsettings-4.4.2.ebuild, +systemsettings-4.4.2-r1.ebuild,
+  +files/systemsettings-4.4.2-xinerama_cmake_automagic.patch:
+  Fix Xinerama automagic, bug 312513, thanks for Andreas K. Huettel
+  (dilfridge)
 
   03 May 2010; Alexis Ballier <aballier@gentoo.org>
   systemsettings-4.4.2.ebuild:
diff --git a/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch b/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch
new file mode 100644
index 000000000000..5596f415d848
--- /dev/null
+++ b/kde-base/systemsettings/files/systemsettings-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
diff --git a/kde-base/systemsettings/systemsettings-4.4.2.ebuild b/kde-base/systemsettings/systemsettings-4.4.2-r1.ebuild
index eabdc7c5a26e..3e6d708bff96 100644
--- a/kde-base/systemsettings/systemsettings-4.4.2.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.4.2.ebuild,v 1.2 2010/05/03 05:45:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.4.2-r1.ebuild,v 1.1 2010/05/03 19:37:59 reavertm Exp $
 
 EAPI="3"
 
@@ -51,6 +51,8 @@ KMEXTRACTONLY="
 
 add_blocker kcontrol '<4.3.98'
 
+PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" )
+
 src_unpack() {
 	if use handbook; then
 		KMEXTRA="${KMEXTRA}