[arch-commits] Commit in geoclue/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Jan Steffens]

    Date: Wednesday, January 27, 2021 @ 16:55:20
  Author: heftig
Revision: 406828

archrelease: copy trunk to extra-x86_64

Added:
  geoclue/repos/extra-x86_64/PKGBUILD
    (from rev 406827, geoclue/trunk/PKGBUILD)
Deleted:
  geoclue/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |  114 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 61 insertions(+), 53 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-27 16:54:37 UTC (rev 406827)
+++ PKGBUILD	2021-01-27 16:55:20 UTC (rev 406828)
@@ -1,53 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: György Balló <ballogy at freestart.hu>
-
-pkgname=geoclue
-pkgver=2.5.7
-pkgrel=1
-pkgdesc="Modular geoinformation service built on the D-Bus messaging system"
-arch=(x86_64)
-url="https://www.freedesktop.org/wiki/Software/GeoClue/"
-license=(LGPL)
-depends=(libsoup json-glib libmm-glib avahi geocode-glib)
-makedepends=(systemd gobject-introspection git vala meson gtk-doc libnotify)
-optdepends=('libnotify: Demo Agent')
-provides=("geoclue2=$pkgver-$pkgrel")
-conflicts=(geoclue2)
-replaces=(geoclue2)
-backup=(etc/geoclue/geoclue.conf)
-_commit=3bb60dd600a8b247fd6049e7e5b1c73c2c5fc0e8  # tags/2.5.7
-source=("git+https://gitlab.freedesktop.org/geoclue/geoclue.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  git cherry-pick -n 95c9ad4dc176 1a00809a0d89
-}
-
-build() {
-  arch-meson $pkgname build \
-    -D dbus-srv-user=geoclue \
-    -D dbus-sys-dir=/usr/share/dbus-1/system.d
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-
-  echo 'u geoclue - "Geoinformation service" /var/lib/geoclue' |
-    install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-
-  echo 'd /var/lib/geoclue 0755 geoclue geoclue' |
-    install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
-}
-
-# vim:set sw=2 et:

Copied: geoclue/repos/extra-x86_64/PKGBUILD (from rev 406827, geoclue/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-01-27 16:55:20 UTC (rev 406828)
@@ -0,0 +1,61 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: György Balló <ballogy at freestart.hu>
+
+pkgname=geoclue
+pkgver=2.5.7
+pkgrel=2
+pkgdesc="Modular geoinformation service built on the D-Bus messaging system"
+arch=(x86_64)
+url="https://www.freedesktop.org/wiki/Software/GeoClue/"
+license=(LGPL)
+depends=(libsoup json-glib libmm-glib avahi geocode-glib)
+makedepends=(systemd gobject-introspection git vala meson gtk-doc libnotify)
+optdepends=('libnotify: Demo Agent')
+provides=("geoclue2=$pkgver-$pkgrel")
+conflicts=(geoclue2)
+replaces=(geoclue2)
+backup=(etc/geoclue/geoclue.conf)
+_commit=3bb60dd600a8b247fd6049e7e5b1c73c2c5fc0e8  # tags/2.5.7
+source=("git+https://gitlab.freedesktop.org/geoclue/geoclue.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed '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-2/
+  git cherry-pick -n f9347ca7d51b c3eba034eb03 12445fb134ee
+
+  # https://sources.debian.org/patches/geoclue-2.0/2.5.7-2/fix-nowifi-query.patch/
+  git revert -n 194529c7e712 715cfbf5bec8
+}
+
+build() {
+  arch-meson $pkgname build \
+    -D dbus-srv-user=geoclue \
+    -D dbus-sys-dir=/usr/share/dbus-1/system.d
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+
+  echo 'u geoclue - "Geoinformation service" /var/lib/geoclue' |
+    install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+
+  echo 'd /var/lib/geoclue 0755 geoclue geoclue' |
+    install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+}
+
+# vim:set sw=2 et: