Backport patch from upstream fixing a regression with the "hide window title bar" option.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

4 files changed, 137 insertions, 15 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 22ee48caa6e7..a56e26720614 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.387 2014/06/15 17:24:08 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.388 2014/06/15 17:44:20 kensington Exp $
+
+*kwin-4.11.10-r1 (15 Jun 2014)
+
+  15 Jun 2014; Michael Palimaka <kensington@gentoo.org>
+  +files/kwin-4.11.10-hidewindow.patch, +kwin-4.11.10-r1.ebuild:
+  Backport patch from upstream fixing a regression with the "hide window title
+  bar" option.
 
 *kwin-4.11.10 (15 Jun 2014)
 
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index a025913141f5..773f5ea7d821 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,27 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kwin-4.11.10-hidewindow.patch 1104 SHA256 7619735ef1cbc4001720121830c4690fef5fadc96abbeec5a621675d912f78ef SHA512 a5d3b12caedc11cb4140129a50d8063babd5916d30f4b55bce2ff645f806d19379ae6d9eea77f0b1761c76869cb5245cef7bd33a56244319e895d78c4ff01944 WHIRLPOOL 44d024e78bb10f3188084e93421195afbf5074e68a1a7a6844d01b5dd8094a2f058f398ab735c0c0a0a410341edff84b6dbf4e47d769ab131242c12a488b8b77
 DIST kde-workspace-4.11.10.tar.xz 13533988 SHA256 99d116444d43d1c471f7647353d237224444dc6674e90ecea97419629ec38e86 SHA512 3a5551f1fcb91d882f9aee2478a3e62f7fb659ad33ef88404f6eb9396dea052e1fc52973fff5c1276a7b9d73c913a3759b075eaf238c50d88db401a742756018 WHIRLPOOL 67f5b89c1248e760117231ee57d2ec791a56731cc6bbad6fcd27d9650636f1b0fd289dc1ef9061432beb302aaff2a271d1fc849d139b2dba9f7933a22060b752
 DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
+EBUILD kwin-4.11.10-r1.ebuild 2028 SHA256 c676c59045c79362231563e5cd9ae508c37bb59fa41d395c7a9fb9aafd9c6dac SHA512 8204769d4319cf8b9dc83650731d5bb4f944231a1eb0e6d72a990485b0359c33db8564e1489fb5232a9ccee67b9a6ef05bf6843ad7e21c8bc2957c85b1660ca8 WHIRLPOOL c7a995dc96b5d7aa3b65274080d5a7c6a78454e2986c58f1a3b3361e84bf2b7392a5f5bbbb26d1eeee6fb912877d63de3b0ced9c02d16f0a284fa0675b39797b
 EBUILD kwin-4.11.10.ebuild 1976 SHA256 d8be7f7e73811fbfa57131225c1dfd325e137e023833ab5e15a2f68d6e4431c4 SHA512 3dfefd08ff6a738bfd16f2efed44ec146f559dffbe92d7aad9bd1e24aa8ff74fac902ae0d18bca7c563873cdaa0820ab984799159bffece10ffa167e7e82213a WHIRLPOOL 689ce98738fd78a2e053f6ccc7ebcc969b5e9c206da3072d08833245fd0e78d12256c11c6d0a6e016b9d1a937a5e4c28ff4cfb78be743f9d95f2a22e3f4577ba
 EBUILD kwin-4.11.9.ebuild 1963 SHA256 736e04adca30cd4bfe3ead1a87caadf2f650d422f16fa97fe737ba18369838fe SHA512 1cb26b7c137c03d1414b00b26e673685554b1b55dc2494995e3ff3badbd52154a12dac68e8da0511f9e066efd347b2c3f13e6638fcfe9ff1d12f5292938aafcd WHIRLPOOL 973a9a2c5f1af10b5863c1134b0831cf32c5625349c1ef25064fbe57d0a6ce02c2c97d384865afd4b4e7dc8e75aba0131a4c5d519bce6e3e78145f8890330ae4
-MISC ChangeLog 46893 SHA256 28601d9201709f13c7590c148ccce2fe1cf0380ee97f6c446be631b87158dfff SHA512 30ddc0dc13d79afff57eaaf6f981c21a1932e051b0ca2a1fa50e34649b51da744d9c3c77eb7ac74bb8bec28207119e518b44d1f108dd8319eaa9d28515830ad8 WHIRLPOOL d244dbb551d1000a0a969c0e55ccc4c225a9ae268b5ebdb38016be095ccdffa9df0bbb93bc30b2cc01988fbda38c450a27f7024bb23a94ee4891cb3b2fd3878c
+MISC ChangeLog 47141 SHA256 d530919f8dbf4cf779b99020fbf4d327ada6527cb7262c67ef855de06752ecbe SHA512 7ef200ea162d508ff82e238b78a77f4eabd3b5becf03726f412a2f3283fa0e507cdc2a75b166c21859801c5a1da09f4a919f188ff536c45258106a2aa5f69bbd WHIRLPOOL a1dfdac87e1dc708967913a9d44a4f6c3163571fe767998e2567d78f95424f9d07bec8723ea4dbb2a61045e532a98b7bade93a638b57d770fd68662997884079
 MISC metadata.xml 229 SHA256 1cd96488355a3e48a2b0b12f09ad8e3ea923e199b4fcbf175590cd317b033af7 SHA512 357e165f3706a18dbab9ce108b28d7b3338e3a458fb9d184d701e7fd932f41d1abdc7785bdd22003b2bd2d702674b3dcc206b39e141d8c3adfda7d6d1d1ec0d8 WHIRLPOOL fd66f59afef8829e84f2be5f0782511e6b16dbd811d432205eaf629470055d1d4173d135a59b95668500c4b4cb15bcf9f6230e96aecf5f0e1d5338d4d4881018
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJiBAEBCABMBQJTndbERRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJTndt1RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7E7LD/9kUARd4AZ2Ff68W8vFJq9GjiotEzjzvroMRTMd+Cyb6ElgkzfO3CMDMYJM
-1hvJa1zhyNfkuaNy+QFQ09DcN3m0gzJzI2d/LCvHzsW08y0sweWAW2oCVsFPkzMU
-aUvCd8YSA8gnZlekF2/sLBpIWnNhTSBFPFEXVGXmBtXA0wJ8ttsHYYyWASqZWPX9
-i+I2Y7l2PFowoHFlsczI50/Mw9oTq6gmSFp1BdSxoG8cz/jqdEgLM43RK1PGqeW2
-JNEgXyEVJ7+dFd5q0NysZCVStAYsvSZJy96axjrHdpLBjSpPs190HEjTnxNMY/w/
-4ZaHxuxNUF4tVg6ZBtKcFhp0CQxc4l3UA6t6yz4y6c7HxXnBTDQJq8RGD2CB0VyI
-CLOzgIyt1L1hsb45KQ8wUmDQiQojF7uRwdg1gEioxa9ZTpxdLRYlLG8tfDHMQG3E
-HCWo2Pmr98HND16uKISXaCSpJJr3BChQUSkw3OV21oRANniG3itIxLlt0SGKCwYH
-avH4EyVsOgVan2otLoSt8nb1fyABEAgpiRBEU60BXYFU0gnoTKCOILPty5sOyO6o
-mXdGh6t+NuMFkvS8uIu9zJq4A00Y5BZ0XOg9EbjdN/BO+wu10yCZJrtSO+lvQyPN
-B7SSzPn5VM6b4AdKK5D2xz/xT2etAVtE822RQ2buuOAIXSNkvA==
-=DWTt
+7E+tD/0akCUICRqQkh9wF2dYS1X6PY0B5ojXek1msJ+3jDZBPLX4o82p3IOwDQbj
+Gy97MwMtRFIPL3FZ0qapMO+8hPLybp1iqVUH2U9aRIukB4PY0E5GB3yN49bl0J19
+2wdI6wA4cBVTPcmQe9gs2KwxFqtk97k8uNlk9IDqwn1ySVcsoEnB2l4JuRRyTk0t
+d2ZIpEVCBFltGdHtiMmIndPVD3sW2PwveEqi+Yd27QHp672QTWUInjxvYTji2rSI
+0NKorq/Yl6OAvCHqtXX/bPCBsfHtezjcXVfZi5yI/0k/3LcdyZX4E6JceXKeDOGt
+A8YA8ObOd7Vmsv4EIpi3lz1FvYQxJvUtUHDv1U6AYSnE0ENV4AWCtoNU7YMUAiC1
+h26VxiIoDs5smZPYDMlD76FjejYWOpzGyjBV6PIrm645nsuUamsP70A7uEvQLyEU
+wWG/16id+iunejF3G/QANOPOmPhY/USgl/lku8IJbF5GImyEolQOas0XuC7LBNST
+ppdpTvaD+8mGyQBNwYsAzkMu9hrDtLtgpHe6pAjx8jqWYsZyArd16y+yizG9YeRl
+YYJxN6LbUW76xG5I8N9IsP6EXeCqp/rsut3stU4N/u+Iz/UpKCn28CAloFy31R8F
+WFriYUGt/qU7+xtlj1KFpHAfM1CFVHvkUcIoiJakzaWSZVQ6eQ==
+=vqLB
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kwin/files/kwin-4.11.10-hidewindow.patch b/kde-base/kwin/files/kwin-4.11.10-hidewindow.patch
new file mode 100644
index 000000000000..e5db9a06335d
--- /dev/null
+++ b/kde-base/kwin/files/kwin-4.11.10-hidewindow.patch
@@ -0,0 +1,31 @@
+From 4b4a7c752ae305c168b0a3e89ad2f49c54cadd5d Mon Sep 17 00:00:00 2001
+From: Hugo Pereira Da Costa <hugo.pereira@free.fr>
+Date: Thu, 12 Jun 2014 14:56:20 +0200
+Subject: [PATCH] Properly set titleHeight to zero when hideTitleBar is
+ selected. CCBUG: 336128
+
+---
+ kwin/clients/oxygen/oxygenclient.cpp | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/kwin/clients/oxygen/oxygenclient.cpp b/kwin/clients/oxygen/oxygenclient.cpp
+index a7d8d7a..ebc0274 100644
+--- a/kwin/clients/oxygen/oxygenclient.cpp
++++ b/kwin/clients/oxygen/oxygenclient.cpp
+@@ -394,8 +394,11 @@ namespace Oxygen
+ 
+             case LM_TitleHeight:
+             {
+-                const int titleHeight = QFontMetrics(options()->font(true)).height();
+-                return qMax(buttonSize, titleHeight);
++                if( hideTitleBar() ) return 0;
++                else {
++                    const int titleHeight = QFontMetrics(options()->font(true)).height();
++                    return qMax(buttonSize, titleHeight);
++                }
+             }
+ 
+             case LM_ButtonSpacing:
+-- 
+1.8.5.5
+
diff --git a/kde-base/kwin/kwin-4.11.10-r1.ebuild b/kde-base/kwin/kwin-4.11.10-r1.ebuild
new file mode 100644
index 000000000000..e7e25786d2a8
--- /dev/null
+++ b/kde-base/kwin/kwin-4.11.10-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.11.10-r1.ebuild,v 1.1 2014/06/15 17:44:20 kensington Exp $
+
+EAPI=5
+
+KMNAME="kde-workspace"
+DECLARATIVE_REQUIRED="always"
+OPENGL_REQUIRED="always"
+
+#VIRTUALX_REQUIRED=test
+RESTRICT=test
+# test 8: kwin-TestVirtualDesktops hangs even with virtualx
+
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KDE window manager"
+HOMEPAGE+=" http://userbase.kde.org/KWin"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug gles opengl wayland"
+
+COMMONDEPEND="
+	$(add_kdebase_dep kactivities)
+	$(add_kdebase_dep kdelibs opengl)
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep liboxygenstyle)
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	>=x11-libs/libXrandr-1.2.1
+	x11-libs/libXrender
+	x11-libs/libXxf86vm
+	opengl? ( >=media-libs/mesa-7.10 )
+	gles? ( >=media-libs/mesa-7.12[egl(+),gles2] )
+	wayland? ( >=media-libs/mesa-9.0[egl(+),wayland] )
+"
+DEPEND="${COMMONDEPEND}
+	x11-libs/xcb-util-renderutil
+	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 ) wayland? ( gles )"
+
+PATCHES=( "${FILESDIR}/${P}-hidewindow.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)
+		$(cmake-utils_use_with wayland Wayland)
+		-DWITH_X11_Xcomposite=ON
+	)
+
+	kde4-meta_src_configure
+}