Browse Source

[testing] -> [extra] 'geoclue-2.5.7-4' move

master
Dudemanguy 3 months ago
parent
commit
3e51cd142e
Signed by: Dudemanguy GPG Key ID: 4003D2EF625D6492
  1. 56
      geoclue/x86_64/extra/0001-sources-Don-t-compute-movement-for-low-accuracy-sour.patch
  2. 34
      geoclue/x86_64/extra/PKGBUILD
  3. 74
      geoclue/x86_64/testing/PKGBUILD

56
geoclue/x86_64/extra/0001-sources-Don-t-compute-movement-for-low-accuracy-sour.patch

@ -1,56 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Fri, 9 Apr 2021 19:50:58 +0000
Subject: [PATCH] sources: Don't compute movement for low-accuracy sources
This avoids claiming the compass and updating the location for heading
changes when we only need to serve low-accuracy clients like the GNOME
Settings Daemon.
---
src/gclue-3g.c | 4 +++-
src/gclue-cdma.c | 4 +++-
src/gclue-wifi.c | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/gclue-3g.c b/src/gclue-3g.c
index 4473102..40c10f6 100644
--- a/src/gclue-3g.c
+++ b/src/gclue-3g.c
@@ -188,7 +188,9 @@ gclue_3g_get_singleton (void)
static GClue3G *source = NULL;
if (source == NULL) {
- source = g_object_new (GCLUE_TYPE_3G, NULL);
+ source = g_object_new (GCLUE_TYPE_3G,
+ "compute-movement", FALSE,
+ NULL);
g_object_weak_ref (G_OBJECT (source),
on_3g_destroyed,
&source);
diff --git a/src/gclue-cdma.c b/src/gclue-cdma.c
index 8f4f129..2a26a77 100644
--- a/src/gclue-cdma.c
+++ b/src/gclue-cdma.c
@@ -177,7 +177,9 @@ gclue_cdma_get_singleton (void)
static GClueCDMA *source = NULL;
if (source == NULL) {
- source = g_object_new (GCLUE_TYPE_CDMA, NULL);
+ source = g_object_new (GCLUE_TYPE_CDMA,
+ "compute-movement", FALSE,
+ NULL);
g_object_weak_ref (G_OBJECT (source),
on_cdma_destroyed,
&source);
diff --git a/src/gclue-wifi.c b/src/gclue-wifi.c
index e507830..f09b40c 100644
--- a/src/gclue-wifi.c
+++ b/src/gclue-wifi.c
@@ -968,6 +968,7 @@ gclue_wifi_get_singleton (GClueAccuracyLevel level)
wifi[i] = g_object_new (GCLUE_TYPE_WIFI,
"accuracy-level", level,
"scramble-location", scramble_location,
+ "compute-movement", i > 0,
NULL);
g_object_weak_ref (G_OBJECT (wifi[i]),
on_wifi_destroyed,

34
geoclue/x86_64/extra/PKGBUILD

@ -3,23 +3,27 @@
pkgname=geoclue
pkgver=2.5.7
pkgrel=3
pkgrel=4
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=(eudev gobject-introspection git vala meson gtk-doc libnotify)
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"
0001-sources-Don-t-compute-movement-for-low-accuracy-sour.patch)
sha256sums=('SKIP'
'22ac3c979cf2c95ba4f0d323cef2e10946667763c9bcec125a00cb213e502818')
source=("git+https://gitlab.freedesktop.org/geoclue/geoclue.git#commit=$_commit")
sha256sums=('SKIP')
# Mozilla API keys (see https://location.services.mozilla.com/api)
# Note: These are for Arch Linux use ONLY. For your own distribution, please
# get your own set of keys. Feel free to contact heftig@archlinux.org for
# more information.
_mozilla_api_key=e05d56db0a694edc8b5aaebda3f2db6a
pkgver() {
cd $pkgname
@ -32,18 +36,24 @@ prepare() {
# config patches (configurable hardcoded API key)
git cherry-pick -n 95c9ad4dc176 1a00809a0d89
# https://sources.debian.org/patches/geoclue-2.0/2.5.7-2/
# 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-2/fix-nowifi-query.patch/
# https://sources.debian.org/patches/geoclue-2.0/2.5.7-3/fix-nowifi-query.patch/
git revert -n 194529c7e712 715cfbf5bec8
git apply -3 ../0001-sources-Don-t-compute-movement-for-low-accuracy-sour.patch
# 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
}
build() {
arch-meson $pkgname build \
-D dbus-srv-user=geoclue
artix-meson $pkgname build \
-D dbus-srv-user=geoclue \
-D dbus-sys-dir=/usr/share/dbus-1/system.d \
-D mozilla-api-key="$_mozilla_api_key"
meson compile -C build
}
@ -52,7 +62,7 @@ check() {
}
package() {
DESTDIR="$pkgdir" meson install -C build
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"

74
geoclue/x86_64/testing/PKGBUILD

@ -1,74 +0,0 @@
# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
# Contributor: György Balló <ballogy@freestart.hu>
pkgname=geoclue
pkgver=2.5.7
pkgrel=4
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')
# Mozilla API keys (see https://location.services.mozilla.com/api)
# Note: These are for Arch Linux use ONLY. For your own distribution, please
# get your own set of keys. Feel free to contact heftig@archlinux.org for
# more information.
_mozilla_api_key=e05d56db0a694edc8b5aaebda3f2db6a
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-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
}
build() {
artix-meson $pkgname build \
-D dbus-srv-user=geoclue \
-D dbus-sys-dir=/usr/share/dbus-1/system.d \
-D mozilla-api-key="$_mozilla_api_key"
meson compile -C build
}
check() {
meson test -C build --print-errorlogs
}
package() {
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"
echo 'd /var/lib/geoclue 0755 geoclue geoclue' |
install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
}
# vim:set sw=2 et:
Loading…
Cancel
Save