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

[Antonio Rojas]

    Date: Wednesday, August 5, 2020 @ 11:42:42
  Author: arojas
Revision: 669367

Update to 3.21

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

-------------------------+
 PKGBUILD                |   16 ++++++----------
 fix-python-libdir.patch |   14 --------------
 2 files changed, 6 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-05 11:33:16 UTC (rev 669366)
+++ PKGBUILD	2020-08-05 11:42:42 UTC (rev 669367)
@@ -5,7 +5,7 @@
 # Contributor: Giacomo Rizzo <alt at free-os.it>
 
 pkgname=gpsd
-pkgver=3.20
+pkgver=3.21
 pkgrel=1
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
 arch=('x86_64')
@@ -22,26 +22,22 @@
 makedepends=('scons' 'docbook-xsl' 'qt5-base' 'python-gobject' 'python-cairo' 'python-pyserial' 'gtk3')
 backup=('etc/default/gpsd')
 source=(https://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}
-        $pkgname.conf fix-python-libdir.patch)
-sha256sums=('172a7805068eacb815a3c5225436fcb0be46e7e49a5001a94034eac43df85e50'
+        $pkgname.conf)
+sha256sums=('65504c3af8d3b0cce3c07405b8815d7730d2d2be2da7d28d275f1a9c57c6fe91'
             'SKIP'
-            'dcfa71c4c730b486269995468bdcfa8e96bf3c282db1dadea9384d32015d277f'
-            '631cf609db1f4b26b94d324a9ca16624487781f0b8736c5c59d8c45acc5d7322')
+            'dcfa71c4c730b486269995468bdcfa8e96bf3c282db1dadea9384d32015d277f')
 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
 
   export LINKFLAGS="${LDFLAGS}"
+  _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"`
   scons prefix=/usr \
         systemd=yes \
         gpsd_group=uucp \
+        python_libdir=$_pythonpath \
         sbindir=/usr/bin \
         qt_versioned=5
   scons build

Deleted: fix-python-libdir.patch
===================================================================
--- fix-python-libdir.patch	2020-08-05 11:33:16 UTC (rev 669366)
+++ fix-python-libdir.patch	2020-08-05 11:42:42 UTC (rev 669367)
@@ -1,14 +0,0 @@
-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,
-