Revision bump. Apply patch that fixes mine plasma crash.

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

4 files changed, 28 insertions, 14 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index f78033889a91..cdc0d6d1928b 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.632 2009/10/18 18:19:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.633 2009/10/20 18:19:03 scarabeus Exp $
+
+*kdelibs-4.3.2-r3 (20 Oct 2009)
+
+  20 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdelibs-4.3.2-r2.ebuild, +kdelibs-4.3.2-r3.ebuild,
+  +files/kdelibs-4.3.2-fix-plasma-crash.patch:
+  Revision bump. Apply patch that fixes mine plasma crash.
 
   18 Oct 2009; Markus Meier <maekke@gentoo.org> kdelibs-4.3.1-r2.ebuild:
   x86 stable
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 283f5846f811..96cab0aa5a9a 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 4.2.4-CVE-2009-1687.patch 750 RMD160 cca97b9669755ea7c0475ce35275a2e2e19dcd25 SHA1 aa1a6c255362b050ebb8e0bbbcbc254f76bb3b21 SHA256 0297462875b43fe4e0efd3f1af9aeaa3c867e17fabb043c975d6e6afa84ba5fb
 AUX 4.2.4-CVE-2009-1690.patch 2437 RMD160 9ef96f67e0ee878d112d270339b979c3263fd93e SHA1 bc253af5e4b6329935e88a6999c7925e6c6ddf08 SHA256 8e8b32827e2e5375ce61b08e8264085b285e58a4838028165b2cfeefa1d38010
 AUX 4.2.4-CVE-2009-1698.patch 1601 RMD160 92420a3d855ab98a2ce1eeace6f9e63b0a4c5264 SHA1 cb5b09ab4883401db32fd7372914aa0d7cdbeacd SHA256 7d0aab8ba1a60d94643e6b60d1363be0486de8c3a54dcbbe50f01b33c6adfc82
@@ -24,6 +21,7 @@ AUX kdelibs-4.3.1-crash-on-konqueror-tabs.patch 372 RMD160 0d0bc7eed8535ab7635d8
 AUX kdelibs-4.3.1-dom-docimpl-crash.patch 1547 RMD160 7943693fcdd9e03bab297518fd36b085ac94b760 SHA1 07eb02f50ca172eb9c9f10d675a98bb9647532a0 SHA256 fd3153f39f8fce96be1bb04b7a21308415d8b693b0adf7546ea1a8eec988f169
 AUX kdelibs-4.3.1-fix-crash-on-konqueror-tabs.patch 349 RMD160 dd79ab167971d1266ce4ef72aae4431caa5c24cb SHA1 fa392cfb329d29c0a8b3a3d8a4b8982cba1b90d3 SHA256 1af1cd5f326eb9538b118083284872706a25d62ad754af2220bf51c8f2895005
 AUX kdelibs-4.3.2-fix-deadlock-in-KLocale.patch 7842 RMD160 2aa83a297e4708b980a0ed6d65ac7e01a8ef3f79 SHA1 a46ab9b2ebc97caf4c5e53538bfb7cdacac42a71 SHA256 94206e03ff381001c9adc5d9bee861a946473af3da098ce07ded326112597df6
+AUX kdelibs-4.3.2-fix-plasma-crash.patch 496 RMD160 919ed996649a7f05ab5e9b4f90d0f0a6663756fd SHA1 aad7d634e1702ee6dc8e3ecfe220a4fe579b06dc SHA256 6d9ae3e0e0f51ef7e28256cc080872a01a3c31761ffb8d9a2212ae98b3f48f58
 DIST kde-3.5.9-seli-xinerama.tar.bz2 15150 RMD160 09f9dc74e52d1507a73d1140654021d2baedde3a SHA1 cb8eaba630ee7c8f93c634512d52a9d1603d5405 SHA256 769b0135b327b3274aa45d78ae882811073041fdbfd55267106b1a3f42115966
 DIST kdelibs-3.5-patchset-14.tar.bz2 23248 RMD160 223ad8aa6d3dab3a6e23a89e00eaf2e90bab399e SHA1 5d50fff6b6a26d8abffa4dda7360b42e0fc29eac SHA256 50d1517fbb3b70890b1858533a77fb0e6e1e72612e155ebe5350e8fea7405273
 DIST kdelibs-3.5-patchset-15.tar.bz2 6707 RMD160 55958374bfc4ba27caf573e13337677c35cbe2c0 SHA1 e0a35642adfcf223ce7490b21af1fa2c3d922b93 SHA256 4a25bc340ce2567ea017456b4aa2292b288779d59d0dd012bd50f5189fe739ec
@@ -37,13 +35,6 @@ EBUILD kdelibs-3.5.9-r4.ebuild 6354 RMD160 aa9e38063aa1c51140bbf62d2b29b0dd6ab6f
 EBUILD kdelibs-4.2.4-r4.ebuild 6119 RMD160 31636ca3139ffbeb1de5169c7c675a60ebe6627c SHA1 1d499ad8dbccbd1ae56b19f8848c31bf2ee0e2fc SHA256 c9a59bbd8f25642439c410e7b4861028e441ddbe4cf27e7df4f1b3faf436a5b9
 EBUILD kdelibs-4.3.1-r1.ebuild 6433 RMD160 3f0a829ef8c9c927da8760d367a1c1e9f7d8983d SHA1 5ee2c2e5cfd4b7b3e344dfcc45e484e128b39cdc SHA256 1bf55897439b9f25873fd8d35f8e2f9ccfdbb4f2d13aab61bbd1e96493782a87
 EBUILD kdelibs-4.3.1-r2.ebuild 6429 RMD160 e1e0e5698301f1d27cef09a20f18a40815a231d9 SHA1 23675761bdc73b70fd9ae3a98206e3b50097c27b SHA256 c876c4a38c5f6cd77acec396d4bd1e629a3c1c6f30fb72077ae334385ecc3b1f
-EBUILD kdelibs-4.3.2-r2.ebuild 6520 RMD160 dc6c7b66e85c9319a3681ef7fd9e4c388cb8bf27 SHA1 ef85520b60335ba2d44a269109aa58e522b2d1ea SHA256 c990e32c7e3927a1b714642e9fefd737c6aea29277112838d88c29f405eb7379
-MISC ChangeLog 106017 RMD160 9ea13880ae28d611a3776f086b82b013d2f77f0b SHA1 a3618f0e72beaad37555729f09f99a81dd95a683 SHA256 4934a23b4bd9c86a0f978d1a43a8ccc95a0b2dc50009ccd002ddc498e5094505
+EBUILD kdelibs-4.3.2-r3.ebuild 6570 RMD160 c9111069320c6a6da45b8ca5960a919e6144292c SHA1 eff617aa98520a8922b690c59f6f5dd221acb6d4 SHA256 d7f2cdeaf833b6c4c7f033eaede8e6830fdaf21c26c1b6cef39172028a939104
+MISC ChangeLog 106269 RMD160 cc01d8801c6a2fd681605435ad41ffeeebb9aeda SHA1 2bff9659cd4f81a50b24cc9d9070e32597cf93be SHA256 1d723f0d597ff4a3c1f4da0140c6487b205e56d34dc9ca7f7a75b73500ed0c4d
 MISC metadata.xml 421 RMD160 1ac2a2321b85031d1a7d25ff97fd87fd7376cc12 SHA1 473e157bcd1bfbef6704dbc47fbe86688973e79e SHA256 03af52377b9a607997590a9cda326fa515c4e21207bf33953cb0e67b5831336d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrbXGYACgkQkKaRLQcq0GIg8QCfZbmyioX8O7rKvKRLJcTHbx/M
-l7AAn1d0nX9Wi2k5zE84Ek0bp2Qj4X+H
-=7TkY
------END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.2-fix-plasma-crash.patch b/kde-base/kdelibs/files/kdelibs-4.3.2-fix-plasma-crash.patch
new file mode 100644
index 000000000000..f4103bbea225
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.3.2-fix-plasma-crash.patch
@@ -0,0 +1,15 @@
+Index: branches/KDE/4.3/kdelibs/plasma/paintutils.cpp
+===================================================================
+--- branches/KDE/4.3/kdelibs/plasma/paintutils.cpp	(revision 1038147)
++++ branches/KDE/4.3/kdelibs/plasma/paintutils.cpp	(revision 1038148)
+@@ -138,6 +138,10 @@
+ 
+ QPixmap transition(const QPixmap &from, const QPixmap &to, qreal amount)
+ {
++    if (from.isNull() || to.isNull()) {
++        return from;
++    }
++
+     int value = int(0xff * amount);
+ 
+     if (value == 0) {
diff --git a/kde-base/kdelibs/kdelibs-4.3.2-r2.ebuild b/kde-base/kdelibs/kdelibs-4.3.2-r3.ebuild
index d0eb8c9ecb80..f9775ab096c8 100644
--- a/kde-base/kdelibs/kdelibs-4.3.2-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.3.2-r3.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/kdelibs/kdelibs-4.3.2-r2.ebuild,v 1.1 2009/10/14 06:24:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.2-r3.ebuild,v 1.1 2009/10/20 18:19:03 scarabeus Exp $
 
 EAPI="2"
 
@@ -114,6 +114,7 @@ PATCHES=(
 	"${FILESDIR}/dist/23_solid_no_double_build.patch"
 	"${FILESDIR}/${PN}-4.3.1-crash-on-konqueror-tabs.patch"
 	"${FILESDIR}/${PN}-4.3.2-fix-deadlock-in-KLocale.patch"
+	"${FILESDIR}/${PN}-4.3.2-fix-plasma-crash.patch"
 )
 
 src_prepare() {