Date: Friday, January 3, 2020 @ 23:47:57 Author: arojas Revision: 547774
archrelease: copy trunk to community-x86_64 Added: gpsd/repos/community-x86_64/PKGBUILD (from rev 547773, gpsd/trunk/PKGBUILD) gpsd/repos/community-x86_64/fix-python-libdir.patch (from rev 547773, gpsd/trunk/fix-python-libdir.patch) gpsd/repos/community-x86_64/gpsd.conf (from rev 547773, gpsd/trunk/gpsd.conf) Deleted: gpsd/repos/community-x86_64/PKGBUILD gpsd/repos/community-x86_64/fix-python-libdir.patch gpsd/repos/community-x86_64/gpsd.conf -------------------------+ PKGBUILD | 157 +++++++++++++++++++++++----------------------- fix-python-libdir.patch | 28 ++++---- gpsd.conf | 10 +- 3 files changed, 98 insertions(+), 97 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-01-03 23:47:32 UTC (rev 547773) +++ PKGBUILD 2020-01-03 23:47:57 UTC (rev 547774) @@ -1,78 +0,0 @@ -# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> -# Contributor: Tom Gundersen <t...@jklm.no> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Giacomo Rizzo <a...@free-os.it> - -pkgname=gpsd -pkgver=3.19 -pkgrel=3 -pkgdesc="GPS daemon and library to support USB/serial GPS devices" -arch=('x86_64') -url="http://catb.org/gpsd/" -license=('BSD') -depends=('python' 'libusb' 'bluez-libs') -optdepends=('gtk3: GUI frontends' - 'php: generate a PHP status page for your GPS' - 'php-gd: image support for the PHP status page' - 'python-cairo: GUI frontends' - 'python-gobject: GUI frontends' - 'qt5-base: for Qgpsmm') -makedepends=('scons' 'docbook-xsl' 'qt5-base' 'python-gobject' 'python-cairo') -backup=('etc/default/gpsd') -source=(https://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.sig} - $pkgname.conf fix-python-libdir.patch) -sha256sums=('27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39' - 'SKIP' - 'dcfa71c4c730b486269995468bdcfa8e96bf3c282db1dadea9384d32015d277f' - '631cf609db1f4b26b94d324a9ca16624487781f0b8736c5c59d8c45acc5d7322') -validpgpkeys=('EED4A0893DCC705DB309E202CCF29C7238522905') # Gary E. Miller <g...@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}" - scons prefix=/usr \ - systemd=yes \ - gpsd_group=uucp \ - sbindir=/usr/bin \ - qt_versioned=5 - scons build -} - -package() { - cd $pkgname-$pkgver - - # Fix path in systemd files - sed -i 's|local/sbin|bin|' systemd/{gpsd.service,gpsdctl@.service} - - export DESTDIR="${pkgdir}" - scons install - install -Dm755 gpsinit -t "${pkgdir}"/usr/bin - chmod 755 "${pkgdir}"/usr/bin/* - - install -Dm644 "$srcdir/gpsd.conf" "${pkgdir}"/etc/default/gpsd - - install -Dm644 "gpsd.rules" "${pkgdir}"/usr/lib/udev/rules.d/25-gpsd-usb.rules - - install -Dm755 gpsd.hotplug "${pkgdir}"/usr/lib/udev/gpsd.hotplug - - install -Dm644 packaging/X11/xgps.desktop \ - "${pkgdir}"/usr/share/applications/xgps.desktop - install -Dm644 packaging/X11/xgpsspeed.desktop \ - "${pkgdir}"/usr/share/applications/xgpsspeed.desktop - install -Dm644 packaging/X11/gpsd-logo.png \ - "${pkgdir}"/usr/share/gpsd/gpsd-logo.png - - install -Dm644 systemd/gpsd.service "${pkgdir}"/usr/lib/systemd/system/gpsd.service - install -Dm644 systemd/gpsd.socket "${pkgdir}"/usr/lib/systemd/system/gpsd.socket - install -Dm644 systemd/gpsdctl@.service "${pkgdir}"/usr/lib/systemd/system/gpsdctl@.service - - install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE -} Copied: gpsd/repos/community-x86_64/PKGBUILD (from rev 547773, gpsd/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-01-03 23:47:57 UTC (rev 547774) @@ -0,0 +1,79 @@ +# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> +# Contributor: Tom Gundersen <t...@jklm.no> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Giacomo Rizzo <a...@free-os.it> + +pkgname=gpsd +pkgver=3.20 +pkgrel=1 +pkgdesc="GPS daemon and library to support USB/serial GPS devices" +arch=('x86_64') +url="http://catb.org/gpsd/" +license=('BSD') +depends=('python' 'libusb' 'bluez-libs') +optdepends=('gtk3: GUI frontends' + 'php: generate a PHP status page for your GPS' + 'php-gd: image support for the PHP status page' + 'python-cairo: GUI frontends' + 'python-gobject: GUI frontends' + 'python-pyserial: GUI frontends' + 'qt5-base: for Qgpsmm') +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' + 'SKIP' + 'dcfa71c4c730b486269995468bdcfa8e96bf3c282db1dadea9384d32015d277f' + '631cf609db1f4b26b94d324a9ca16624487781f0b8736c5c59d8c45acc5d7322') +validpgpkeys=('EED4A0893DCC705DB309E202CCF29C7238522905') # Gary E. Miller <g...@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}" + scons prefix=/usr \ + systemd=yes \ + gpsd_group=uucp \ + sbindir=/usr/bin \ + qt_versioned=5 + scons build +} + +package() { + cd $pkgname-$pkgver + + # Fix path in systemd files + sed -i 's|local/sbin|bin|' systemd/{gpsd.service,gpsdctl@.service} + + export DESTDIR="${pkgdir}" + scons install + install -Dm755 gpsinit -t "${pkgdir}"/usr/bin + chmod 755 "${pkgdir}"/usr/bin/* + + install -Dm644 "$srcdir/gpsd.conf" "${pkgdir}"/etc/default/gpsd + + install -Dm644 "gpsd.rules" "${pkgdir}"/usr/lib/udev/rules.d/25-gpsd-usb.rules + + install -Dm755 gpsd.hotplug "${pkgdir}"/usr/lib/udev/gpsd.hotplug + + install -Dm644 packaging/X11/xgps.desktop \ + "${pkgdir}"/usr/share/applications/xgps.desktop + install -Dm644 packaging/X11/xgpsspeed.desktop \ + "${pkgdir}"/usr/share/applications/xgpsspeed.desktop + install -Dm644 packaging/X11/gpsd-logo.png \ + "${pkgdir}"/usr/share/gpsd/gpsd-logo.png + + install -Dm644 systemd/gpsd.service "${pkgdir}"/usr/lib/systemd/system/gpsd.service + install -Dm644 systemd/gpsd.socket "${pkgdir}"/usr/lib/systemd/system/gpsd.socket + install -Dm644 systemd/gpsdctl@.service "${pkgdir}"/usr/lib/systemd/system/gpsdctl@.service + + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE +} Deleted: fix-python-libdir.patch =================================================================== --- fix-python-libdir.patch 2020-01-03 23:47:32 UTC (rev 547773) +++ fix-python-libdir.patch 2020-01-03 23:47:57 UTC (rev 547774) @@ -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, - Copied: gpsd/repos/community-x86_64/fix-python-libdir.patch (from rev 547773, gpsd/trunk/fix-python-libdir.patch) =================================================================== --- fix-python-libdir.patch (rev 0) +++ fix-python-libdir.patch 2020-01-03 23:47:57 UTC (rev 547774) @@ -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, + Deleted: gpsd.conf =================================================================== --- gpsd.conf 2020-01-03 23:47:32 UTC (rev 547773) +++ gpsd.conf 2020-01-03 23:47:57 UTC (rev 547774) @@ -1,5 +0,0 @@ -# Default settings for gpsd. -START_DAEMON="true" -GPSD_OPTIONS="" -DEVICES="" -USBAUTO="true" Copied: gpsd/repos/community-x86_64/gpsd.conf (from rev 547773, gpsd/trunk/gpsd.conf) =================================================================== --- gpsd.conf (rev 0) +++ gpsd.conf 2020-01-03 23:47:57 UTC (rev 547774) @@ -0,0 +1,5 @@ +# Default settings for gpsd. +START_DAEMON="true" +GPSD_OPTIONS="" +DEVICES="" +USBAUTO="true"