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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 33 insertions, 14 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/Manifest b/kde-base/systemsettings/Manifest
index 7aca6475b980..11d1dff40d9c 100644
--- a/kde-base/systemsettings/Manifest
+++ b/kde-base/systemsettings/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX systemsettings-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
 DIST kdebase-workspace-4.3.3.tar.bz2 62496238 RMD160 48ab90a519c7811e9fe4aa4e77f06134d2dc4afa SHA1 2839e913cecef8ead0685bd50e9515ccd8bc0a9d SHA256 b66b4e3eefe88edfd9ddd0501b2b6eece39b85fd78f2320967b937f2529c6d3b
 DIST kdebase-workspace-4.3.5.tar.bz2 62525359 RMD160 dcf04a40412ba236365423afc877ea0c2066f972 SHA1 703582cb8a3471c5821986dbdfc3c6deedac0ff3 SHA256 7985634ed1f87889bcd6613ef41127196df442017bf895be6fb2afb196ce149b
 DIST kdebase-workspace-4.4.1.tar.bz2 77053467 RMD160 e841cdfda3d35c1f76acad137abf7fa7644da541 SHA1 f72e0e31c2ea4dc377e7fc14f2a0f5fb6304e71e SHA256 b25c0e13ab1798ffe067e2cd7d5c9afb5f05d0b771306eb84a4bd76a4574ac6a
@@ -8,13 +6,6 @@ DIST kdebase-workspace-4.4.2.tar.bz2 77039701 RMD160 0558ff2102cb380127667a94b69
 EBUILD systemsettings-4.3.3.ebuild 1944 RMD160 d9c51a224c4dbe020deb71d03cd2962b8530f89d SHA1 ea125c52a0a6f27e27474ebd47f77d60b6861952 SHA256 494789d2d93208533295bc55041435050b6d8a3e42388465f8f8dd2b135b4d2a
 EBUILD systemsettings-4.3.5.ebuild 1933 RMD160 fbbe8f204d26908bbf2d433acc620f3b4b7885ac SHA1 ffa629e5273f84490b70cebcf9ac22b8650be29d SHA256 0ddb5e924f5277523a6f089a4316111e959e3cc39864035b02cd853e14f4512f
 EBUILD systemsettings-4.4.1.ebuild 1971 RMD160 42f04d080158f42abc4fb1fc8c5346a212bf1c2c SHA1 cff638059526782b150e5acb64105f3377b16a46 SHA256 b5cf3c8b3672143ccbf029ba21436769714ae9c754450dade2dedb9ef4f21594
-EBUILD systemsettings-4.4.2.ebuild 1980 RMD160 e97cb09d9bd6b1d8786f335f72b9623a534a9342 SHA1 0d5c069e6f516bf6078926a4f6a6b133063b2758 SHA256 f5f201c5e766d1ca7121bb1317a101a4963f61fcf1b9cbcc4028ecab7ba0ce99
-MISC ChangeLog 11057 RMD160 82ca9bc32c24a5002836ceb07b16d6540c1a66ab SHA1 981a5f24ac3b93b24d9d1a705396275832f49866 SHA256 365d1720354121f067eefed0e0daba0daf271e340ef0cf0e5236da6f926c34bb
+EBUILD systemsettings-4.4.2-r1.ebuild 2053 RMD160 5be95a5b7c1abb6bde9bc31cee06687eb3b177f9 SHA1 55f54fbbe395507a011026ffcb2da77fa24eb8a7 SHA256 7b9dac6bbb999cb4bf6bf5302b778871a61794cf716800f018a14ffa2f46ae8f
+MISC ChangeLog 11361 RMD160 f54e77b8b0d4c7ff2981d29db43e000f085b6736 SHA1 8bfd900dc6e82092a421b63d29dc124ae834ce3a SHA256 406eef108aeae289c92ec66d2c03048c0fefb4db8c35cf61366e2833cd2b06a1
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkveYwMACgkQvFcC4BYPU0praQCfRJtyyNUt9RfZB6RKk3sZfhD0
-K0oAn22ZyIrrv7+3wMAfKohyHjdBkE98
-=4W+c
------END PGP SIGNATURE-----
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}