[arch-commits] Commit in gpsd/trunk (PKGBUILD fix-python-libdir.patch)

[Antonio Rojas]

    Date: Friday, July 19, 2019 @ 23:02:15
  Author: arojas
Revision: 492232

Update to 3.19, install xgps and xgpsspeed (FS#60783), fix python install dir (FS#61535)

Added:
  gpsd/trunk/fix-python-libdir.patch
Modified:
  gpsd/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   18 +++++++++++-------
 fix-python-libdir.patch |   14 ++++++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-19 21:06:06 UTC (rev 492231)
+++ PKGBUILD	2019-07-19 23:02:15 UTC (rev 492232)
@@ -5,7 +5,7 @@
 # Contributor: Giacomo Rizzo <alt at free-os.it>
 
 pkgname=gpsd
-pkgver=3.18.1
+pkgver=3.19
 pkgrel=1
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
 arch=('x86_64')
@@ -18,16 +18,22 @@
             'python-cairo: GUI frontends'
             'python-gobject: GUI frontends'
             'qt5-base: for Qgpsmm')
-makedepends=('scons' 'docbook-xsl' 'qt5-base' 'python')
+makedepends=('scons' 'docbook-xsl' 'qt5-base' 'python' 'python2-gobject' 'python2-cairo') # remove python2 makedeps when scons moves to python3
 backup=('etc/default/gpsd')
 source=(https://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}
-        $pkgname.conf)
-sha256sums=('5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e'
+        $pkgname.conf fix-python-libdir.patch)
+sha256sums=('27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39'
             'SKIP'
-            'dcfa71c4c730b486269995468bdcfa8e96bf3c282db1dadea9384d32015d277f')
+            'dcfa71c4c730b486269995468bdcfa8e96bf3c282db1dadea9384d32015d277f'
+            '631cf609db1f4b26b94d324a9ca16624487781f0b8736c5c59d8c45acc5d7322')
 validpgpkeys=('EED4A0893DCC705DB309E202CCF29C7238522905') # Gary E. Miller <gem at rellim.com>
 # validpgpkeys=('41876B2F579463A499843D1DECC8208F8C6C738D') # Eric S. Raymond
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../fix-python-libdir.patch # Fix python install dir
+}
+
 build() {
   cd $pkgname-$pkgver
 
@@ -43,8 +49,6 @@
 package() {
   cd $pkgname-$pkgver
 
-  # Fix man pages path (FS#21715)
-  sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1
   # Fix path in systemd files
   sed -i 's|local/sbin|bin|' systemd/{gpsd.service,gpsdctl at .service}
 

Added: fix-python-libdir.patch
===================================================================
--- fix-python-libdir.patch	                        (rev 0)
+++ fix-python-libdir.patch	2019-07-19 23:02:15 UTC (rev 492232)
@@ -0,0 +1,14 @@
+diff --git a/SConstruct b/SConstruct
+index b8f3fb1..e133ece 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1034,8 +1034,6 @@ else:
+             # follow FHS, put in /usr/local/libXX, not /usr/libXX
+             # may be lib, lib32 or lib64
+             python_libdir = polystr(python_libdir)
+-            python_libdir = python_libdir.replace("/usr/lib",
+-                                                  "/usr/local/lib")
+ 
+         py_config_text = config.GetPythonValue('config vars',
+                                                PYTHON_SYSCONFIG_IMPORT,
+