From 4e2b6f170aa9784c68a23e41c4506fab24ef41ba3f8bc49e5dcc3a0ceb8fd814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Mon, 27 Apr 2020 13:52:42 +0000 Subject: [PATCH] Accepting request 798287 from GNOME:Next - Add libproxy-pxgsettings.patch: pxgsettings: use the correct syntax to connect to the changed signal. OBS-URL: https://build.opensuse.org/request/show/798287 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=148 --- libproxy-pxgsettings.patch | 26 ++++++++++++++++++++++++++ libproxy.changes | 6 ++++++ libproxy.spec | 3 +++ 3 files changed, 35 insertions(+) create mode 100644 libproxy-pxgsettings.patch diff --git a/libproxy-pxgsettings.patch b/libproxy-pxgsettings.patch new file mode 100644 index 0000000..a9f8720 --- /dev/null +++ b/libproxy-pxgsettings.patch @@ -0,0 +1,26 @@ +From 29c908647eec8e05674ba1c298d4f1c565d9f872 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Corentin=20No=C3=ABl?= +Date: Sun, 26 Apr 2020 11:54:46 +0200 +Subject: [PATCH] pxgsettings: use the correct syntax to connect to the changed + signal + +As it is a detailed signal, it only makes sense to append a :: when there is a specific property to target. +It used to be accepted but triggers a runtime warning with latest GLib. +--- + libproxy/modules/pxgsettings.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libproxy/modules/pxgsettings.cpp b/libproxy/modules/pxgsettings.cpp +index 9ed4333..0db5a6a 100644 +--- a/libproxy/modules/pxgsettings.cpp ++++ b/libproxy/modules/pxgsettings.cpp +@@ -158,7 +158,7 @@ int main(int argc, char **argv) { + #else + gchar** keys = g_settings_list_keys(settings); + #endif +- g_signal_connect(settings, "changed::", G_CALLBACK (on_value_change), argv[i]); ++ g_signal_connect(settings, "changed", G_CALLBACK (on_value_change), argv[i]); + for (int j=0; keys[j]; on_value_change(settings, keys[j++],argv[i] )); + g_strfreev(keys); + } + diff --git a/libproxy.changes b/libproxy.changes index dca59d6..3dd4700 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 27 10:10:47 UTC 2020 - Dominique Leuenberger + +- Add libproxy-pxgsettings.patch: pxgsettings: use the correct + syntax to connect to the changed signal. + ------------------------------------------------------------------- Thu Mar 12 07:10:15 UTC 2020 - Tomáš Chvátal diff --git a/libproxy.spec b/libproxy.spec index 84ccbb8..7b4ce78 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -49,6 +49,8 @@ Source: https://github.com/libproxy/%{_name}/archive/%{version}.tar.gz Source99: baselibs.conf # PATCH-FIX-UPSTREAM libproxy-python3.7.patch dimstar@opensuse.org -- Add support for python 3.7 and 3.8, taken from upstream Patch0: libproxy-python3.7.patch +# PATCH-FIX-UPSTREAM libproxy-pxgsettings.patch dimstar@opensuse.org -- pxgsettings: use the correct syntax to connect to the changed signal +Patch1: libproxy-pxgsettings.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libmodman-devel @@ -273,6 +275,7 @@ This package contains the Mono/.NET for libproxy. %prep %setup -q -n %{_sourcename} %patch0 -p1 +%patch1 -p1 mkdir build %build