Date: Saturday, February 26, 2022 @ 15:19:07 Author: heftig Revision: 438170
2.6.0-1 Modified: geoclue/trunk/PKGBUILD ----------+ PKGBUILD | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-02-26 15:18:57 UTC (rev 438169) +++ PKGBUILD 2022-02-26 15:19:07 UTC (rev 438170) @@ -2,8 +2,8 @@ # Contributor: György Balló <[email protected]> pkgname=geoclue -pkgver=2.5.7 -pkgrel=4 +pkgver=2.6.0 +pkgrel=1 pkgdesc="Modular geoinformation service built on the D-Bus messaging system" arch=(x86_64) url="https://www.freedesktop.org/wiki/Software/GeoClue/"; @@ -15,7 +15,7 @@ conflicts=(geoclue2) replaces=(geoclue2) backup=(etc/geoclue/geoclue.conf) -_commit=3bb60dd600a8b247fd6049e7e5b1c73c2c5fc0e8 # tags/2.5.7 +_commit=10998ca3215fb6d21b5a32fdf78bb5feffaf4c0f # tags/2.6.0^0 source=("git+https://gitlab.freedesktop.org/geoclue/geoclue.git#commit=$_commit";) sha256sums=('SKIP') @@ -26,31 +26,16 @@ _mozilla_api_key=e05d56db0a694edc8b5aaebda3f2db6a pkgver() { - cd $pkgname - git describe --tags | sed 's/-/+/g' + cd geoclue + git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' } prepare() { - cd $pkgname - - # config patches (configurable hardcoded API key) - git cherry-pick -n 95c9ad4dc176 1a00809a0d89 - - # https://sources.debian.org/patches/geoclue-2.0/2.5.7-3/ 0003 0004 - git cherry-pick -n f9347ca7d51b c3eba034eb03 12445fb134ee - - # https://sources.debian.org/patches/geoclue-2.0/2.5.7-3/fix-nowifi-query.patch/ - git revert -n 194529c7e712 715cfbf5bec8 - - # https://sources.debian.org/patches/geoclue-2.0/2.5.7-3/ 0006 - git cherry-pick -n 91e17382521e - - # don't claim the compass sensor when not needed - git cherry-pick -n 34a67b676d24 + cd geoclue } build() { - arch-meson $pkgname build \ + arch-meson geoclue build \ -D dbus-srv-user=geoclue \ -D dbus-sys-dir=/usr/share/dbus-1/system.d \ -D mozilla-api-key="$_mozilla_api_key" @@ -65,10 +50,10 @@ meson install -C build --destdir "$pkgdir" echo 'u geoclue - "Geoinformation service" /var/lib/geoclue' | - install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" + install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/geoclue.conf" echo 'd /var/lib/geoclue 0755 geoclue geoclue' | - install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" + install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/geoclue.conf" } # vim:set sw=2 et:
