[arch-commits] Commit in stellarium/trunk (PKGBUILD stellarium-gpsd-3.19.patch)

[Antonio Rojas]

    Date: Saturday, July 20, 2019 @ 08:29:46
  Author: arojas
Revision: 358409

Update to 0.19.1, fix build with gpsd 3.19

Added:
  stellarium/trunk/stellarium-gpsd-3.19.patch
Modified:
  stellarium/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   21 ++++++++++++++-------
 stellarium-gpsd-3.19.patch |   13 +++++++++++++
 2 files changed, 27 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-20 08:20:55 UTC (rev 358408)
+++ PKGBUILD	2019-07-20 08:29:46 UTC (rev 358409)
@@ -2,7 +2,7 @@
 # Contributor: Damir Perisa <damir.perisa at bluewin.ch>
 
 pkgname=stellarium
-pkgver=0.19.0
+pkgver=0.19.1
 pkgrel=1
 pkgdesc="A stellarium with great graphics and a nice database of sky-objects"
 arch=('x86_64')
@@ -11,21 +11,28 @@
 depends=('libpng' 'libgl' 'freetype2' 'openssl' 'qt5-script'
 	'qt5-serialport' 'qt5-multimedia' 'qt5-location' 'gpsd')
 makedepends=('cmake' 'boost' 'mesa' 'qt5-tools')
-source=(https://github.com/Stellarium/stellarium/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz{,.asc})
+source=(https://github.com/Stellarium/stellarium/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz{,.asc}
+        stellarium-gpsd-3.19.patch)
 validpgpkeys=('79151C2E6351E7278DA1A730BF38D4D02A328DFF')  # Alexander Wolf <alex.v.wolf at gmail.com>
-sha256sums=('0aa91d9029ec7a5ac1f318868a79aa774f6cf690f856d085004195fa2ec352d6'
-            'SKIP')
+sha256sums=('0f25ad2acb59b75a49568c82123219aed5a14252c2ef39d0444540057d2cfb68'
+            'SKIP'
+            '37e2b4ce4d4059f82c4a627e4b2de699167833938e06fd65b3a8aae022eb69dc')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../stellarium-gpsd-3.19.patch # Fix build with gpsd 3.19
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
  
   make DESTDIR="${pkgdir}" install
 }

Added: stellarium-gpsd-3.19.patch
===================================================================
--- stellarium-gpsd-3.19.patch	                        (rev 0)
+++ stellarium-gpsd-3.19.patch	2019-07-20 08:29:46 UTC (rev 358409)
@@ -0,0 +1,13 @@
+diff --git a/src/core/StelLocationMgr.cpp b/src/core/StelLocationMgr.cpp
+index c62bd868cd..85dcafcd8e 100644
+--- a/src/core/StelLocationMgr.cpp
++++ b/src/core/StelLocationMgr.cpp
+@@ -163,7 +163,7 @@ void LibGPSLookupHelper::query()
+ 				qDebug() << " - xdop:" << dop.xdop << "ydop:" << dop.ydop;
+ 				qDebug() << " - pdop:" << dop.pdop << "hdop:" << dop.hdop;
+ 				qDebug() << " - vdop:" << dop.vdop << "tdop:" << dop.tdop << "gdop:" << dop.gdop;
+-				qDebug() << "Spherical Position Error (epe):" << newdata->epe;
++				qDebug() << "Spherical Position Error (sep):" << newdata->fix.sep;
+ 			}
+ 			loc.longitude=newdata->fix.longitude;
+ 			loc.latitude=newdata->fix.latitude;