[arch-commits] Commit in geoclue/trunk (4 files)

[Jan Steffens]

    Date: Tuesday, October 1, 2019 @ 13:44:49
  Author: heftig
Revision: 363610

2.5.5-2

Added:
  geoclue/trunk/0002-config-Don-t-warn-when-wifi-URL-unset.patch
  geoclue/trunk/0003-config-Don-t-crash-when-submission-url-unset.patch
Modified:
  geoclue/trunk/0001-config-Make-the-Mozilla-API-key-configurable.patch
  geoclue/trunk/PKGBUILD

---------------------------------------------------------+
 0001-config-Make-the-Mozilla-API-key-configurable.patch |    2 -
 0002-config-Don-t-warn-when-wifi-URL-unset.patch        |   25 ++++++++++++++
 0003-config-Don-t-crash-when-submission-url-unset.patch |   25 ++++++++++++++
 PKGBUILD                                                |   12 +++++-
 4 files changed, 60 insertions(+), 4 deletions(-)

Modified: 0001-config-Make-the-Mozilla-API-key-configurable.patch
===================================================================
--- 0001-config-Make-the-Mozilla-API-key-configurable.patch	2019-10-01 13:37:23 UTC (rev 363609)
+++ 0001-config-Make-the-Mozilla-API-key-configurable.patch	2019-10-01 13:44:49 UTC (rev 363610)
@@ -1,7 +1,7 @@
 From 0b4fa24bb9cc62557de7ec3d14c27316af658f61 Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
 Date: Tue, 1 Oct 2019 13:27:41 +0000
-Subject: [PATCH] config: Make the Mozilla API key configurable
+Subject: [PATCH 1/3] config: Make the Mozilla API key configurable
 
 And do not expose it in the configuration file.
 ---

Added: 0002-config-Don-t-warn-when-wifi-URL-unset.patch
===================================================================
--- 0002-config-Don-t-warn-when-wifi-URL-unset.patch	                        (rev 0)
+++ 0002-config-Don-t-warn-when-wifi-URL-unset.patch	2019-10-01 13:44:49 UTC (rev 363610)
@@ -0,0 +1,25 @@
+From b93c2581e5f98b4826e7c645d873efa746e269d4 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 1 Oct 2019 13:41:52 +0000
+Subject: [PATCH 2/3] config: Don't warn when wifi URL unset
+
+---
+ src/gclue-config.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gclue-config.c b/src/gclue-config.c
+index df4adcc..f09e897 100644
+--- a/src/gclue-config.c
++++ b/src/gclue-config.c
+@@ -232,7 +232,7 @@ load_wifi_config (GClueConfig *config)
+                                                 "url",
+                                                 &error);
+         if (error != NULL) {
+-                g_warning ("%s", error->message);
++                g_debug ("No wifi URL: %s", error->message);
+                 g_clear_error (&error);
+                 priv->wifi_url = g_strdup (DEFAULT_WIFI_URL);
+         }
+-- 
+2.23.0
+

Added: 0003-config-Don-t-crash-when-submission-url-unset.patch
===================================================================
--- 0003-config-Don-t-crash-when-submission-url-unset.patch	                        (rev 0)
+++ 0003-config-Don-t-crash-when-submission-url-unset.patch	2019-10-01 13:44:49 UTC (rev 363610)
@@ -0,0 +1,25 @@
+From ef10d555fa4b1c27a0cfd17e00331db3643828b0 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 1 Oct 2019 13:42:11 +0000
+Subject: [PATCH 3/3] config: Don't crash when submission-url unset
+
+---
+ src/gclue-config.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gclue-config.c b/src/gclue-config.c
+index f09e897..eab0b6f 100644
+--- a/src/gclue-config.c
++++ b/src/gclue-config.c
+@@ -255,7 +255,7 @@ load_wifi_config (GClueConfig *config)
+                                                        &error);
+         if (error != NULL) {
+                 g_debug ("No wifi submission URL: %s", error->message);
+-                g_error_free (error);
++                g_clear_error (&error);
+                 priv->wifi_submit_url = g_strdup (DEFAULT_WIFI_SUBMIT_URL);
+         }
+ 
+-- 
+2.23.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-01 13:37:23 UTC (rev 363609)
+++ PKGBUILD	2019-10-01 13:44:49 UTC (rev 363610)
@@ -3,7 +3,7 @@
 
 pkgname=geoclue
 pkgver=2.5.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Modular geoinformation service built on the D-Bus messaging system"
 arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/GeoClue/"
@@ -17,9 +17,13 @@
 backup=(etc/geoclue/geoclue.conf)
 _commit=9519d67c7a9a0e97a75115f9ff99d4fb0bb81b21  # tags/2.5.5^0
 source=("git+https://gitlab.freedesktop.org/geoclue/geoclue.git#commit=$_commit"
-        0001-config-Make-the-Mozilla-API-key-configurable.patch)
+        0001-config-Make-the-Mozilla-API-key-configurable.patch
+        0002-config-Don-t-warn-when-wifi-URL-unset.patch
+        0003-config-Don-t-crash-when-submission-url-unset.patch)
 sha256sums=('SKIP'
-            '4734adf48294eb61d79bb797f62bfa4694c6a68a096ad19a4286d8eee163a823')
+            '9ab573d38a555f4e95c44031ba14b50e0ae929dd297335db38402d7cf6bf14c0'
+            '057104bbe3e08d6c258af2a3c61b5c81e1e9cf72c14646eaac2029d94d675ad1'
+            '38b3d34093afbb048bfab2c10df0873ebb4b8209eee9ff7c5fb43d3406351e15')
 
 # Mozilla API keys (see https://location.services.mozilla.com/api)
 # Note: These are for Arch Linux use ONLY. For your own distribution, please
@@ -35,6 +39,8 @@
 prepare() {
   cd $pkgname
   git apply -3 ../0001-config-Make-the-Mozilla-API-key-configurable.patch
+  git apply -3 ../0002-config-Don-t-warn-when-wifi-URL-unset.patch
+  git apply -3 ../0003-config-Don-t-crash-when-submission-url-unset.patch
 }
 
 build() {