diff --git a/baselibs.conf b/baselibs.conf index 260e408..f2a65ce 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,12 +1,12 @@ libproxy1 -libproxy1-config-gnome - supplements "packageand(libproxy1-:libproxy1-config-gnome)" +#libproxy1-config-gnome +# supplements "packageand(libproxy1-:libproxy1-config-gnome)" libproxy1-config-gnome3 supplements "packageand(libproxy1-:libproxy1-config-gnome3)" libproxy1-config-kde4 supplements "packageand(libproxy1-:libproxy1-config-kde)" -libproxy1-pacrunner-mozjs - supplements "packageand(libproxy1-:libproxy1-config-mozjs)" +#libproxy1-pacrunner-mozjs +# supplements "packageand(libproxy1-:libproxy1-config-mozjs)" libproxy1-networkmanager supplements "packageand(libproxy1-:libproxy1-config-networkmanager)" libproxy1-pacrunner-webkit diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index d472563..7b99025 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri May 15 10:00:14 UTC 2015 - dimstar@opensuse.org + +- Add libproxy-pxgsettings-signals.patch: Fix for pxgsettins not + actively monitoring gsetting changes. Due to recent changes in + GLib, only values are being monitored, that are read AFTER the + signal handler is attached. +- Adjust baselibs.conf to match what is currenly being built. + ------------------------------------------------------------------- Wed Aug 6 09:51:00 UTC 2014 - fcrozat@suse.com diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index 7dee65a..1af2cc9 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -1,7 +1,7 @@ # # spec file for package libproxy-plugins # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -47,6 +47,8 @@ Source99: baselibs.conf Patch0: libproxy-pxgsettings-crash.patch # PATCH-FIX-UPSTREAM libproxy-no-libperl.patch mls@suse.de -- Do not link against libperl. Submitted upstream. Patch1: libproxy-no-libperl.patch +# PATCH-FIX-UPSTREAM libproxy-pxgsettings-signals.patch dimstar@opensuse.org -- Due to changes in glib, signals are not emited on settings that are not read AFTER connecting the signal +Patch2: libproxy-pxgsettings-signals.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ @@ -314,6 +316,7 @@ libproxy offers the following features: * extremely small core %setup -q -n %{_sourcename} %patch0 %patch1 +%patch2 -p1 mkdir build %build diff --git a/libproxy-pxgsettings-signals.patch b/libproxy-pxgsettings-signals.patch new file mode 100644 index 0000000..76d4a9a --- /dev/null +++ b/libproxy-pxgsettings-signals.patch @@ -0,0 +1,27 @@ +From cb0044f2263e8a6ec7b98de3901e6818a3eed60a Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Sun, 3 May 2015 14:37:32 +0200 +Subject: [PATCH] pxgsettings: g_signal_connect does not emmit changed signals + +In recent versions of GLIB, it is mandatory to FIRST connect to the changed:: signal and then read values. +Without reading the values, it seems there is an initialization missing to start the change monitoring. + +So: we now first connect the signal handler, directly followed by reading all the settings we care about. +--- + libproxy/modules/pxgsettings.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +Index: libproxy-0.4.11/libproxy/modules/pxgsettings.cpp +=================================================================== +--- libproxy-0.4.11.orig/libproxy/modules/pxgsettings.cpp ++++ libproxy-0.4.11/libproxy/modules/pxgsettings.cpp +@@ -149,8 +149,8 @@ int main(int argc, char **argv) { + for (int i=1; i