Compile without compositing, bug 225129.

Package-Manager: portage-2.1.5.4

4 files changed, 27 insertions, 7 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 60d1f79e9dbf..179ddf0fdc68 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.128 2008/06/05 22:33:40 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.129 2008/06/07 02:28:52 ingmar Exp $
+
+  07 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  +files/kwin-4.0.5-no-compositing.patch, kwin-4.0.5.ebuild:
+  Compile without compositing, bug 225129.
 
 *kwin-4.0.5 (05 Jun 2008)
 
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index 611fd451b666..e8d775101624 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX kwin-4.0.4-memory-leak.patch 581 RMD160 599eb5b43b6385491724e914d13b7d61caf18ecb SHA1 0cc5e74326f177aac621f577a89867c3b175e8f2 SHA256 cec549e5ce56a5d62cd8d9d9808958e0d44c8d8a88622f12a9a4e6d23f8444d2
+AUX kwin-4.0.5-no-compositing.patch 439 RMD160 4cadee97dc54d0e45b94bd6678674d80a5253775 SHA1 1af2209a7425508e812e77e6323a02d2ba54de81 SHA256 844a155e4b892f1401a178301110bfc586531582f5cf83118daca8307b6a0d8a
 DIST kde-3.5.9-seli-xinerama.tar.bz2 15150 RMD160 09f9dc74e52d1507a73d1140654021d2baedde3a SHA1 cb8eaba630ee7c8f93c634512d52a9d1603d5405 SHA256 769b0135b327b3274aa45d78ae882811073041fdbfd55267106b1a3f42115966
 DIST kdebase-3.5-patchset-05.tar.bz2 16068 RMD160 dc1572fbb3cf3ce9a8e424edd3408b8912c6bfd5 SHA1 ba4e667fe64e3095d8de0b4fa5813029557a2cac SHA256 d1d3c8b51c68610c76c61ba4923618a16609bb76af547d8d26bb9a3f6990bd4d
 DIST kdebase-3.5.8.tar.bz2 24200172 RMD160 6441b5eaead5fff5c42c532fb11c0d37001cb6ea SHA1 07f2e33aef101e97237676719ef2bf8418d894b2 SHA256 0f1876d1c68f01ed8fee346c1bae4f53dd2c1dc56db94e309b3d1adfc6138493
@@ -17,13 +18,13 @@ EBUILD kwin-4.0.2.ebuild 1203 RMD160 24e1d0aa9ab559b24a0b35f3f5091f91290d9066 SH
 EBUILD kwin-4.0.3.ebuild 1203 RMD160 e0229d9cf14bac96352fb8b5cc265cdc941ace48 SHA1 77b4951ec866792173521360b036835defe8c3ba SHA256 e4317cae67a5661807aa7577e056f1bc08520efd25bbee2b0e1651a4f65bfb98
 EBUILD kwin-4.0.4-r1.ebuild 1254 RMD160 4693bec29af17116c4149917cde7ad63607ca173 SHA1 93c284d7d67328b0e6ba894fd70f4bb4a2518606 SHA256 fdeb19115679a27543a4d2ef771d545d82b2c03bc04c5b20260832bef898d496
 EBUILD kwin-4.0.4.ebuild 1205 RMD160 3a734508bfaf6ded4b4b7d59e7af33f7439e6d65 SHA1 d60209724980f1b9ae9fe4efcc11f61eec5a45d3 SHA256 f49b382ab9438343330048943c84e5bde3cac0a8467065c44b594b0667b46f9d
-EBUILD kwin-4.0.5.ebuild 1209 RMD160 f95f931c262a52f81b832a1283822412943a6938 SHA1 9f87f211797194ab50ff09f3e68bcd66d3236349 SHA256 02d38ced6bf8cfae68735782eb60afa7ea06bdeaad3c6ddadac96868dfe9baf6
-MISC ChangeLog 15710 RMD160 11c2e17b1abe4893c2365c936db1147a014f724e SHA1 553ac54f2f8a2b9eef1d92d7c7a22d189ad56bd4 SHA256 7929e7bf3123c1be82b57c471164876fba0110d837af705e5552ec593d13c22c
+EBUILD kwin-4.0.5.ebuild 1258 RMD160 03d4223de8e5d4f30404885f5ed3338a60ae27da SHA1 9a6842c927d5387800f855114e4f83880b3ca60a SHA256 c60f3525676d421951efa0e3369503b968faaaa97ed4b962252d3d5f5c4a6ba6
+MISC ChangeLog 15863 RMD160 db999d9bfe7d543b095867b30515f293476af74d SHA1 aee2063cb84ca03d11c2c124f57cddb48c442808 SHA256 b7b160bdd3222d0f665443cedbbdb7a48d2144d696cb3390b652206ab8038676
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhIamEACgkQKfQzuokD2Ip86gCeJpSD/wJ+xYGYSbwX7SW6GjcX
-WMkAn19LgR8ie4HIWbYldTVaD07QIHco
-=jgh1
+iEYEARECAAYFAkhJ8iwACgkQB18eXLOpYdnlmwCeMAUTkAe0q8XTm+14cOmD2mGB
+wdoAnjgjZiGP3CC3t/zLcbpHvY7XwtJg
+=fleQ
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kwin/files/kwin-4.0.5-no-compositing.patch b/kde-base/kwin/files/kwin-4.0.5-no-compositing.patch
new file mode 100644
index 000000000000..40de6cbbde0e
--- /dev/null
+++ b/kde-base/kwin/files/kwin-4.0.5-no-compositing.patch
@@ -0,0 +1,13 @@
+--- kdebase/workspace/kwin/lib/kwineffects.cpp	2008/05/08 19:06:28	805574
++++ kdebase/workspace/kwin/lib/kwineffects.cpp	2008/05/24 08:24:48	811956
+@@ -294,8 +294,10 @@
+     {
+     switch( compositing_type )
+         {
++#ifdef KWIN_HAVE_OPENGL_COMPOSITING
+         case OpenGLCompositing:
+             return GLTexture::saturationSupported();
++#endif
+         case XRenderCompositing:
+             return false; // never
+         default:
diff --git a/kde-base/kwin/kwin-4.0.5.ebuild b/kde-base/kwin/kwin-4.0.5.ebuild
index 93ab75daee33..4335564d99e6 100644
--- a/kde-base/kwin/kwin-4.0.5.ebuild
+++ b/kde-base/kwin/kwin-4.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.0.5.ebuild,v 1.1 2008/06/05 22:33:40 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.0.5.ebuild,v 1.2 2008/06/07 02:28:52 ingmar Exp $
 
 EAPI="1"
 
@@ -28,6 +28,8 @@ DEPEND="${COMMONDEPEND}
 	xinerama? ( x11-proto/xineramaproto )"
 RDEPEND="${COMMONDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-no-compositing.patch" )
+
 src_compile() {
 	if ! use captury; then
 		sed -e 's:^PKGCONFIG..libcaptury:#DONOTFIND &:' \