diff options
| author |   Johannes Huber <johu@gentoo.org> | 2013-05-12 15:24:45 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2013-05-12 15:24:45 +0000 |
| commit | 64fd214a57a706833319dc61985f5410b6e8ed0f (patch) | |
| tree | 35fc2a91cfac2a55cd425fb8d46791e422796548 /kde-base/kdelibs | |
| parent | Stable for arm, wrt bug #469010 (diff) | |
| download | gentoo-2-64fd214a57a706833319dc61985f5410b6e8ed0f.tar.gz gentoo-2-64fd214a57a706833319dc61985f5410b6e8ed0f.tar.bz2 gentoo-2-64fd214a57a706833319dc61985f5410b6e8ed0f.zip | |
Backport upstream patch which fixes crashes on dialog quit spotted by Egor Y. Egorov <egorov_egor@bk.ru> wrt bug #469334.
(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'kde-base/kdelibs')
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 10 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.10.3-dialog-quit-crash.patch | 24 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.10.3-r2.ebuild (renamed from kde-base/kdelibs/kdelibs-4.10.3-r1.ebuild) | 3 |
3 files changed, 35 insertions, 2 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 569699853f3b..90122cfd1718 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.924 2013/05/12 14:55:15 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.925 2013/05/12 15:24:45 johu Exp $ + +*kdelibs-4.10.3-r2 (12 May 2013) + + 12 May 2013; Johannes Huber <johu@gentoo.org> + +files/kdelibs-4.10.3-dialog-quit-crash.patch, +kdelibs-4.10.3-r2.ebuild, + -kdelibs-4.10.3-r1.ebuild: + Backport upstream patch which fixes crashes on dialog quit spotted by Egor Y. + Egorov <egorov_egor@bk.ru> wrt bug #469334. 12 May 2013; Johannes Huber <johu@gentoo.org> kdelibs-4.10.2-r1.ebuild, kdelibs-4.10.3-r1.ebuild: diff --git a/kde-base/kdelibs/files/kdelibs-4.10.3-dialog-quit-crash.patch b/kde-base/kdelibs/files/kdelibs-4.10.3-dialog-quit-crash.patch new file mode 100644 index 000000000000..5f535463365c --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.10.3-dialog-quit-crash.patch @@ -0,0 +1,24 @@ +commit 9323adac35d40da69e3cb18504340e984c4afd05 +Author: Anne-Marie Mahfouf <annma@kde.org> +Date: Fri May 10 17:12:33 2013 +0200 + + Fix crash when quitting apps + + Backport to 4.10 branch + + CCBUG: 319137 + +diff --git a/plasma/private/dialogshadows.cpp b/plasma/private/dialogshadows.cpp +index b54fb1a..1925670 100644 +--- a/plasma/private/dialogshadows.cpp ++++ b/plasma/private/dialogshadows.cpp +@@ -336,6 +336,9 @@ void DialogShadows::Private::freeX11Pixmaps() + { + #ifdef Q_WS_X11 + foreach (const QPixmap &pixmap, m_shadowPixmaps) { ++ if (!QX11Info::display()) { ++ return; ++ } + if (!pixmap.isNull()) { + XFreePixmap(QX11Info::display(), pixmap.handle()); + } diff --git a/kde-base/kdelibs/kdelibs-4.10.3-r1.ebuild b/kde-base/kdelibs/kdelibs-4.10.3-r2.ebuild index 4f176b3533a0..63f8bd87e038 100644 --- a/kde-base/kdelibs/kdelibs-4.10.3-r1.ebuild +++ b/kde-base/kdelibs/kdelibs-4.10.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.10.3-r1.ebuild,v 1.2 2013/05/12 14:55:15 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.10.3-r2.ebuild,v 1.1 2013/05/12 15:24:45 johu Exp $ EAPI=5 @@ -140,6 +140,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.9.3-werror.patch" "${FILESDIR}/${PN}-4.10.0-udisks.patch" "${FILESDIR}/${PN}-4.10.2-security-url-dont-show-password.patch" + "${FILESDIR}/${PN}-4.10.3-dialog-quit-crash.patch" ) pkg_pretend() { |