Freshen up [nonprism-geoclue]

	Bring to current version
	Added the file geoclue.conf. But it need to be added to the
	PKGBUILD yet. It isn't strictly necessary as we compile
	with all trackers disabled.. But would be a nice touch to have
	the config file also sset everything to false/disabled.

2 files changed, 136 insertions, 4 deletions

diff --git a/nonprism-testing/geoclue/PKGBUILD b/nonprism-testing/geoclue/PKGBUILD
index ba3537bac..c59e9985a 100644
--- a/nonprism-testing/geoclue/PKGBUILD
+++ b/nonprism-testing/geoclue/PKGBUILD
@@ -12,9 +12,8 @@
 
 
 pkgname=geoclue
-pkgver=2.5.6
-pkgrel=1
-pkgrel+=.nonprism1
+pkgver=2.5.7
+pkgrel=3
 pkgdesc="Modular geoinformation service built on the D-Bus messaging system"
 arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/GeoClue/"
@@ -26,7 +25,7 @@ provides=("geoclue2=$pkgver-$pkgrel")
 conflicts=(geoclue2)
 replaces=(geoclue2)
 backup=(etc/geoclue/geoclue.conf)
-_commit=555d676a91494b98ad0d52639590608a9594a8d3  # tags/2.5.6^0
+_commit=3bb60dd600a8b247fd6049e7e5b1c73c2c5fc0e8  # tags/2.5.7
 source=("git+https://gitlab.freedesktop.org/geoclue/geoclue.git#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -37,7 +36,10 @@ pkgver() {
 
 prepare() {
   cd $pkgname
+
+  # config patches (configurable hardcoded API key)
   git cherry-pick -n 95c9ad4dc176 1a00809a0d89
+
 }
 
 build() {
diff --git a/nonprism-testing/geoclue/geoclue.conf b/nonprism-testing/geoclue/geoclue.conf
new file mode 100644
index 000000000..7fc215404
--- /dev/null
+++ b/nonprism-testing/geoclue/geoclue.conf
@@ -0,0 +1,130 @@
+# Configuration file for Geoclue
+#
+# NOTE: All configurations settings below are mandatory and the defaults are
+#       what you see before you edit them. If you want to keep the default
+#       values around, copy and comment out the appropriate line(s) before
+#       changing them.
+
+# Agent configuration options
+[agent]
+
+# Whitelist of desktop IDs (without .desktop part) of all agents we recognise,
+# separated by a ';'.
+whitelist=geoclue-demo-agent;gnome-shell;io.elementary.desktop.agent-geoclue2
+
+# Network NMEA source configuration options
+[network-nmea]
+
+# Fetch location from NMEA sources on local network?
+enable=false
+
+# 3G source configuration options
+[3g]
+
+# Enable 3G source
+enable=false
+
+# CDMA source configuration options
+[cdma]
+
+# Enable CDMA source
+enable=false
+
+# Modem GPS source configuration options
+[modem-gps]
+
+# Enable Modem-GPS source
+enable=false
+
+# WiFi source configuration options
+[wifi]
+
+# Enable WiFi source
+enable=false
+
+# URL to the WiFi geolocation service. If not set, defaults to Mozilla's
+# Location Service with a hardcoded key. To use a custom key, uncomment this URL
+# while changing YOUR_KEY to your MLS API key.
+#url=https://location.services.mozilla.com/v1/geolocate?key=YOUR_KEY
+
+# To use the Google geolocation service instead of Mozilla's, uncomment this URL
+# while changing YOUR_KEY to your Google API key.
+#
+# WARNING: Please make sure that you are complying with the Google's ToS and
+#          policies if you uncomment this:
+#
+# https://developers.google.com/maps/documentation/geolocation/policies
+#
+#url=https://www.googleapis.com/geolocation/v1/geolocate?key=YOUR_KEY
+
+# Submit data to Mozilla Location Service
+# If set to true, geoclue will automatically submit network data to Mozilla
+# each time it gets a GPS lock.
+#
+submit-data=false
+
+# URL to submission API of Mozilla Location Service. If not set, defaults to
+# Mozilla's API with a hardcoded key. To use a custom key, uncomment this URL
+# while changing YOUR_KEY to your MLS API key.
+#submission-url=https://location.services.mozilla.com/v1/submit?key=YOUR_KEY
+
+# A nickname to submit network data with. A nickname must be 2-32 characters long.
+submission-nick=geoclue
+
+# Application configuration options
+#
+# NOTE: Having an entry here for an application with allowed=true means that
+#       geoclue will not ask agent to authorize the application. This is to
+#       ensure that applications with built-in authorization mechanism (e.g web
+#       browsers) do not have to be bound to agents.
+#
+#       If your application is denied access to location information and your
+#       operating system doesn't provide any mechanism to change that, it is
+#       likely a bug in your operation system (or geoclue). The solution is to
+#       report the issue with all details, rather than adding your application
+#       to this list.
+#
+# Format:
+#
+# # Desktop ID of application without .desktop part
+# [random-app]
+#
+# # Allowed access to location information?
+# allowed=true|false
+#
+# # Is application a system component?
+# system=true|false
+#
+# # List of UIDs of all users for which this application is allowed location
+# # info access, separate by ';'. Keep it empty for allowing it for all users.
+# users=
+
+[gnome-datetime-panel]
+allowed=false
+system=true
+users=
+
+[gnome-color-panel]
+allowed=false
+system=true
+users=
+
+[org.gnome.Shell]
+allowed=false
+system=true
+users=
+
+[io.elementary.desktop.agent-geoclue2]
+allowed=false
+system=true
+users=
+
+[epiphany]
+allowed=false
+system=false
+users=
+
+[firefox]
+allowed=false
+system=false
+users=