[kde-base/plasma-workspace,kwin] Fix xinerama automagic

12 files changed, 86 insertions, 8 deletions

diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index 466ff0ad027..b9306f2511e 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,7 +1,8 @@
+AUX kwin-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
 DIST kdebase-workspace-4.4.3.tar.bz2 77035367 RMD160 df3d9ceaab33d08ea27cd1206c33b3ead9266a42 SHA1 efd427dfe8b7beebdfe162006689871c61991336 SHA256 7f56b2b12f2ca78deea31981bc47de2862d409d99b7bcda90054715d97999239
 DIST kdebase-workspace-4.4.74.tar.xz 70097812 RMD160 92e5a1b0d93923142b86356eeb79650dee1b0966 SHA1 daa6ac8284e6833d9a1f9083bd4e660a1191fef3 SHA256 5417fa0c98a45191c0df2f7e597d42c5bbc95e437df36ebeedf40a3a69d993de
-EBUILD kwin-4.4.3.ebuild 1277 RMD160 0c291c3062d8d14534e1cc1b5f40f44d16a6902c SHA1 942fc9016d69c9df1e81fdd8d978f34d81eb58af SHA256 423b7adab6958a9c3eafa96829c4b045b6735b63ea8edb4b9c0422843302e76e
-EBUILD kwin-4.4.74.ebuild 1359 RMD160 7fec946184dcc89cac5147d0fd4f626961e0584e SHA1 cf17e8dab53ad40e11844b7277826214ae4e924f SHA256 f3c1d4898344b1c4c582fbb9fce6749c0c36bdf6f5ca44d7cda469069f4cdb48
-EBUILD kwin-4.4.9999.ebuild 1199 RMD160 7dc87d5ad3b972a98a040e78e833ef3d771a70ce SHA1 b9a9d3c4ab0d7dbe6961d38364559206b1ec4708 SHA256 8826c286b06615a26ba5a0f04e50119a1e8dc0bcdc871824b387cdeb0f9bd4b1
-EBUILD kwin-9999.ebuild 1281 RMD160 e2255c49ce22f671d16eb55c3f41aa30d05b02da SHA1 d186d27b33c1595b43b166471a61ad030688572a SHA256 eb9a9b73db7a7102a93d13be23a918d21e76f5d740bc3bd8618d96fb021600ae
+EBUILD kwin-4.4.3.ebuild 1396 RMD160 f6ec323a548d5fbaf9316edb2ef28b464d9ae369 SHA1 168ea4a0e3d784dfca9c74bb7e9307c591d5a3cd SHA256 34f8d984f447fd4236ff635af826f1be9cc65f6b88ac026c69dfca8af8e728ea
+EBUILD kwin-4.4.74.ebuild 1478 RMD160 5e21dcdb71a9f809959c3311be0f89ff0a299876 SHA1 aab348c5d6c8eddc805e7a50b6145c2c0a7a2efa SHA256 b3e1ffbf2b02090fd726258c9d2cf4b78f34a5b0083d08005f487294a9867aa4
+EBUILD kwin-4.4.9999.ebuild 1318 RMD160 d64076eae29be21054ea7ff62868e4234efb6667 SHA1 653ce63bdc596336efc49e27f70096b6ac90be42 SHA256 63aea60cfb1629a579704cc820a5a1d79b3f80d51dcff6d85ebea0ff8470ee7b
+EBUILD kwin-9999.ebuild 1400 RMD160 13ffd136c3996360cc40254c49eb64101b208f9b SHA1 7c7db573d6856baf2716c1fa7daf62db7aed4907 SHA256 e0926fc143c3ebaf17fb215cb3184327ba9fbdd428f04c8bff26f6f7079d477c
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
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 00000000000..5596f415d84
--- /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.3.ebuild b/kde-base/kwin/kwin-4.4.3.ebuild
index fd4fe29832c..a4c4c288f3b 100644
--- a/kde-base/kwin/kwin-4.4.3.ebuild
+++ b/kde-base/kwin/kwin-4.4.3.ebuild
@@ -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.74.ebuild b/kde-base/kwin/kwin-4.4.74.ebuild
index a454289c125..12399ac4057 100644
--- a/kde-base/kwin/kwin-4.4.74.ebuild
+++ b/kde-base/kwin/kwin-4.4.74.ebuild
@@ -40,6 +40,10 @@ KMEXTRACTONLY="
 	libs/oxygen/
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+)
+
 src_prepare() {
 # NOTE uncomment when enabled again by upstream
 #	if ! use captury; then
@@ -54,6 +58,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.9999.ebuild b/kde-base/kwin/kwin-4.4.9999.ebuild
index 364389a7236..ff935bf626d 100644
--- a/kde-base/kwin/kwin-4.4.9999.ebuild
+++ b/kde-base/kwin/kwin-4.4.9999.ebuild
@@ -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-9999.ebuild b/kde-base/kwin/kwin-9999.ebuild
index 48a75dabab5..9b7786d1c5d 100644
--- a/kde-base/kwin/kwin-9999.ebuild
+++ b/kde-base/kwin/kwin-9999.ebuild
@@ -40,6 +40,10 @@ KMEXTRACTONLY="
 	libs/oxygen/
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+)
+
 src_prepare() {
 # NOTE uncomment when enabled again by upstream
 #	if ! use captury; then
@@ -54,6 +58,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/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index c74311f3c25..1fe854a82cf 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,7 +1,8 @@
+AUX plasma-workspace-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
 DIST kdebase-workspace-4.4.3.tar.bz2 77035367 RMD160 df3d9ceaab33d08ea27cd1206c33b3ead9266a42 SHA1 efd427dfe8b7beebdfe162006689871c61991336 SHA256 7f56b2b12f2ca78deea31981bc47de2862d409d99b7bcda90054715d97999239
 DIST kdebase-workspace-4.4.74.tar.xz 70097812 RMD160 92e5a1b0d93923142b86356eeb79650dee1b0966 SHA1 daa6ac8284e6833d9a1f9083bd4e660a1191fef3 SHA256 5417fa0c98a45191c0df2f7e597d42c5bbc95e437df36ebeedf40a3a69d993de
-EBUILD plasma-workspace-4.4.3.ebuild 2593 RMD160 29c1b39d667154a01b4cbc1a751e7ca37c46e138 SHA1 4258c2f087836dec4e17d43b02665f13700bf72d SHA256 5bad4acdc5b55d1004e73c24e5ef7a86cdec156e8b6e3308a7ae32fffdb47a52
-EBUILD plasma-workspace-4.4.74.ebuild 2727 RMD160 b60f0940533f0262bd91b992eb10e337d5422a80 SHA1 cced7d17aeafb6fc04270030b61733be6e4857a3 SHA256 102cffc0936272e56ba5c91c20dd95b7182f182f11a79997af905b38fe5d915f
-EBUILD plasma-workspace-4.4.9999.ebuild 2515 RMD160 d49186fab4a476ff26b14eb749c6b52874c9c12f SHA1 490359a034eedc86fff79a6f94fa81142f5892a8 SHA256 9d0a96a3ca146b5c2b60d745984d8fac9ca93224881ddfb4317f8289d32a0b24
-EBUILD plasma-workspace-9999.ebuild 2649 RMD160 beea8aa219d46684e991cd0bf44cc44c6d8806dd SHA1 9554a15f1dbdbe6a2709f83d8fc0da08db8df11d SHA256 72c99eb585b7ccb83f293a8e37a21d99611e7f0c8a1c3148884f097fd3b04917
+EBUILD plasma-workspace-4.4.3.ebuild 2712 RMD160 9c1cfb2b8c36e54e317182f18a1256a558c7f602 SHA1 7928cfdeccd06b0a045ca060d1b3ea3232391146 SHA256 67f3f4ddfe915520e887be2d281d4aa36ca727c4047fa28fa2eb9760ff1a25c5
+EBUILD plasma-workspace-4.4.74.ebuild 2846 RMD160 93a05baadfad987fa9aa1e1f6f3588a9d412303b SHA1 808cc557a3b0c391578da72f495e19852af04041 SHA256 f6915bca4a29bc2672865aebf7f8dc9db33a68d1603251b1354fc45d92667f9f
+EBUILD plasma-workspace-4.4.9999.ebuild 2634 RMD160 63edc788f5c1d047a86388fce1e088ebb7e95143 SHA1 1d6519ad9d4cddb2862f0247f6011ba88e04d28a SHA256 7bd66b8f3611ff4b687a2d1a5fc95eff74b07c3f25d1aecc7701c98b4849517d
+EBUILD plasma-workspace-9999.ebuild 2768 RMD160 372d9997dd6dd7cd49172978058077786f5b5e18 SHA1 739f39d9ebba56829968f7287bb1ae8e8870e4d6 SHA256 d25731d94c5b9558ec010e6689f2e98bbffbd03165fb82728d4bf4658464caf6
 MISC metadata.xml 426 RMD160 c97840bcdd9f62d76728bc99edf3807c6a3bb155 SHA1 050bfc476b5f6e9ad5096050ca5d1e88b79e7d7d SHA256 861524f41b7fb32a40b8d88ae98f6ec76b657bfc251b9133a40bdd48c2fd430c
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
index 00000000000..5596f415d84
--- /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.3.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.4.3.ebuild
index d3f570b9e95..518ba9aaaf6 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.4.3.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.4.3.ebuild
@@ -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.74.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.4.74.ebuild
index 66853913e2b..023735b8cca 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.4.74.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.4.74.ebuild
@@ -62,6 +62,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
@@ -84,6 +88,7 @@ src_configure() {
 		$(cmake-utils_use_with qalculate)
 		$(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.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.4.9999.ebuild
index aae891ebfad..6326afc2599 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.4.9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.4.9999.ebuild
@@ -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-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index 37014490527..d9636b0b75d 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -62,6 +62,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
@@ -84,6 +88,7 @@ src_configure() {
 		$(cmake-utils_use_with qalculate)
 		$(cmake-utils_use_with rss KdepimLibs)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with xinerama X11_Xinerama)
 		-DWITH_Xmms=OFF
 	)