Backport upstream patch which fixes crashes on dialog quit spotted by Egor Y. Egorov <egorov_egor@bk.ru> wrt bug #469334.

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 45 insertions, 11 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/Manifest b/kde-base/kdelibs/Manifest
index e8bccc0eaadc..b6748b973092 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -5,6 +5,7 @@ AUX dist/01_gentoo_set_xdg_menu_prefix-1.patch 592 SHA256 dea20e8a0e8f0ecc1aec1b
 AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9 SHA512 e4d057665461dc27bda326178c8c21dbe75458a9cdc3cf976cf1e5b549d18732cd538c17fbad1f67b09188da0650e8d9c16d43076ffcfe06003484ddb442eb04 WHIRLPOOL f741e12a2a03a56a24ee734f6cf56d16d7621d708b87ea3be04e11b99cf24b9af53c88c4304c3b2d225e51c7403f8aacb1fcb152cc227bb5f98d6dea276250be
 AUX kdelibs-4.10.0-udisks.patch 2012 SHA256 a856a103831162da416ea07ab9f18db5d5eb4732ee9203c9d6799a4616e53f25 SHA512 b22d2f70f17618d5f2d11e9037c4d198a1fa11252d59098f120cc77cc12bcb3d90f1a69c63f33abb01217f396f3eb51ea8285e5ff5306eb41e63cc15654ced33 WHIRLPOOL 6c6b33afdb29fda62798f9b7121711bf8f8de44bd4839523316abb9a2a05e6e9f773e700b1e43fc75564aa82d18490aeec5ca04c51418d37d2f9b3c8924daf9f
 AUX kdelibs-4.10.2-security-url-dont-show-password.patch 1284 SHA256 c6feac6a69840fcd91d82dd448000295bba0c113306e4abf71d8222e8ab020cb SHA512 7e6a238406d5e1e770255199b82dd337845427b93906fddaeccbbf86d91bb825f379818304bfbc91d5e8df942e48cd71aa872e0ad5102b7e1ece2484c60ec337 WHIRLPOOL 68e2a4e62b911d4dccd7df77a9343a20b750356a424436c7469d46e09c760535047363a8d36b06d865c39b40fcf3aff71fcdcac8a9686b599de154bcd56523e1
+AUX kdelibs-4.10.3-dialog-quit-crash.patch 729 SHA256 08574995956ff96593d8bc4aa931b6e4a71e5c841217d6acbfe19703d5d16a80 SHA512 f4f9db3aa4a75a668cb9982aec41ac2ea4887b9a1d381f2993f0a3e045a38dd509b0c9c9c0c94f24d127973701386a62b8266eca1c09302ceaf8b590d8101cc7 WHIRLPOOL 74872525e6c0da5799311d4533eb4597393fa9f1b1b073d87194006f849221a97380772e8ac317e4587fba2ee61e9b7ab011a1d8a55be82e0cbbbc1dcbfe8bac
 AUX kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch 2210 SHA256 3602e079a4788feceff27f7f6bcaeff33828c259a81d0357f7df092000f98a6a SHA512 9207f2ab33e757d3d8ed3279350ea4326339129f232bb67bcce7b3806480fe551c9ba03a93d289df311e913055c343c925f957eb0b0b24bec6a7ef59017090a2 WHIRLPOOL f63b26fc0657f7e72856b493fc469af1cfaa68bb18b1dd4078f9dae44c37a3bdec9114c6a2c92c55b2cdde4d7cbc2ea072df1157b26e43f844dccf16ec8b1f8d
 AUX kdelibs-4.4.90-xslt.patch 553 SHA256 ffb7b7f44d3e840d1fe5e3b1d859db74f6bf534d44160f48e0f91993200ab55b SHA512 0016a0cb2f4a93cc2a9638a74c8aa42759830304abf97b608393099093a35205bcdfbd0a8a6d501f6628119de34d39c7a40cac9ed99bff7081c651f678533dea WHIRLPOOL 8fd53eb3a5bb083b12f1ff1e68f5ba9208a5badd0210944bf62297899a7416d61cbd29d24adc02024b70789bad289abafcfa24b02370e5ea5929b39022dc6f46
 AUX kdelibs-4.6.2-armlinking.patch 1129 SHA256 9b076d1587bb02b85353f3a155199fd6dace7d1c76f189667787bca89192dee6 SHA512 d0208e095e751d4064e3f9b7d836135bce8c7f1cb7b4f1a20ef4d86d2fd5a08523c563c72ab86a871929000f26e4d50fa58fd81f7996edc57066984ce508ff1d WHIRLPOOL 81535f48c1ab14e37fd0dae7751317e72c53f4c55d4c28be67db8c6782af9a0a5e1ee3aba48680b8d367c9b6dda4d0e481392826b5eb597e1965bfbff70aaf38
@@ -15,18 +16,18 @@ AUX kdelibs-4.9.3-werror.patch 1521 SHA256 0dbcfe622041387fddac550c37b30bfd5cf36
 DIST kdelibs-4.10.2.tar.xz 11979652 SHA256 1f9b40837a3d622a1a128ffcc1beecf11bd82b635bb1c227f4f82f73d7bdd4af SHA512 801672d1f0dfc4550d0712287ede4aebc3bac6d5f56be848d829b7205d191d1222dc17dfe82070f333081315c4151f69eb78a8cbb97ac61ba8e9b5ef69b18402 WHIRLPOOL ba9fdcaeafe802c13b1ced38fac9e12900ff495e5aee3f2835371e3c1b63e8d5d3837a802ff2ab1135d49298e1e748bcd212fded36fbcfcd6e27c03814eba2f0
 DIST kdelibs-4.10.3.tar.xz 11981656 SHA256 5fbde0b372e6c2054ee3c620f3e465b452d2bf90a0c6ab3cc98d153e3a572cef SHA512 88b574b65cfce24d0b1ab89ccccb02fb1ced3677ceaaecc016fbf353568b63b9a799be94394e14bc74dcfd6f49829d5bbae95377b16e48aef0f9470693ef2286 WHIRLPOOL 42cf07fe1edc85b549d97aca1f39c02f7410168c842b5ccb30232f347e893f010e530913b9a76fc0569f205d08ef2a964988798b1ea207c697b5ae2046236878
 EBUILD kdelibs-4.10.2-r1.ebuild 8819 SHA256 aaaf1832f06d4c0e1a00ea846dd0137b32d764877c402ba4a88ad04e9c3a5cc1 SHA512 0f6753ea9916cac11bbd1e29b82e179fdc672a04a709abf08851405fb9c63fc8565d5101ebf54dcecfca868cef04e04bf248518634f0cd7d7275a545ecee2f7c WHIRLPOOL 4730ff49b301b2b26cddb91d16c111e2ef833cf80c52d3315d61450859e6994f17896d45548a1034ebe1f41ded8bdae7c764f123fdddf9a58f12cf1fb7bb815f
-EBUILD kdelibs-4.10.3-r1.ebuild 8828 SHA256 2da526c58076e058eeb9532fda3f2565855c608b4dfa7951355e966db95b5474 SHA512 46cc15d8e139f4391f55aaf4ffa513355b5fcaf5abfd8f044a4380195c4e8f0433cdfe8547b7215bd2ba9ffdba17856df87e9acfa73284f05a301da9e2cb0f43 WHIRLPOOL 7974eed1275a26035dd2d6c38597d9bf0e6f8be7753ed10d64a0030fc956b981be018446094909d4544a280eb9711ba3be36fa8173c31613eae491f85aa3e155
-MISC ChangeLog 42736 SHA256 312cb12b31290c0b0f3420894babf98bb5f37fbc22fae529b7a630b21e84426a SHA512 915fbeb5100ac10753fc7c8f542739ed448e053f82c28d33711d342a3e9e8607684b90445c586e2985919af4a2d407aca094b77d034cc701c8d3039b3a9c8ab5 WHIRLPOOL ddb31b4ad6f89a3e7b0df49bd70e18819d47602c1b29f8f362281583129d20c1506604ed00dcdb3d343fe126533adb6cb4629f467c6c3eb1a36c70e3ecb13358
+EBUILD kdelibs-4.10.3-r2.ebuild 8880 SHA256 fdee56e4565da3d22c601200d84aa0060f685179706a5b19f279c0ff895ba826 SHA512 eed6934d8e76a95f977973fc2ca6d5610059fe4937d9ca0114db933a5333eb57fdd8bd027bc6d8a4839170831f488705a7bf1c4678c174a65b72eaff1d24149a WHIRLPOOL 69e2835fcb8ab8082e339ac5c6d304b87ae3b89952cb6c9ac548c3426b0f8b7e89c8e3810298fe4005ad1bd5bb4630521f65704941eead2a697873df7b4e7248
+MISC ChangeLog 43050 SHA256 bf4fc69dcb850cfd2ec1defd57bbd2022dd919587dd071a323f73fc06f845ed1 SHA512 1b7cebeebef05f84061e49b17f063af28f6273f0e357b26e7c59faa8840e9f5d8dcba84677c430080331f2616060b2b4748edcf125bbcf4fa26b5e8eab8be2fb WHIRLPOOL 687d27f639b927f9c331f42826baa10e4c6f8a582dae9de3b4c968ede29e9b2aa43dff167ce43ddf96a8da43d76e88d8e0952d96c0cf51954b4d5688e6a66f0c
 MISC ChangeLog-2009 110608 SHA256 845ba7764dc9cabd4753d146e82cc0347a0dbbe21a76a4aab453106e7d70ba1f SHA512 c643c3bd742f1c2c4322217b4d9f2992310e9bf86f585ef687cf68f54ed2a86d2950f7f3c3fc5021a2dd472b6db39e17415ca6cde478e4ef4f91317a116889b5 WHIRLPOOL 8dd58bffc294a811176bc3f9882a0fa8a12c02fcdd692bacfccfc9745646d5062d3980553388fcdc835bbbecefd0783f029d07a5999e7208ceece5a93fa36893
 MISC metadata.xml 391 SHA256 fc53374fd33574da578cb1d31e89f7cbdee57aff3cbf5d7284e778edbce2acc0 SHA512 6c6a2d72311cd226b6f8b4b971bcf3547c43b54148b7286849f37ed1d586984aa39642e83f69034d942c4e478fa41ba7d815a13a0eb01f8ed5b74b3552270c69 WHIRLPOOL 9313efac3ba14c2b1b75703071bde802b41027e46d511bc8cf3efa055cf6967758aac541d60bf10a10e24c96b6f2109e848d12950cf802398d6563290c8c2039
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRj61fAAoJEO+t9ga+3I3aX+EH/08ocAbzSzhx9Ob9M2vBHz8g
-yVHS5BMadcqnK7lQ/VqislF3HCTMcKId/oTTDR8PPZaUF8BGA7RpYyBy9LDvri6g
-mYECCgljDNoxpRynJLYgigA2NJy4XfRW2EnhhkHK7OMv29OTTL/UvfFkqg9w5UKV
-AFqIdWZIHHjZxKOCBFiZoss//P1Yl4DubXQX3edX/7zILCJ9txveINaaYdO4zzLI
-myErkHPH4uW0j4uB6CCLquBgUwyHsLcAs757DaW/WVdgu+MCn+W9tvA5gntff+bH
-KysDZ8FOddmf8urDBZmpH2HRFzKx/+IUwo4m9A4GVwPrbyOT0hU+DP9HQlj23rI=
-=vx9T
+iQEcBAEBCAAGBQJRj7RJAAoJEO+t9ga+3I3akhwH/RoBjD4EJjbaAG0YZBYfmLZa
+A/IQgjABHDsYyGiA7BqRM4gU7k2nw81sE/ExBZ1ya23RhLgDAiSKeT8ftqeGup1k
+dteDbLrTbHqdNIb8CbWKSrO/g99y5PSbG3Oq7ZAn3ntByxTHr4Ai4dcykjSVoG+r
+1c5x19yijDZvs4MuRAVxOmTnu/XJE/AUg7Ck2TNLOCvwdqcqUhbJzpGjXA4alsn/
+9nbeFI6qPhWwFklwwpuCtJYuDMKmD4L1O87sCAn/baGU9TgT7AesoG3vpymlGAFq
+MzjfeAigydkF0qzKhz/mRj1d8wiExe2Qfluw/HB7CnTq2EIldCFPxFcdMAEoP10=
+=Llrp
 -----END PGP SIGNATURE-----
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() {