Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package geoclue2 for openSUSE:Factory
checked in at 2021-12-01 20:46:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/geoclue2 (Old)
and /work/SRC/openSUSE:Factory/.geoclue2.new.31177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geoclue2"
Wed Dec 1 20:46:42 2021 rev:39 rq:934393 version:2.5.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/geoclue2/geoclue2.changes 2021-09-07
21:13:39.772740309 +0200
+++ /work/SRC/openSUSE:Factory/.geoclue2.new.31177/geoclue2.changes
2021-12-02 02:12:37.775142968 +0100
@@ -1,0 +2,9 @@
+Sun Nov 28 13:21:10 UTC 2021 - Atri Bhattacharya <badshah...@gmail.com>
+
+- Drop geoclue2-revert-2-faulty.patch: Replaced by upstream fix
+ in geoclue2-geoip-when-wifi-unavailable.patch:.
+- Add geoclue2-geoip-when-wifi-unavailable.patch: [gclue-wifi] Use
+ GeoIP when a WiFi device isn't available
+ [glfo#geoclue/geoclue#142].
+
+-------------------------------------------------------------------
Old:
----
geoclue2-revert-2-faulty.patch
New:
----
geoclue2-geoip-when-wifi-unavailable.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ geoclue2.spec ++++++
--- /var/tmp/diff_new_pack.2AQ5nz/_old 2021-12-02 02:12:38.199141675 +0100
+++ /var/tmp/diff_new_pack.2AQ5nz/_new 2021-12-02 02:12:38.207141651 +0100
@@ -1,7 +1,7 @@
#
# spec file for package geoclue2
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,10 +28,8 @@
Source0: %{url}/-/archive/%{version}/geoclue-%{version}.tar.bz2
Source1: srvGeoClue.conf
Source99: geoclue2-rpmlintrc
-
-# PATCH-FIX-UPSTREAM geoclue2-revert-2-faulty.patch -- Revert two broken
commits
-Patch0: geoclue2-revert-2-faulty.patch
-
+# PATCH-FIX-UPSTREAM geoclue2-geoip-when-wifi-unavailable.patch
glfo#geoclue/geoclue#142 badshah...@gmail.com -- gclue-wifi: Use GeoIP when a
WiFi device isn't available
+Patch0: geoclue2-geoip-when-wifi-unavailable.patch
BuildRequires: intltool >= 0.40.0
BuildRequires: meson >= 0.47.2
BuildRequires: pkgconfig
@@ -92,8 +90,7 @@
communication mechanism to provide location information
%prep
-%autosetup -n %{_name}-%{version} -N
-%patch0 -p1 -R
+%autosetup -p1 -n %{_name}-%{version}
%build
%meson \
++++++ geoclue2-geoip-when-wifi-unavailable.patch ++++++
>From 2abc9d544dbf3678bdac10c969d677b792a7622d Mon Sep 17 00:00:00 2001
From: Dor Askayo <dor.ask...@gmail.com>
Date: Wed, 11 Aug 2021 17:53:54 +0300
Subject: [PATCH] gclue-wifi: Use GeoIP when a WiFi device isn't available
Query for GeoIP when a WiFi device isn't available, instead of
treating this case as a failure. This restores the functionality
which regressed by 715cfbf.
Fixes https://gitlab.freedesktop.org/geoclue/geoclue/-/issues/142.
---
src/gclue-wifi.c | 38 +++++++++++++++++---------------------
1 file changed, 17 insertions(+), 21 deletions(-)
diff --git a/src/gclue-wifi.c b/src/gclue-wifi.c
index 3ca5de9..3fc78d0 100644
--- a/src/gclue-wifi.c
+++ b/src/gclue-wifi.c
@@ -990,19 +990,10 @@ gclue_wifi_get_accuracy_level (GClueWifi *wifi)
return wifi->priv->accuracy_level;
}
-/* Can return NULL without setting @error, signifying an empty BSS list. */
+/* Can return NULL, signifying an empty BSS list. */
static GList *
-get_bss_list (GClueWifi *wifi,
- GError **error)
+get_bss_list (GClueWifi *wifi)
{
- if (wifi->priv->interface == NULL) {
- g_set_error_literal (error,
- G_IO_ERROR,
- G_IO_ERROR_FAILED,
- "No WiFi devices available");
- return NULL;
- }
-
return g_hash_table_get_values (wifi->priv->bss_proxies);
}
@@ -1010,16 +1001,16 @@ static SoupMessage *
gclue_wifi_create_query (GClueWebSource *source,
GError **error)
{
- GList *bss_list; /* As in Access Points */
+ GClueWifi *wifi = GCLUE_WIFI (source);
+ GList *bss_list = NULL; /* As in Access Points */
SoupMessage *msg;
- g_autoptr(GError) local_error = NULL;
- bss_list = get_bss_list (GCLUE_WIFI (source), &local_error);
- if (local_error != NULL) {
- g_propagate_error (error, g_steal_pointer (&local_error));
- return NULL;
+ if (wifi->priv->interface == NULL) {
+ goto create_query;
}
+ bss_list = get_bss_list (wifi);
+
/* Empty list? */
if (bss_list == NULL) {
g_set_error_literal (error,
@@ -1029,6 +1020,7 @@ gclue_wifi_create_query (GClueWebSource *source,
return NULL;
}
+create_query:
msg = gclue_mozilla_create_query (bss_list, NULL, error);
g_list_free (bss_list);
return msg;
@@ -1047,16 +1039,20 @@ gclue_wifi_create_submit_query (GClueWebSource *source,
GClueLocation *location,
GError **error)
{
+ GClueWifi *wifi = GCLUE_WIFI (source);
GList *bss_list; /* As in Access Points */
SoupMessage * msg;
- g_autoptr(GError) local_error = NULL;
- bss_list = get_bss_list (GCLUE_WIFI (source), &local_error);
- if (local_error != NULL) {
- g_propagate_error (error, g_steal_pointer (&local_error));
+ if (wifi->priv->interface == NULL) {
+ g_set_error_literal (error,
+ G_IO_ERROR,
+ G_IO_ERROR_FAILED,
+ "No WiFi devices available");
return NULL;
}
+ bss_list = get_bss_list (wifi);
+
/* Empty list? */
if (bss_list == NULL) {
g_set_error_literal (error,
--
GitLab
