diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-05-11 16:19:29 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-05-11 16:19:29 -0300 |
| commit | f0659a2d3623adbeddbb80befe4f8ebeae069f73 (patch) | |
| tree | 5b0eaa3ee9767e134915494d30e9485cc6f360eb /libre | |
| parent | c68cba61a1553c3955136183def7329978cf8e8c (diff) | |
| download | abslibre-f0659a2d3623adbeddbb80befe4f8ebeae069f73.tar.gz abslibre-f0659a2d3623adbeddbb80befe4f8ebeae069f73.tar.bz2 abslibre-f0659a2d3623adbeddbb80befe4f8ebeae069f73.zip | |
kdelibs-libre-4.10.3-3: Fix a crash when closing various apps
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/kdelibs-libre/PKGBUILD | 10 | ||||
| -rw-r--r-- | libre/kdelibs-libre/fix-xfreepixmap-call.patch | 24 |
2 files changed, 31 insertions, 3 deletions
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 0ebbd68c2..96c8530a3 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184821 2013-05-09 08:05:42Z andrea $ +# $Id: PKGBUILD 185044 2013-05-10 17:08:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.10.3 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -23,11 +23,13 @@ conflicts=('kdelibs') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' 'qt4.patch' - 'security-fix.patch' 'khtml-fsdg.diff') + 'security-fix.patch' 'fix-xfreepixmap-call.patch' + 'khtml-fsdg.diff') sha1sums=('aa154998e227121be82f5b04442e908e7dece01b' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' '506562009a667f18481be0d2c5035b181fce38bb' + '556c5473219d8208ec920f46c08bf61fda5b60d9' 'a1502a964081ad583a00cf90c56e74bf60121830') build() { @@ -41,6 +43,8 @@ build() { # KDEBUG#319428 patch -p1 -i "${srcdir}"/security-fix.patch + # KDEBUG#319137 + patch -p1 -i "${srcdir}"/fix-xfreepixmap-call.patch cd ../ diff --git a/libre/kdelibs-libre/fix-xfreepixmap-call.patch b/libre/kdelibs-libre/fix-xfreepixmap-call.patch new file mode 100644 index 000000000..5f5354633 --- /dev/null +++ b/libre/kdelibs-libre/fix-xfreepixmap-call.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()); + } |