Backport fix for weather widget related crashes, bug 372397

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

4 files changed, 59 insertions, 19 deletions

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index e8707e1ac08a..b0a31bd1bcf1 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.130 2011/11/02 20:48:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.131 2011/11/12 17:19:56 dilfridge Exp $
+
+*plasma-workspace-4.7.3-r1 (12 Nov 2011)
+
+  12 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -plasma-workspace-4.7.3.ebuild, +plasma-workspace-4.7.3-r1.ebuild,
+  +files/plasma-workspace-4.7.3-weathercrash.patch:
+  Backport fix for weather widget related crashes, bug 372397
 
 *plasma-workspace-4.7.3 (02 Nov 2011)
 
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index 6a3cd8e8d797..374097a3b080 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX plasma-workspace-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
 AUX plasma-workspace-4.6.2-oldpimcrash.patch 1220 RMD160 67982a1e2513d03ba94abed3bb173f35e1b80a22 SHA1 d7772213e89aed087672d57b97de81c3626800f7 SHA256 059bbe148d3af039d3523d494e3619dc44531bc53765d7944a6f5ce66cee2a1c
@@ -7,6 +7,7 @@ AUX plasma-workspace-4.6.2-optional_akonadi-server.patch 4897 RMD160 64260bce383
 AUX plasma-workspace-4.6.2-panelplacement.patch 14030 RMD160 6040b6a7acba19073f81483d4b6823638f791a22 SHA1 0e5b825b4d15362a0872f6d54f58c3f1ba4c174c SHA256 71ff67df3956806c9d949780245719dcea6837953ed555e6e7c5773dc3fbacb6
 AUX plasma-workspace-4.6.3-dduplicate.patch 835 RMD160 5231815b4a8c64ebeb4b8d77bdfa46512bd50ea8 SHA1 ca55cd0a25fd8cfb95fa3b1cdd373d496fd7312d SHA256 ea36fb98ed122dc039b28337df028887919bced1b1413c04fcb9488dfc87e108
 AUX plasma-workspace-4.6.3-gpsdapi.patch 2233 RMD160 d3d51fa4a07ad4f3719060dfcd03af0c15fccb8c SHA1 f91d01066241cd3e78b825addf360db23716bf52 SHA256 29939f28bc8fa93041ebcb44bde05cd5151559ec314a87e2628388b1f38c2288
+AUX plasma-workspace-4.7.3-weathercrash.patch 1248 RMD160 a6e636bb4a7718557ff9b90f96b838c0e518e196 SHA1 915594b561107980633da44a64d5b2da4d5dd968 SHA256 18f6af44a45841f1912eb73a0d3a93415b2665cd5e3e0352a13e58fc1ff7b141
 DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
@@ -14,23 +15,23 @@ DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338
 EBUILD plasma-workspace-4.6.3-r2.ebuild 3577 RMD160 d0ab587a6ecba68eae11c154bda402710792fc1e SHA1 586dd8977565a91c1ccc34767186fa0c413a8324 SHA256 1f2a8414b6939b95ebb960de43b1d958c91d6eff5cd8ef2b40552c4099296ff1
 EBUILD plasma-workspace-4.6.5.ebuild 3513 RMD160 b1169802a4c9b98b8ca5fe5b0f3a69050db3a74a SHA1 4980d0348ba428181bbe3b7d4cbec31dc5b998b4 SHA256 05d09ab7aa6a39159aa61ebcbf4179922c75baed5ee090912eea4f2c6c083a09
 EBUILD plasma-workspace-4.7.2-r1.ebuild 3464 RMD160 c3d04bb0978972b7d3fe51965146412db35f90e7 SHA1 aca6b98a355f2bc1e15cbd7bf3465c2c50d5da5c SHA256 752cb2e5e65a81af4af9ec67ac2e79c189e649afc082a4be5bd4b9727c5a0ffe
-EBUILD plasma-workspace-4.7.3.ebuild 3463 RMD160 4efcc6d2fed77a25c1e2a79210ea844d531c37ff SHA1 395726a9e94dae994ef2d99055fe62c66fa618d0 SHA256 076841ed221bfc6cb68d7b15b89262f6ae618ac10038be2d4593563378a664fb
-MISC ChangeLog 20346 RMD160 be7a5480f1dc0c51a95fa7b3b535b37447e24a48 SHA1 c7002764f087868becc2dbcd109845d63761179f SHA256 f8f08b90169fa5ba7bedb4d33ea554d469e3c8c26f115d2ff308a0b56b5c8679
+EBUILD plasma-workspace-4.7.3-r1.ebuild 3515 RMD160 53b89683ab199e9d1cb2cef55dfff4ee53554647 SHA1 51b78415db616e114d0377c14481ded8849311ec SHA256 b1c0845b6fcbcad6efb05a14d213afc2b5cb14be40bc5a5809a138ab18de2a1b
+MISC ChangeLog 20632 RMD160 ef074769366443e4fd5265892a3f6332c4b9d7b4 SHA1 34ff56d8d2fb1737a97240ef69719824786d3397 SHA256 85805f8ca8c9be29722bdc269a8fd4942dc540c075e6f976274d3a8d35248c15
 MISC metadata.xml 426 RMD160 c97840bcdd9f62d76728bc99edf3807c6a3bb155 SHA1 050bfc476b5f6e9ad5096050ca5d1e88b79e7d7d SHA256 861524f41b7fb32a40b8d88ae98f6ec76b657bfc251b9133a40bdd48c2fd430c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOsa7lAAoJEOf+E+/4L5Lm43EP/Roab107wMpK+DXshFvEldzx
-w6Nhcvd7gUk1GFFOMaA2iLg+gD8U+L90pDStHxmfzgmW7/27mjIvcVGy/o7PzVlw
-DpeIm4B/vKkPgmcCuezjct1B5macwa/YVEOcF1RDwZP1j2ryrlAFPj1tt+Ar7hyZ
-lO/wTwLpxEXQYFa3RWStaM3bG0SREZCm+ZhldtaL01YMvYekRNAXH0Fg9ItLWnCA
-ZNie2U5jpQMo4csKTWT6eQpnbazvfgfD1hzcBcXIhlqpMAF3wRdBaoWgy87ty8eb
-OEIOb1yQIPkGwa6uqfqzvbOv9v0bSWUd49mmJgxDwbCVcyNN0qWgfTgU6rPULjQY
-oHFckXbeOogCWMpl4pmB5uQkGTjTj1x5jon5bCUgIpPjZ9TZ92jeUm+Dl5ONcGYi
-LtNHAn5anXS6PFxUqsJ51iKZxET2Pv+Kr3i0iRj9KXs26RM+LnlAnzs+rAXFUcDr
-9BQghTPJW8i2WDsOLPqgukVhjkq88RtkBbV2IZo7G0H1h5LVI5pQmeWv3uWR+945
-Q3LRwbTArtWl2W+Zp0KvFXTKOkzJHQTjrvCvhWiRiDu1Zr1g/Ug1H2IaLBc83Fak
-FNpq4zZWh34Ojdio+HRHltEcezBFqeNi0RE+h/t4lnKuSKwJ29tV/SqKDHPg9SHw
-UawQz1iz2dp9J05+KZRS
-=EMHm
+iQIcBAEBCgAGBQJOvqrPAAoJENwGBM22xffeM3kQAJENdU8aGCaVGQ/xDzUEyhkb
+0+MqTMuVadpquzTPVNWnr8BJxD6MqK/DCqNqVgHAJaW1l7v5KNpvKI7rHZsrI+HU
+EBKw5IrwYv4ArWjXksKJggkJthPJXexFHT9DQVtAPVCN0GMp+9wsX8SpU5D4ixQY
+rjsRx9VyzNa5SXRHLDJLqzmpZsAXgck4ggd6NRmZBCul/TUGLVIl7R10o7i7HzSX
+u9MLmZeJe07fPL4XDP5a+vKKjQOE0TRXo1JMXaCqEvzlbAuW8xFKkXCjHW5xRSIN
+c2vGsdS7JOmBwOgamlNv1bcMylyLH7wjZ/RA4rBV5oPtsO7OPOIyFgUiTs6X0wot
+6UqtiWVhjt1eexm79vCelqEo7xrq/FURQ7X/NY7GcwLdGKVF0AkIIDsUYUgXaaSB
+u5TCOmP4mjBKxv/CV6Ob3UYqmhOM9ZVGzwlSapw0fzOVaKXQORGnTQUGKNaombYR
+Bhiwm2G97kFmsjos0Sx+wFKFpy9ZMHOQ5yNIIjYJIkagp21LrHgIVUJrcrGmNqZ3
+42t50dAaLShl8IJeeM4xdYsmakQ21U79EBF7cMLL7mSbOrZTW52O1gJPE1dVo2xY
+UmumJ5fEsfIXgRmnjGzYhTMpkxJyUTeOwEpGBoj8f8FWxL53lWvAO6e4GIgnBHSc
+KFMuXbCuCbhDBGW31VRt
+=+5iT
 -----END PGP SIGNATURE-----
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-weathercrash.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-weathercrash.patch
new file mode 100644
index 000000000000..a9daa5004ea7
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-weathercrash.patch
@@ -0,0 +1,31 @@
+commit 92b1e7cc6766023050aaaae41390bb5cfcc07ec5
+Author: Max Lin <max7442@gmail.com>
+Date:   Thu Nov 3 11:48:32 2011 +0800
+
+    Used the gps_open() return value as condition instead of checking m_gpsdata
+    
+    Checking the return value of gps_open() as condition instead of checking
+    m_gpsdata for GPSD_API_MAJOR_VERSION >=5, there should be prevent crash
+    occurred when no gpsd running.
+    
+    BUG: 277036
+    REVIEW: 103035
+
+diff --git a/plasma/generic/dataengines/geolocation/location_gps.cpp b/plasma/generic/dataengines/geolocation/location_gps.cpp
+index 709321b..551aec2 100644
+--- a/plasma/generic/dataengines/geolocation/location_gps.cpp
++++ b/plasma/generic/dataengines/geolocation/location_gps.cpp
+@@ -83,11 +83,11 @@ Gps::Gps(QObject* parent, const QVariantList& args)
+ {
+ #if GPSD_API_MAJOR_VERSION >= 5
+     m_gpsdata = new gps_data_t;
+-    gps_open("localhost", DEFAULT_GPSD_PORT, m_gpsdata);
++    if (gps_open("localhost", DEFAULT_GPSD_PORT, m_gpsdata) != -1) {
+ #else
+     gps_data_t* m_gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT);
+-#endif
+     if (m_gpsdata) {
++#endif
+         kDebug() << "gpsd found.";
+         m_gpsd = new Gpsd(m_gpsdata);
+         connect(m_gpsd, SIGNAL(dataReady(Plasma::DataEngine::Data)),
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.7.3.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.7.3-r1.ebuild
index 05c00ebe47af..648c7a619703 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.7.3.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.7.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.7.3.ebuild,v 1.1 2011/11/02 20:48:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.7.3-r1.ebuild,v 1.1 2011/11/12 17:19:56 dilfridge Exp $
 
 EAPI=4
 
@@ -74,6 +74,7 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+	"${FILESDIR}/${PN}-4.7.3-weathercrash.patch"
 )
 
 pkg_setup() {