Fix compilation against sci-geosciences/gpsd-2.96, bug 367567

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

4 files changed, 98 insertions, 17 deletions

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 87f3af8b6747..f2b0b0b27450 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,11 @@
 # 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.108 2011/05/25 21:15:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.109 2011/05/28 22:06:43 dilfridge Exp $
+
+  28 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  plasma-workspace-4.6.3-r2.ebuild,
+  +files/plasma-workspace-4.6.3-gpsdapi.patch:
+  Fix compilation against sci-geosciences/gpsd-2.96, bug 367567
 
   25 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   plasma-workspace-4.6.2-r2.ebuild, plasma-workspace-4.6.3-r2.ebuild:
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index f045ab7fd93e..4b108f8da870 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -6,29 +6,30 @@ AUX plasma-workspace-4.6.2-oldpimcrash.patch 1220 RMD160 67982a1e2513d03ba94abed
 AUX plasma-workspace-4.6.2-optional_akonadi-server.patch 4897 RMD160 64260bce383713701f89243a57398378644d947d SHA1 df1370fc82e074b6bea7dff876129b6ff116418c SHA256 33620a0a68006f7382bbb85ef288cda03814bb0cd5972342214fbeb3b4a7927e
 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
 DIST kdebase-workspace-4.4.5.tar.bz2 77036766 RMD160 3f6e9ceb0df277b73ca6ec38de6c85f578077640 SHA1 d0defe431a760503f8fbb9ee2413b666b3c84cd7 SHA256 53475dacd95955ef01378d4de7e46602be13e81a1afac73fbed449bb367c20e6
 DIST kdebase-workspace-4.6.2.tar.bz2 69356153 RMD160 23856ab63e17e3971071f2ccd02bd78d546c71e0 SHA1 63efb68733f347d0b7d24a7a061c5a0e3f84dee7 SHA256 6a55a53282a0ec7dd61f16f87fb8d0097d945891504982eb5122c96238b711e1
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 EBUILD plasma-workspace-4.4.5.ebuild 2909 RMD160 06e2be7bd9bc3c28c510c7880e69d4aec15ba415 SHA1 59a3bc64bedef03958d9844cead6ed65d8c37e71 SHA256 39714c6a68948f4b4ad804ebdc94572d7d266249a71c2e9338850ca60cd2c59c
 EBUILD plasma-workspace-4.6.2-r1.ebuild 3512 RMD160 aa4895f646fb093dd92c690ad71f43468ccfca84 SHA1 f35d4fee7484c8223363dc92bf01da44028f4233 SHA256 73ec0aae4a440de15781079a62195233f77abf7240f6b5f56f4566ad04f64396
 EBUILD plasma-workspace-4.6.2-r2.ebuild 3579 RMD160 3a01f2989057fafb0f1cbe9284497acba709a026 SHA1 580d3dc766f567d0e1686d80e57d6856ba66e154 SHA256 91cfcf71e19c30fa1140b9a1729842567ed2fcb017a9010720ce02c0fad0dcf8
-EBUILD plasma-workspace-4.6.3-r2.ebuild 3530 RMD160 c8a4562aac80947ade2162be7181c28154b9f748 SHA1 90d88dafacce109c8925bcf224bc22d65d23772c SHA256 9d8a9e1f8d91e5003a972d74444cf179fdc9a314efc3911f4784b5a6828d4382
-MISC ChangeLog 16761 RMD160 5ebf684e2441d8aef28b08216b01e16889f253ef SHA1 ff5c85987bc812ebb41ad8cabea0baa5511d6dcb SHA256 41edcb40a4d47fd5a45458c927f2a9c257fa779fb0112df36d16cb11225ffd3e
+EBUILD plasma-workspace-4.6.3-r2.ebuild 3571 RMD160 f1859d88eb831974e43032fe22cd87046ce63bcb SHA1 d3e7360852be8da72dd3d6fe820b545172271ade SHA256 3df2d85ad10a7bb8ad3a837c05950445da0d83b8b015a302231763a27fcc2bbf
+MISC ChangeLog 16966 RMD160 66973051cc4874112c9f6733a6421a64f557af84 SHA1 747b1efce3bc506f385d027f8522decc436b42b8 SHA256 9615d6fd5f58f4a273e5b9985dcc3d1ad4377c54ead9136f8c4db73be7e67819
 MISC metadata.xml 426 RMD160 c97840bcdd9f62d76728bc99edf3807c6a3bb155 SHA1 050bfc476b5f6e9ad5096050ca5d1e88b79e7d7d SHA256 861524f41b7fb32a40b8d88ae98f6ec76b657bfc251b9133a40bdd48c2fd430c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN3XGTAAoJENwGBM22xffeHHYQAIdvNNgBm8H466FAh7KKmRQs
-AmgrBDjK8z0TCkrmNTkj66g3/bsoQbZgIDLSowkce+FUBFUWriXOQO9iS5pwY6UO
-VAo3G2J+JAuZ0fbi839W16ybt/aCVNUvq6yxQq3DLV9+XKWhr7arRxllRtG02P6H
-mqx37Waf8KhJmpozdAYphrU5wt/NIkpMsD0ORg7G+YyQev+7dAKyyZseaM1IINed
-yi9hlxPvSICTmU/473dBZFYth6CD+0uvAH7s478eH88Rexbznq8Dqc9gb7dlTiqW
-LiM0g3UuW6yh+4HIWalEjS70WeYe4QMaPedcH++LksL4I7jxjFWjxH0IP6CptVLS
-/9mg+PiSqdpCXD7X+jhSGQ6G/MOZKILfhx0WZZuHRnQJNm1EDtpCyeDGUVMOg7Qh
-uAFcOeCmZ/hof7PwvygYPAYMMRPffMdb66PA13JzlPS/Vr/IcuPdJt+f82lBFD7E
-FvY7KmbvPg5sCdIea9PsHuTr2upjj5saPCgv65uCvjIrMBlcLByRj3VBeQxo1Vzg
-zdxY75D6xVSOyXsm3UVtvrNMRkz9N2c3fSUjriZXH9YY8M1IqSpTwD566iOptCmG
-MtftmUj1lahRYCKThOdDgMyOr7q8jsJXqQSGo9SdFEsveZXF+QeMrKAIikwHwwe9
-wMD793R8FcV1Qvixxxrb
-=Bu3Q
+iQIcBAEBCgAGBQJN4XH+AAoJENwGBM22xffeA0kP/iFcLrYg2ga/2AJCx66jL2tQ
+OKRM5S+orrWYvzXtgNiiKD/NqYzTzOO1UNE7jgyTx3aJOhcunssSVnAHGHVUAf/2
+Msp6odmrkKxalBGerh2fQEVHyAne91uiCHSazs/WwE1xfm4I/tQ0ZWVodyVa3kit
+ipwNgvHSCmSTqPRKqo6sDpRnS5zO3JnFZ3VUF9hDxcsuKXdnu9DmyVa+T5HKKrmE
+vgEi9/LY0VH46q8JdejzQ3krANFFMbEAipe94dCm4cP9sI6dzNQE9S5zOgs3ER3u
+mN3W+v1OKOX9bbSWgSpGd8gFMnXmSz6AYwJKz9pSA9pkeYzhFEt6eGXB8RZAy8xw
+oVZeh2dPcql+73HoRuILsMbGyU05kla8nKiuaDOFEDgG7zGr46BREvK41MVHrYFy
+erNJZ4XvxiWeY9+svd7lFN2jYzu7Iu4aKXnp20IR15EG9W8izMOtmg8UFLNMDujh
+kVcniXTfEHpK+bDxMJLbQ5XyaWN/sIfQ5zE5NAvXzIAiY4JqZss9xn3BbcSkZjBb
+SrPojBnl+XZJRCJ+iHpPNB80+DZhgt5nAU8K8HKhI7GhDicND1qoqXyaEPsnOcM8
+dyt0kv9pto1fwdjHUGlZJSdmtNZhHZkKIcvAzWqGxRMeyrEK/T/ZWWlYARiU4vlm
+oPVIoHTfmF96oT+Ka7Du
+=QU2m
 -----END PGP SIGNATURE-----
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-gpsdapi.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-gpsdapi.patch
new file mode 100644
index 000000000000..f24aded13a93
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-gpsdapi.patch
@@ -0,0 +1,74 @@
+From: Rafael Fernández López <ereslibre@kde.org>
+Date: Thu, 28 Apr 2011 11:35:53 +0000
+Subject: gpsd api has changed and for GPSD_API_MAJOR_VERSION >=5 there are
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=a3009dd96e8519bcc205d75c29e18bbbb81fce03
+---
+gpsd api has changed and for GPSD_API_MAJOR_VERSION >=5 there are
+some calls that are slightly different. Make the dataengine compile
+against this version and previous one by adding conditional code.
+
+REVIEW: 101247
+---
+
+
+--- a/plasma/generic/dataengines/geolocation/location_gps.cpp
++++ b/plasma/generic/dataengines/geolocation/location_gps.cpp
+@@ -51,7 +51,11 @@ void Gpsd::run()
+     while (!m_abort) {
+         Plasma::DataEngine::Data d;
+ 
++#if GPSD_API_MAJOR_VERSION >= 5
++	if (gps_read(m_gpsdata) != -1) {
++#else
+         if (gps_poll(m_gpsdata) != -1) {
++#endif
+             //kDebug() << "poll ok";
+             if (m_gpsdata->online) {
+                 //kDebug() << "online";
+@@ -73,11 +77,19 @@ void Gpsd::run()
+ Gps::Gps(QObject* parent, const QVariantList& args)
+     : GeolocationProvider(parent, args),
+       m_gpsd(0)
++#if GPSD_API_MAJOR_VERSION >= 5
++    , m_gpsdata(0)
++#endif
+ {
+-    gps_data_t* gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT);
+-    if (gpsdata) {
++#if GPSD_API_MAJOR_VERSION >= 5
++    m_gpsdata = new gps_data_t;
++    gps_open("localhost", DEFAULT_GPSD_PORT, m_gpsdata);
++#else
++    gps_data_t* m_gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT);
++#endif
++    if (m_gpsdata) {
+         kDebug() << "gpsd found.";
+-        m_gpsd = new Gpsd(gpsdata);
++        m_gpsd = new Gpsd(m_gpsdata);
+         connect(m_gpsd, SIGNAL(dataReady(const Plasma::DataEngine::Data&)),
+                 this, SIGNAL(setData(const Plasma::DataEngine::Data&)));
+     } else {
+@@ -90,6 +102,9 @@ Gps::Gps(QObject* parent, const QVariant
+ Gps::~Gps()
+ {
+     delete m_gpsd;
++#if GPSD_API_MAJOR_VERSION >= 5
++    delete m_gpsdata;
++#endif
+ }
+ 
+ void Gps::update()
+
+--- a/plasma/generic/dataengines/geolocation/location_gps.h
++++ b/plasma/generic/dataengines/geolocation/location_gps.h
+@@ -58,6 +58,9 @@ public:
+ 
+ private:
+     Gpsd* m_gpsd;
++#if GPSD_API_MAJOR_VERSION >= 5
++    gps_data_t* m_gpsdata;
++#endif
+ };
+ 
+ #endif
+
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.6.3-r2.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.6.3-r2.ebuild
index acde33f5ef47..9bf1e2e13208 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.6.3-r2.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.6.3-r2.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.6.3-r2.ebuild,v 1.3 2011/05/25 21:15:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.6.3-r2.ebuild,v 1.4 2011/05/28 22:06:43 dilfridge Exp $
 
 EAPI=3
 
@@ -75,6 +75,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
 	"${FILESDIR}/${PN}-4.6.2-optional_akonadi-server.patch"
 	"${FILESDIR}/${PN}-4.6.3-dduplicate.patch"
+	"${FILESDIR}/${PN}-4.6.3-gpsdapi.patch"
 )
 
 pkg_setup() {