Backport fix for kde-bug 314830

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0xB6C5F7DE

4 files changed, 133 insertions, 9 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 98940f281857..3b40dc14912b 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.312 2013/03/06 13:41:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.313 2013/03/09 19:44:29 dilfridge Exp $
+
+*kwin-4.10.1-r1 (09 Mar 2013)
+
+  09 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kwin-4.10.1-r1.ebuild, +files/kwin-4.10.1-nulluuid.patch:
+  Backport fix for kde-bug 314830
 
 *kwin-4.10.1 (06 Mar 2013)
 
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index 016fb5b78e38..e08c0edaaca4 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,22 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kwin-4.10.1-nulluuid.patch 1494 SHA256 a7c14bbc4c0a66729c86a1965639eea30a12f1572dd977fb0e2ad40404754643 SHA512 a37f4c7fa60f5640632dd2adc02b6f61a72a816c8cc93e03992dfaac308fc9054e348ae1a5bcefa85c24de82ac4ff3e69b1849561506b6291dad31499ff6b4b2 WHIRLPOOL 29caf3d5eb86f0c450c09bcb436fe95369f186a92ac3cd54e69f72c9a1e02cd84deb4b8fe3ac79bdb1d858fbb63ecc9e9fb39d300aac6d069061a0575398d911
 DIST kde-workspace-4.10.0.tar.xz 13378604 SHA256 88c90fef1b8ad81eea75ee04b2a9bae91a38e51425a0ec373ca21bedebef1b46 SHA512 d83210abbfc9cf0bb11f5a7c1fcab52aa512b6ecde7712467a74f5dc03a3dec683386408c3e613cb4bb69e215a0129c44aa935cef59f64c594b43bc2dcf739d9 WHIRLPOOL bdf0b7ce8c1a48c43bb593cbdae3620ef597e83844b7c967dc372539767a1597169894b10daf32de316d41f659e156a0ad44cd5f20dfe2deedb48e129a12b1a6
 DIST kde-workspace-4.10.1.tar.xz 13560944 SHA256 19ca159dc6cec2b8cb6a09d7a87ec5f541e35ed0f03c185c7ea5cfe959b212b7 SHA512 efa7cc41bca306a39dc609453af843886b4cce197098524e2842976c5906a78cd8950f9ea03ffc51c1aa72ba52a19d6f943d53a76b32387c953b4d9cb679bb71 WHIRLPOOL d63d6193644fb879b502338d251117975aa71a77dd19bcf53e0e06f2dbacdee68fe5c078217664fa12e470f71fa312752ad5ca578f23cf0ec1b2b710c49507de
 DIST kde-workspace-4.9.5.tar.xz 22520656 SHA256 073e495c4ef4eb4689c5c666c86fb6f24f57f2c00801f965c60bf8b32adb014a SHA512 1a8802e8c9dcaf1e81276c962dce7d321a26f205f60ccd27fa00780c4c09a8cd404a67b037265a4dd5efdc4ffc386cc31f571ac5ca10c1a14bc59259683a5e54 WHIRLPOOL f6ba18b30f7a5c454c9304d42f50238eac9a90abfc29fb6f7e873675eca89d206045f7277e5732e3faf669d36ec822cae0849813c66d72f7ba3af25bac3130ef
 EBUILD kwin-4.10.0.ebuild 1555 SHA256 ce5753278cbbb6e7bd5540fe3b71eeb4a5f869a79a8bc06533772d81807fa9b2 SHA512 0f6a039f05cdfc73fa01057037e07c02f13de0e009d2209f486c0361a8ae9228bcf78607569cf60fdc6bb3df610525e6de358e1ed9514da2669b771bc4a36b31 WHIRLPOOL 2ffd31fdd4d288b9c871dce25069e737f68e04cbfb87942cc4d6ff96e01cd0b1a05215b19125e7322d52d44aba41b119375e3a3ed46ffc96cb023228ba42c890
+EBUILD kwin-4.10.1-r1.ebuild 1611 SHA256 98e0dd0f5ebb775da7ebf89e2b1d53656cbb4c2373d1b1b6f1ce498f22e1a394 SHA512 599c43c76ed21e5611430f5da7a17596268077a3d916ff49ecb2c4e1a70842532bb473089295c8ba1a4f7391d68ee5e4216cbff333061c16f20147f6966b5912 WHIRLPOOL 9912e5430a4421ac25f6ac6b61116801312962f9494b3b93539cef4851d004b8b49a5469df97bb122faaf285d054ace5ed48495ad6a1893941cba435f6cf665c
 EBUILD kwin-4.10.1.ebuild 1561 SHA256 3f6ae90141d8443c69c4f371212220293bb296ece73b5b87b4f343f4b3972914 SHA512 01fbf89545dec98648635e93cb1e7f42cfc8ff9953a3ffcade67e97f482be4df0a079de985b65aab8d37841df9c814c750affadc87e05cc0354f482c1db0b6da WHIRLPOOL 2e859d6dbb477b17bd1e8d996779b6776894e47f733061270d6db694974e3ef93c3a225e26d29b3cc2d148899bee012891a32540cb250fc518f2c04d14c234da
 EBUILD kwin-4.9.5.ebuild 1551 SHA256 768e7d851b7659764f8ecc6ace5f86a29a35fcb182841811ce78ff08ea948aa8 SHA512 6c5b7f32196cad1597f0ed06af6116619381b032581d0d810980e423e5af7a333d7149e75dac28d1c12a327e4c1af645e23a192a3f7b46e9e75760c78a459d7b WHIRLPOOL 97d67b4ce62adb247e5c7ef5f9eabc57857d0f7de2509edba580be8d1da40e553ef117488948ef8f6c3551cdc778d2434e14d8310c3f6ae79a4b2c861d472da4
-MISC ChangeLog 38088 SHA256 d40b2137e5e2b92202ffaf112282c2135ff5ea80e5c388a147e155911edae0ff SHA512 2370d5cd3e508087af57faf1fb72865de14d3cde79eacc7a89eaff423330e2f8b5dbd703fcd923a1cc288d09d249699bbfee3ab430b279b07450fdb2ca7d285b WHIRLPOOL 9d0bf48198777c7d0ba72d475e4d4f12fa36499c7871359b45de73aeda8d373a57b848e5f9a2b505efa8354fbd688f4d6104b86929d620134ba652a8de5c64b5
+MISC ChangeLog 38272 SHA256 476f7561a955ebb1d2988f6fd8560b4da1468d503739149d090cde5a571e0952 SHA512 d2f38eadeadbe96d32f8fef9ddfabab1c33405fa488bfdc79cf0d92eddde0285d5bfd0c454feaea6a14b0050f36b5385a31269cd013c981fc37968baa9a72826 WHIRLPOOL 58dfa20ebce02abd7dd00c96fae8b3a3c1878a9281aaa22b4fb0e6711771cb8341225e622223ce163e9260ffd093a92e99dd69e6ff0c28d123e9ae0ef0b479b4
 MISC metadata.xml 229 SHA256 1cd96488355a3e48a2b0b12f09ad8e3ea923e199b4fcbf175590cd317b033af7 SHA512 357e165f3706a18dbab9ce108b28d7b3338e3a458fb9d184d701e7fd932f41d1abdc7785bdd22003b2bd2d702674b3dcc206b39e141d8c3adfda7d6d1d1ec0d8 WHIRLPOOL fd66f59afef8829e84f2be5f0782511e6b16dbd811d432205eaf629470055d1d4173d135a59b95668500c4b4cb15bcf9f6230e96aecf5f0e1d5338d4d4881018
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRN4Z3AAoJEMbwO6tnXQ0sNScH/RorH0nwGRnlEz+Qh/bh3Aqk
-Ho0kZ2Kus6EAeYlWwn4LOdVkefemXWcJSyJP++RhI5elop4eMUd0pDVTXY32V6yp
-J5Pxx9H0AcbUlh2B4GYziQFbDwZ3EGQ/yoDYLNKPvNnGVWxlMAW7rlYwWhE2egRh
-Al8QfIwiOVSZ8kI5t2fxtzs6B2o0eBhTE+JEiyCQnP616VTXAPH0F7GCmbwp/Qim
-XdoYVg1AuIIVHQ06czd6Q6xZkl+oQ3xEyCIOE9zCjfGrr5WvL3VYhktPzVcZtqOZ
-0BA9zBquZPwSXs/InZJV9xmd0btalHkvRiX4eVDDKeJ9wkMXGKzLbA3KxMJOPmo=
-=0HFN
+iQIcBAEBCAAGBQJRO5FEAAoJENwGBM22xffe+SQP/RmcwY3/37QWFfB7C9/YRXZ2
+qOi9ei3LI1uMhVrPBoIYcQZ/zBlQGc/k2SGcsjas4aHNLOiINtN+8nr31hBITZI1
+FWuUMBKnB/UNlOKvcUA+PQs1RhHGVF1rUnRBGT6CSf/4ReZpdA+Emaivr/DLMvXa
+NNq2TxiI8KAKJuPR0rs13HjMrF7AtP8cuM8/ipsVag8fEKp42JXtsQar3wptRCQu
+VBsb2lCSdbIeOp1t7A7mWMjELv6YCA+Md+gFvTB/Z6qhXKf6Uoq2tPsuSHKrBIPj
+PhoLpK0ntEs4M5zNceml+wO7v3fJIyHEbc3LkNZhxEzFuzhhb1cPsSClGLXgMRZQ
+ot8Lwncgwk89PkLC893g7Hlh+iTbrp02+E+5SBRgScFQDDuIRDsPxi7pUStQN7ol
+Qp5D3uPPSAz/wk3HDbr/ahSy9CP9tSZl3cj0WFq6hV07V5losSc1xFXDdvpv4w5X
+AItaUk+K6hcFL1RxsYKO+9Ca1Uem0mc0WNcPgkhBKrwUsNupiv8+/ihFj8qm/3xd
+NB7kvoYRje50OZmoon4IvQyE8s+MZTVgmtP0rL1ImCswmOwsMryTTVYCC3h3St25
+lAgfABPYEXMFSbngZ7IZpKY4yvTrBZE3LC95sLyZTv6dgdKG4OOn5xJ0UJJROFFP
+hLqrWvBF5eT4ztU0HLqu
+=66yT
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kwin/files/kwin-4.10.1-nulluuid.patch b/kde-base/kwin/files/kwin-4.10.1-nulluuid.patch
new file mode 100644
index 000000000000..184c73c05b9f
--- /dev/null
+++ b/kde-base/kwin/files/kwin-4.10.1-nulluuid.patch
@@ -0,0 +1,44 @@
+commit 569f79c60f8fd2b3e655433c2c53f840b4c103e9
+Author: Thomas Lübking <thomas.luebking@gmail.com>
+Date:   Sat Mar 2 22:27:20 2013 +0100
+
+    Map NULL_UUID activity to ALL activities
+    
+    REVIEW: 109274
+    BUG: 314830
+    FIXED-IN: 4.10.2
+
+diff --git a/kwin/client.cpp b/kwin/client.cpp
+index 5fb6dcb..e16a1fe 100644
+--- a/kwin/client.cpp
++++ b/kwin/client.cpp
+@@ -1518,12 +1518,16 @@ void Client::setOnActivity(const QString &activity, bool enable)
+ /**
+  * set exactly which activities this client is on
+  */
++#define NULL_UUID "00000000-0000-0000-0000-000000000000"
+ void Client::setOnActivities(QStringList newActivitiesList)
+ {
+     QString joinedActivitiesList = newActivitiesList.join(",");
+     joinedActivitiesList = rules()->checkActivity(joinedActivitiesList, false);
+     newActivitiesList = joinedActivitiesList.split(',', QString::SkipEmptyParts);
+ 
++    if (newActivitiesList.contains(NULL_UUID))
++        newActivitiesList.clear(); // turn into "all"
++
+     QStringList allActivities = workspace()->activityList();
+     if ( newActivitiesList.isEmpty() ||
+         (newActivitiesList.count() > 1 && newActivitiesList.count() == allActivities.count()) ||
+@@ -2380,6 +2384,12 @@ void Client::checkActivities()
+     }
+ 
+     newActivitiesList = QString(prop).split(',');
++
++    if (newActivitiesList.contains(NULL_UUID)) {
++        setOnAllActivities(true);
++        return;
++    }
++
+     if (newActivitiesList == activityList)
+         return; //expected change, it's ok.
+ 
diff --git a/kde-base/kwin/kwin-4.10.1-r1.ebuild b/kde-base/kwin/kwin-4.10.1-r1.ebuild
new file mode 100644
index 000000000000..8fb18f5e96ca
--- /dev/null
+++ b/kde-base/kwin/kwin-4.10.1-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.10.1-r1.ebuild,v 1.1 2013/03/09 19:44:29 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kde-workspace"
+OPENGL_REQUIRED="always"
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KDE window manager"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug gles opengl"
+
+COMMONDEPEND="
+	$(add_kdebase_dep kactivities)
+	$(add_kdebase_dep kdelibs opengl)
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep liboxygenstyle)
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	>=x11-libs/libXrandr-1.2.1
+	x11-libs/libXrender
+	opengl? ( >=media-libs/mesa-7.10 )
+	gles? (
+		|| (  ( >=media-libs/mesa-7.10[egl(+),gles] <media-libs/mesa-7.12[egl(+),gles] )
+			>=media-libs/mesa-7.12[egl(+),gles2] )
+	)
+"
+DEPEND="${COMMONDEPEND}
+	x11-proto/compositeproto
+	x11-proto/damageproto
+	x11-proto/fixesproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+"
+RDEPEND="${COMMONDEPEND}
+	x11-apps/scripts
+"
+
+KMEXTRACTONLY="
+	ksmserver/
+	libs/kephal/
+	libs/oxygen/
+"
+
+# you need one of these
+REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl )"
+
+PATCHES=( "${FILESDIR}/${P}-nulluuid.patch" )
+
+src_configure() {
+	# FIXME Remove when activity API moved away from libkworkspace
+	append-cppflags "-I${EPREFIX}/usr/include/kworkspace"
+
+	mycmakeargs=(
+		$(cmake-utils_use_with gles OpenGLES)
+		$(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
+		$(cmake-utils_use_with opengl OpenGL)
+		-DWITH_X11_Xcomposite=ON
+	)
+
+	kde4-meta_src_configure
+}