Fix Xinerama automagic

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

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 88d88e964a3ceece4ed2f8d80e340bc0e4859e4d..556559ed8a1bab0f4eb62069f9e8cd474ba588f0 100644 (file)
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.64 2010/05/03 21:43:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.65 2010/05/04 00:56:53 reavertm Exp $
+
+  04 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  plasma-workspace-4.4.2.ebuild,
+  +files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch,
+  plasma-workspace-4.4.3.ebuild:
+  Fix Xinerama automagic
 
 *plasma-workspace-4.4.3 (03 May 2010)
 

diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index 31eb87a1622ca7dc2d39f033d494aabbd69f5343..5dccb879cfb995227112a8a81dce1a950df36350 100644 (file)
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 4.3.3-progress_indicator.patch 1620 RMD160 c0b70bae4d6966b71cb7f505b0626a6bbe5560bd SHA1 13f8288ce3738ad90d123f2fed094f621379d2b7 SHA256 792032dc6442625f04b9e80af20f66c77e7acdc20b29ff9f35ef6a038a736d78
+AUX plasma-workspace-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
@@ -10,14 +8,7 @@ DIST kdebase-workspace-4.4.3.tar.bz2 77035367 RMD160 df3d9ceaab33d08ea27cd1206c3
 EBUILD plasma-workspace-4.3.3-r1.ebuild 2858 RMD160 abd90d2e839b6d72b272b5ad4978987f3720a5e6 SHA1 64d378807b36a656f9f8a37c391a6b64ca5a5910 SHA256 53b83e1fb463a7dabadbd47dfa2f48ad1fea63e61cb04bc6e477a09da8d874bf
 EBUILD plasma-workspace-4.3.5.ebuild 2563 RMD160 ddb8bec7d2cf766cec3e47a45bd143f6316830b0 SHA1 8aeeaf5bbacdb9685f7657bebc0a05cfc4a7bc4d SHA256 fdcbbbeeb4761330a4a8d40f50e1df3ecdff5e60b863e01b6a9b0d512039f6c1
 EBUILD plasma-workspace-4.4.1.ebuild 2519 RMD160 9695bd3399061caffb36311b369e006f7c9a3cbf SHA1 629b15fc6c55c350c7aa3e88b0a7fdeafbc16fe9 SHA256 674ddc1f5558292604bf47446008896b75de998abc3bd4617832199b20da0fad
-EBUILD plasma-workspace-4.4.2.ebuild 2712 RMD160 baca244fc43647ab0faac9cef1c5fb612d792d16 SHA1 f27b48c84fc0c89c79ffd2abdf54efcf70e7599e SHA256 8d6f7e0ecd9596ed698f99af50855b5f1f635840d04fae5daae39ed0740e9966
-EBUILD plasma-workspace-4.4.3.ebuild 2710 RMD160 eea2540534905a9adb40379b2b4d115548fd1b7e SHA1 2c0a7e4c5233008ad29834579b06734e360cdab4 SHA256 f35cd86a8a7b014572e2d9bbd53c147b96d6c2a3b91f48f507da96a7ace5553b
-MISC ChangeLog 9247 RMD160 0ed86f7409d45a259c0d1e7ab2e5dc112fa55ef0 SHA1 febe6a30e1432d92d85d0715609567ab55b76ad2 SHA256 b85c0d9f13e48a729e657b6fa7d6004654725ba43526108208ecd797a249c5c1
+EBUILD plasma-workspace-4.4.2.ebuild 2831 RMD160 e5cc1676e76fa5b6b0ee569af515695e875b04c1 SHA1 5b97cc6aa0092f4afa0631b80d3dea27ee105ec7 SHA256 63e442cc43916bfc4369a3d4162b0b89cb62bb155ebc3d8b2d2acf455f74edb0
+EBUILD plasma-workspace-4.4.3.ebuild 2831 RMD160 16f039b842c1eb938a5e5155373e838243e54eaf SHA1 0ba1745c094cdc36a88b54e30cd4baec90520d55 SHA256 94ae34e5d1ef566d9788a7803e7f51b075e4abb30fd502fbe6014bf10838701c
+MISC ChangeLog 9459 RMD160 80f923390069d5e799f8bb2520a2dff6db37193d SHA1 796cb543c0ef10032c477bcd9f6027222e5b1b12 SHA256 462811fcd7a7790d07605a038fede8df8de70dabbca70c290647889ac3d3dd6b
 MISC metadata.xml 332 RMD160 ca0d953faef7f42984b0853648b9524c304c7c46 SHA1 e79c7f7b292068daf0a6d5db386ff58fc4f9d6cd SHA256 55cde5f777627192cf9ae1935355902d496a45070fffe5a5ba2abd41168b4ce8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkvfRA4ACgkQ5BmOA85PVLjJBQCgn71sTxUvGLpjKY5vRAAcu4gp
-kYwAn2tHNf+LfKMAMANuv9K2Ky4yQo8y
-=V99/
------END PGP SIGNATURE-----

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch
new file mode 100644 (file)
index 0000000..5596f41
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-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/plasma-workspace/plasma-workspace-4.4.2.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild
index 151d154fdd976683f9ef682786843305da8abbcf..b2072ed7d002f90436c20372a3ed6e94a410cd10 100644 (file)
--- a/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.4.2.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/plasma-workspace/plasma-workspace-4.4.2.ebuild,v 1.2 2010/04/29 04:21:21 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild,v 1.3 2010/05/04 00:56:53 reavertm Exp $
 
 EAPI="3"
 
@@ -57,6 +57,10 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
+PATCHES=(
+       "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+)
+
 pkg_setup() {
        python_set_active_version 2
        kde4-meta_pkg_setup
@@ -78,6 +82,7 @@ src_configure() {
                $(cmake-utils_use_with python PyKDE4)
                $(cmake-utils_use_with rss KdepimLibs)
                $(cmake-utils_use_with semantic-desktop Nepomuk)
+               $(cmake-utils_use_with xinerama X11_Xinerama)
                -DWITH_Xmms=OFF
        )
 

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.4.3.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.4.3.ebuild
index d7d339b2acb5a94ff5ea3e5d8bb0e325311c4af8..b6fa6cabcc69ecf4e408d583cbb1acadb9651a4e 100644 (file)
--- a/kde-base/plasma-workspace/plasma-workspace-4.4.3.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.4.3.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/plasma-workspace/plasma-workspace-4.4.3.ebuild,v 1.1 2010/05/03 21:43:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.4.3.ebuild,v 1.2 2010/05/04 00:56:53 reavertm Exp $
 
 EAPI="3"
 
@@ -57,6 +57,10 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
+PATCHES=(
+       "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+)
+
 pkg_setup() {
        python_set_active_version 2
        kde4-meta_pkg_setup
@@ -78,6 +82,7 @@ src_configure() {
                $(cmake-utils_use_with python PyKDE4)
                $(cmake-utils_use_with rss KdepimLibs)
                $(cmake-utils_use_with semantic-desktop Nepomuk)
+               $(cmake-utils_use_with xinerama X11_Xinerama)
                -DWITH_Xmms=OFF
        )