Revision bump to fix -opengl build. Thanks to Bartosz Brachaczek for the patch.

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

4 files changed, 53 insertions, 10 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 77d7cfadc63e..ddb94baeff1b 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.171 2009/11/19 23:13:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.172 2009/11/23 19:45:34 scarabeus Exp $
+
+*kwin-4.3.3-r1 (23 Nov 2009)
+
+  23 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/4.3.3-fix_no_opengl.patch, -kwin-4.3.3.ebuild,
+  +kwin-4.3.3-r1.ebuild:
+  Revision bump to fix -opengl build. Thanks to Bartosz Brachaczek for the
+  patch.
 
   19 Nov 2009; Samuli Suominen <ssuominen@gentoo.org> -kwin-3.5.10.ebuild:
   Remove KDE 3.5.10.
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index c56bca3caa89..e6f745d16afc 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,6 +1,7 @@
+AUX 4.3.3-fix_no_opengl.patch 934 RMD160 6df27a18bce8016ac5b745eade2c526d96fd88d4 SHA1 9bc83679e4bf8fe8d7ee7d9cd004bb6c55c069e7 SHA256 2174b72f8694a6a13085d572852028168645f0dfdfd8c36b944cdd9e61d4c4db
 DIST kdebase-workspace-4.3.1.tar.bz2 62286316 RMD160 1db4e5428a497efff6910b5e1442eaffd2d0bad0 SHA1 c21a6e8028aa993878cccccb26b2611b3337eac9 SHA256 4c4b184615aab07134abbf05ec306f9ef37eb4f02f1e4eb9d4a16e44f859d6ed
 DIST kdebase-workspace-4.3.3.tar.bz2 62496238 RMD160 48ab90a519c7811e9fe4aa4e77f06134d2dc4afa SHA1 2839e913cecef8ead0685bd50e9515ccd8bc0a9d SHA256 b66b4e3eefe88edfd9ddd0501b2b6eece39b85fd78f2320967b937f2529c6d3b
 EBUILD kwin-4.3.1.ebuild 1559 RMD160 8c374c35a1c90f94ea7fbcc7639a084fc25c6629 SHA1 8b7047e02b1aa8d783f3672e1400ca9ac06a1450 SHA256 c3f10ff4a3bdcf6335b94cf26fa08deca948ac0b672bccf0cc9d595b0f6fdb76
-EBUILD kwin-4.3.3.ebuild 1524 RMD160 b7d0cc0ec4016173d9b9eca35612bd4a2080dbae SHA1 0b55e54f0195ba8468f7ccb8a378dec309befab4 SHA256 f9067e1e8bb2a8766118b27ebeabb881a96a47b844ef03ac828a61bd9765ec5d
-MISC ChangeLog 20621 RMD160 3ceee61b3971809810afc58c10129aa7116e0dcd SHA1 b9779acfc7cfd2fd3c260603706c72d308c0429f SHA256 a6410f8d52e8cd22ddd3a7aba73287de6af6fa2f3005f137b2e765a80a431728
+EBUILD kwin-4.3.3-r1.ebuild 1362 RMD160 d7f98fa22a1e10266e33565c54724ea6434c8d79 SHA1 02a9bc12e56784110959547ed1dcfe57f42e69ec SHA256 7d7e367beef54d5cd24e0c608e8c26cfc6748aa493f350452961c4f9e7515cd9
+MISC ChangeLog 20872 RMD160 70df064ad872cb49e6d6b2b52693172e4b92188a SHA1 ecbd9c7aa34dcaca329a0f8aedfc18e01de5b697 SHA256 20b4389b1ffdad39c47c9f7543f866f34b2839fe8d7c20d3f54653e023f07133
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kwin/files/4.3.3-fix_no_opengl.patch b/kde-base/kwin/files/4.3.3-fix_no_opengl.patch
new file mode 100644
index 000000000000..818ad92a391d
--- /dev/null
+++ b/kde-base/kwin/files/4.3.3-fix_no_opengl.patch
@@ -0,0 +1,36 @@
+--- trunk/KDE/kdebase/workspace/kwin/effects/logout/logout.cpp	2009/10/05 09:47:13	1031490
++++ trunk/KDE/kdebase/workspace/kwin/effects/logout/logout.cpp	2009/10/07 15:10:15	1032334
+@@ -110,11 +110,11 @@
+             frameDelay = 2;
+             }
+         }
+-#endif
+ 
+     if( frameDelay )
+         --frameDelay;
+     else
++#endif
+         {
+         if( logoutWindow != NULL && !logoutWindowClosed )
+             progress = qMin( 1.0, progress + time / animationTime( 2000.0 ));
+@@ -234,14 +234,16 @@
+ 
+ void LogoutEffect::postPaintScreen()
+     {
++#ifdef KWIN_HAVE_OPENGL_COMPOSITING
+     if(( progress != 0.0 && progress != 1.0 ) || frameDelay )
+-        {
+         effects->addRepaintFull();
+-        }
++#else
++    if( progress != 0.0 && progress != 1.0 )
++        effects->addRepaintFull();
++#endif
++
+     if( progress > 0.0 )
+-        {
+         logoutWindowPassed = false;
+-        }
+     effects->postPaintScreen();
+     }
+ 
diff --git a/kde-base/kwin/kwin-4.3.3.ebuild b/kde-base/kwin/kwin-4.3.3-r1.ebuild
index 75f89852efcc..2a69cc67d60b 100644
--- a/kde-base/kwin/kwin-4.3.3.ebuild
+++ b/kde-base/kwin/kwin-4.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.3.3.ebuild,v 1.1 2009/11/02 21:54:42 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.3.3-r1.ebuild,v 1.1 2009/11/23 19:45:34 scarabeus Exp $
 
 EAPI="2"
 
@@ -32,6 +32,10 @@ DEPEND="${COMMONDEPEND}
 "
 RDEPEND="${COMMONDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PV}-fix_no_opengl.patch"
+)
+
 src_prepare() {
 # NOTE uncomment when enabled again by upstream
 #	if ! use captury; then
@@ -39,12 +43,6 @@ src_prepare() {
 #			-i kwin/effects/CMakeLists.txt || \
 #			die "Making captury optional failed."
 #	fi
-	# Dirty hax to fix building without OpenGL
-	if ! use opengl; then
-		sed -e 's|^[[:space:]]*windowOpacity.*|// commented out &|' \
-			-i kwin/effects/logout/logout.cpp || \
-			die "Commenting out windowOpacity failed."
-	fi
 
 	kde4-meta_src_prepare
 }