pool/libproxy
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 316446 from home:dimstar:branches:GNOME:Factory

Browse Source 
- 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.

- 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.

OBS-URL: https://build.opensuse.org/request/show/316446
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=109
This commit is contained in:
Bjørn Lie 2015-07-13 13:56:55 +00:00 committed by Git OBS Bridge
parent eef99821e5
commit 40c1d099cd
6 changed files with 57 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
baselibs.conf
View File

@ -1,12 +1,12 @@
libproxy1 libproxy1
libproxy1-config-gnome #libproxy1-config-gnome
supplements "packageand(libproxy1-<targettype>:libproxy1-config-gnome)" # supplements "packageand(libproxy1-<targettype>:libproxy1-config-gnome)"
libproxy1-config-gnome3 libproxy1-config-gnome3
supplements "packageand(libproxy1-<targettype>:libproxy1-config-gnome3)" supplements "packageand(libproxy1-<targettype>:libproxy1-config-gnome3)"
libproxy1-config-kde4 libproxy1-config-kde4
supplements "packageand(libproxy1-<targettype>:libproxy1-config-kde)" supplements "packageand(libproxy1-<targettype>:libproxy1-config-kde)"
libproxy1-pacrunner-mozjs #libproxy1-pacrunner-mozjs
supplements "packageand(libproxy1-<targettype>:libproxy1-config-mozjs)" # supplements "packageand(libproxy1-<targettype>:libproxy1-config-mozjs)"
libproxy1-networkmanager libproxy1-networkmanager
supplements "packageand(libproxy1-<targettype>:libproxy1-config-networkmanager)" supplements "packageand(libproxy1-<targettype>:libproxy1-config-networkmanager)"
libproxy1-pacrunner-webkit libproxy1-pacrunner-webkit

9
libproxy-plugins.changes
View File

@ -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 Wed Aug 6 09:51:00 UTC 2014 - fcrozat@suse.com

5
libproxy-plugins.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libproxy-plugins # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -47,6 +47,8 @@ Source99: baselibs.conf
Patch0: libproxy-pxgsettings-crash.patch Patch0: libproxy-pxgsettings-crash.patch
# PATCH-FIX-UPSTREAM libproxy-no-libperl.patch mls@suse.de -- Do not link against libperl. Submitted upstream. # PATCH-FIX-UPSTREAM libproxy-no-libperl.patch mls@suse.de -- Do not link against libperl. Submitted upstream.
Patch1: libproxy-no-libperl.patch 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -314,6 +316,7 @@ libproxy offers the following features: * extremely small core
%setup -q -n %{_sourcename} %setup -q -n %{_sourcename}
%patch0 %patch0
%patch1 %patch1
%patch2 -p1
mkdir build mkdir build
%build %build

27
libproxy-pxgsettings-signals.patch Normal file
View File

@ -0,0 +1,27 @@
From cb0044f2263e8a6ec7b98de3901e6818a3eed60a Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
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<argc; i++) {
client = g_settings_new(argv[i]);
gchar** keys = g_settings_list_keys(client);
- for (int j=0; keys[j]; on_value_change(client, keys[j++],argv[i] ));
g_signal_connect(client, "changed::", (GCallback) on_value_change, argv[i]);
+ for (int j=0; keys[j]; on_value_change(client, keys[j++],argv[i] ));
}

9
libproxy.changes
View File

@ -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 Wed Aug 6 09:51:00 UTC 2014 - fcrozat@suse.com

5
libproxy.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libproxy # spec file for package libproxy
# #
# 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -47,6 +47,8 @@ Source99: baselibs.conf
Patch0: libproxy-pxgsettings-crash.patch Patch0: libproxy-pxgsettings-crash.patch
# PATCH-FIX-UPSTREAM libproxy-no-libperl.patch mls@suse.de -- Do not link against libperl. Submitted upstream. # PATCH-FIX-UPSTREAM libproxy-no-libperl.patch mls@suse.de -- Do not link against libperl. Submitted upstream.
Patch1: libproxy-no-libperl.patch 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -314,6 +316,7 @@ libproxy offers the following features: * extremely small core
%setup -q -n %{_sourcename} %setup -q -n %{_sourcename}
%patch0 %patch0
%patch1 %patch1
%patch2 -p1
mkdir build mkdir build
%build %build