diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-10-20 18:19:04 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-10-20 18:19:04 +0000 |
| commit | b34d9b90896da776efe263c432b8fd85f6f1e436 (patch) | |
| tree | cc8a71a487f1579a33909bc1d7dd3328d20f9ff7 /kde-base | |
| parent | keyword ~sparc-fbsd (diff) | |
| download | gentoo-2-b34d9b90896da776efe263c432b8fd85f6f1e436.tar.gz gentoo-2-b34d9b90896da776efe263c432b8fd85f6f1e436.tar.bz2 gentoo-2-b34d9b90896da776efe263c432b8fd85f6f1e436.zip | |
Revision bump. Apply patch that fixes mine plasma crash.
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 9 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.3.2-fix-plasma-crash.patch | 15 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.3.2-r3.ebuild (renamed from kde-base/kdelibs/kdelibs-4.3.2-r2.ebuild) | 3 |
3 files changed, 25 insertions, 2 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/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() { |