Fix Xinerama automagic

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

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index f49af8ded131d61fa6214b4fa670e0ae5e1f2e0d..9507053dfdbda1ccb0b22dd141b64b52d6c6c5e6 100644 (file)
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.195 2010/05/03 22:09:50 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.196 2010/05/04 00:51:37 reavertm Exp $
+
+  04 May 2010; Maciej Mrozowski <reavertm@gentoo.org> kwin-4.4.2.ebuild,
+  +files/kwin-4.4.2-xinerama_cmake_automagic.patch, kwin-4.4.3.ebuild:
+  Fix Xinerama automagic
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kwin-4.4.1.ebuild:
   Drop KDE SC 4.4.1

diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index d0567ea01148526864ee5b20ba68747fd2d18ffc..c60b7e4e47a1c0525167386ec8b360b6de6017a6 100644 (file)
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 4.3.3-fix_no_opengl.patch 934 RMD160 6df27a18bce8016ac5b745eade2c526d96fd88d4 SHA1 9bc83679e4bf8fe8d7ee7d9cd004bb6c55c069e7 SHA256 2174b72f8694a6a13085d572852028168645f0dfdfd8c36b944cdd9e61d4c4db
 AUX 4.3.5-magiclamp-minimize.patch 5982 RMD160 6ca56018a6b8b5fafa228ff8b7feefb97d910547 SHA1 816ea0c92cb90fe95421567e5172aeb362aa6f39 SHA256 8527833e3fd374883b84315b9fd2c7b4a3beea7c53a4a724696f0d9ece3d418e
+AUX kwin-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.2.tar.bz2 77039701 RMD160 0558ff2102cb380127667a94b69ccb90f656266c SHA1 5fd38e48c6ddcf551bb49cf8841ba23b7682ee5b SHA256 8c32bda86e9ec67244ea2996a7e710ed04f0bb532c691af7d366c278f9b519bd
 DIST kdebase-workspace-4.4.3.tar.bz2 77035367 RMD160 df3d9ceaab33d08ea27cd1206c33b3ead9266a42 SHA1 efd427dfe8b7beebdfe162006689871c61991336 SHA256 7f56b2b12f2ca78deea31981bc47de2862d409d99b7bcda90054715d97999239
 EBUILD kwin-4.3.3-r1.ebuild 1358 RMD160 1ae3dc7b9095369069b79945f0fd34bf8239bb8d SHA1 f5ea96dbc073c83591e5ab691a44242272ab7c19 SHA256 5eebd85375e0e75c6f153e31a9cd5e76110bf74282d074553a36afa1c8c55790
 EBUILD kwin-4.3.5-r1.ebuild 1470 RMD160 015e3ce7a038d64415143cd62aab70ee3f212fbe SHA1 8fa8f0ab92314c21eb39b79731b91e638e4719fc SHA256 8f4d229807d56874ab45f7d24490d4a866af1f0b4dc40993043a0bc7de021268
-EBUILD kwin-4.4.2.ebuild 1369 RMD160 fd76c52dc0d97968f3cd4e31d4a6096f1d8ee958 SHA1 0b5980bfd3e67589c54f2d7baa43050767591f5d SHA256 0d1a7b4ece03e00976372a9ad706c08bc48d7aa5494a3fa54576da2be2206145
-EBUILD kwin-4.4.3.ebuild 1370 RMD160 31ecf9eeaba41f6c9e1572a9332a33d684045e1d SHA1 4ff4ef61606bb9d6b3d1b8081c7dbb1d0e04f101 SHA256 e9709808f032ba2d7a7d881d7b41b1e82bc235a445ed265b31833dd2470325dc
-MISC ChangeLog 23517 RMD160 6828aacaef7e4f90f1aef1304fb555a0ede64105 SHA1 d2d65a7e94ebf662949c601ffe093049b2e05c1e SHA256 7f3cb6afd065851874c9d48dae3bbd9606649f6e0b572a2db046a50af1e52b85
+EBUILD kwin-4.4.2.ebuild 1491 RMD160 4aad39b9c6a2a535c23a49e6887df743e20a378c SHA1 7e6c5b228ff0eee30ea081fba75b7e6304eb8ea5 SHA256 34cc6d6a39616abf81e1a18819517ada251703ad46288bde73c9792ffeb26a27
+EBUILD kwin-4.4.3.ebuild 1491 RMD160 a1a07f6fcd2bd627e543532504b20ce727d4e9fe SHA1 83f0e2e78967840d9e43a0f0f427ed7bc31157fa SHA256 2c6b685616b4e36d30ba01e2631b291aa4100cb9c0e2300a0e3664faf42b527a
+MISC ChangeLog 23689 RMD160 25e4b05d2c8e146c86e6de5cfe6261092624a5f5 SHA1 6cc902a896458a2f124b39bd1391713fc2e80d51 SHA256 32971feb6456e62ef193292e50069c0ba4c4fdcacb61d6526283ff5cdeefde85
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkvfSjgACgkQ5BmOA85PVLjtsgCffvOR32soK6hr+NSWl0Wy1ONR
-QcMAoJfcsnhvQYxQKTJVAO1SwT6EAJgf
-=DNHC
------END PGP SIGNATURE-----

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 (file)
index 0000000..5596f41
--- /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

diff --git a/kde-base/kwin/kwin-4.4.2.ebuild b/kde-base/kwin/kwin-4.4.2.ebuild
index f3834d8f2c89dc041c9da3752eab4bbf3468a6b4..2bd99687e53fb22bf978a76deae874abc0c1bd9d 100644 (file)
--- a/kde-base/kwin/kwin-4.4.2.ebuild
+++ b/kde-base/kwin/kwin-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/kwin/kwin-4.4.2.ebuild,v 1.1 2010/03/30 21:48:53 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.4.2.ebuild,v 1.2 2010/05/04 00:51:37 reavertm Exp $
 
 EAPI="3"
 
@@ -34,6 +34,10 @@ DEPEND="${COMMONDEPEND}
 "
 RDEPEND="${COMMONDEPEND}"
 
+PATCHES=(
+       "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+)
+
 src_prepare() {
 # NOTE uncomment when enabled again by upstream
 #      if ! use captury; then
@@ -48,6 +52,7 @@ src_prepare() {
 src_configure() {
        mycmakeargs=(
                $(cmake-utils_use_with opengl OpenGL)
+               $(cmake-utils_use_with xinerama X11_Xinerama)
        )
 
        kde4-meta_src_configure

diff --git a/kde-base/kwin/kwin-4.4.3.ebuild b/kde-base/kwin/kwin-4.4.3.ebuild
index f290dd4c51fa28596da8e0423b454fb137a6221d..88ea2091b29873cdf1bb7c9842da8d1ff281c645 100644 (file)
--- a/kde-base/kwin/kwin-4.4.3.ebuild
+++ b/kde-base/kwin/kwin-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/kwin/kwin-4.4.3.ebuild,v 1.1 2010/05/03 21:29:51 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.4.3.ebuild,v 1.2 2010/05/04 00:51:37 reavertm Exp $
 
 EAPI="3"
 
@@ -34,6 +34,10 @@ DEPEND="${COMMONDEPEND}
 "
 RDEPEND="${COMMONDEPEND}"
 
+PATCHES=(
+       "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+)
+
 src_prepare() {
 # NOTE uncomment when enabled again by upstream
 #      if ! use captury; then
@@ -48,6 +52,7 @@ src_prepare() {
 src_configure() {
        mycmakeargs=(
                $(cmake-utils_use_with opengl OpenGL)
+               $(cmake-utils_use_with xinerama X11_Xinerama)
        )
 
        kde4-meta_src_configure