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

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

Browse Source 
- Update to version 0.4.12:
  + Move development to github.com/libproxy/libproxy.
  + Fix fd leak in get_pac (Bug #185).
  + Detect running MATE session (Bug #186, Part1).
  + Fix linking of perl bindings to pthread (Bug #182).
  + Correctly detect spidermonky (mozjs185) (Bug #188).
  + Stop pxgsettings from segfaulting on exit (Bug #192).
  + Fix test #10 (Bug #189).
  + Fix build on Mac OS X (Bug #183).
  + Add a generic KDE Config module (fix crashes of Qt5 based
    apps) (issue#4).
- Drop upstream fixed patches:
  + libproxy-pxgsettings-crash.patch
  + libproxy-no-libperl.patch
  + libproxy-pxgsettings-signals.patch
- Rename libproxy1-config-kde4 subpackage to libproxy-config-kde,
  following upstreams introduction of the generic config loader.
- Require libKF5ConfigCore5 from libproxy1-config-kde (we don't
  really need the library, but kreadconfig5 in this package).
- Replace libkde4-devel and libqt4-devel BuildRequires with
  libKF5ConfigCore5: the new KDE config parser interacts directly
  with kreadconfig5 and does not link to Qt.

- Update to version 0.4.12:
  + Move development to github.com/libproxy/libproxy.
  + Fix fd leak in get_pac (Bug #185).
  + Detect running MATE session (Bug #186, Part1).
  + Fix linking of perl bindings to pthread (Bug #182).
  + Correctly detect spidermonky (mozjs185) (Bug #188).
  + Stop pxgsettings from segfaulting on exit (Bug #192).

OBS-URL: https://build.opensuse.org/request/show/353652
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=111
This commit is contained in:
Bjørn Lie 2016-01-14 11:29:29 +00:00 committed by Git OBS Bridge
parent 40c1d099cd
commit 55c080e223
10 changed files with 80 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
0.4.12.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:add9c5e30767c17b00f842f6280d818ece1eb23ab92e1fc68661204c95d7e22b
size 87765

2
baselibs.conf
View File

@ -3,7 +3,7 @@ libproxy1
# 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-kde
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)"

3
libproxy-0.4.11.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe4821864b
size 93757

11
libproxy-no-libperl.patch
View File

@ -1,11 +0,0 @@
--- ./bindings/perl/src/CMakeLists.txt.orig 2013-09-05 15:58:05.278486569 +0000
+++ ./bindings/perl/src/CMakeLists.txt 2013-09-05 15:58:41.772486504 +0000
@@ -12,7 +12,7 @@ set(Libproxy_LIB_SRCS Libproxy.c)
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/blib/arch/auto/Net)
add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS})
-target_link_libraries(PLlibproxy ${PERL_LIBRARY} libproxy)
+target_link_libraries(PLlibproxy libproxy)
set_target_properties(PLlibproxy PROPERTIES OUTPUT_NAME "Libproxy")
set_target_properties(PLlibproxy PROPERTIES PREFIX "")

26
libproxy-plugins.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Tue Jan 12 16:46:37 UTC 2016 - dimstar@opensuse.org
- Update to version 0.4.12:
+ Move development to github.com/libproxy/libproxy.
+ Fix fd leak in get_pac (Bug #185).
+ Detect running MATE session (Bug #186, Part1).
+ Fix linking of perl bindings to pthread (Bug #182).
+ Correctly detect spidermonky (mozjs185) (Bug #188).
+ Stop pxgsettings from segfaulting on exit (Bug #192).
+ Fix test #10 (Bug #189).
+ Fix build on Mac OS X (Bug #183).
+ Add a generic KDE Config module (fix crashes of Qt5 based
apps) (issue#4).
- Drop upstream fixed patches:
+ libproxy-pxgsettings-crash.patch
+ libproxy-no-libperl.patch
+ libproxy-pxgsettings-signals.patch
- Rename libproxy1-config-kde4 subpackage to libproxy-config-kde,
following upstreams introduction of the generic config loader.
- Require libKF5ConfigCore5 from libproxy1-config-kde (we don't
really need the library, but kreadconfig5 in this package).
- Replace libkde4-devel and libqt4-devel BuildRequires with
libKF5ConfigCore5: the new KDE config parser interacts directly
with kreadconfig5 and does not link to Qt.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 15 10:00:14 UTC 2015 - dimstar@opensuse.org Fri May 15 10:00:14 UTC 2015 - dimstar@opensuse.org

30
libproxy-plugins.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libproxy-plugins # spec file for package libproxy-plugins
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2016 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
@ -31,7 +31,7 @@ Name: libproxy-plugins
Summary: Libproxy provides consistent proxy configuration to applications Summary: Libproxy provides consistent proxy configuration to applications
License: GPL-2.0+ and LGPL-2.1+ License: GPL-2.0+ and LGPL-2.1+
Group: System/Libraries Group: System/Libraries
Version: 0.4.11 Version: 0.4.12
Release: 0 Release: 0
# FIXME: verify if test suite works - 0.4.10 has weird behavior in some cases, where the internal server times out. # FIXME: verify if test suite works - 0.4.10 has weird behavior in some cases, where the internal server times out.
%if 0%{?build_snapshot} %if 0%{?build_snapshot}
@ -39,16 +39,10 @@ Release: 0
%else %else
%define _sourcename %{_name}-%{version} %define _sourcename %{_name}-%{version}
%endif %endif
Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.gz Source: https://github.com/libproxy/%{_name}/archive/%{version}.tar.gz
# Script used for automatic snapshot updates # Script used for automatic snapshot updates
Source98: update-from-svn.sh Source98: update-from-svn.sh
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-UPSTREAM libproxy-pxgsettings-crash.patch bnc#836576 dimstar@opensuse.org -- Fix crash when pxgsettings is closing, taken from svn.
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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -74,8 +68,7 @@ BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(webkitgtk-3.0) BuildRequires: pkgconfig(webkitgtk-3.0)
%endif %endif
BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-devel
BuildRequires: libkde4-devel BuildRequires: libKF5ConfigCore5
BuildRequires: libqt4-devel
%if %{build_mozjs} %if %{build_mozjs}
BuildRequires: pkgconfig(mozjs185) BuildRequires: pkgconfig(mozjs185)
%endif %endif
@ -188,10 +181,12 @@ Obsoletes: libproxy-gnome < %{version}
A module to extend libproxy with capabilities to query GNOME about A module to extend libproxy with capabilities to query GNOME about
proxy settings. proxy settings.
%package -n libproxy1-config-kde4 %package -n libproxy1-config-kde
Summary: Libproxy module for KDE configuration Summary: Libproxy module for KDE configuration
Group: System/Libraries Group: System/Libraries
Requires: libproxy1 = %{version} Requires: libproxy1 = %{version}
# We don't really need the library, but this package brings kreadconfig5
Requires: libKF5ConfigCore5
%if 0%{?suse_version} %if 0%{?suse_version}
Recommends: libproxy1-pacrunner = %{version} Recommends: libproxy1-pacrunner = %{version}
Supplements: packageand(libproxy1:libkde4) Supplements: packageand(libproxy1:libkde4)
@ -200,8 +195,10 @@ Requires: libproxy1-pacrunner = %{version}
%endif %endif
Provides: libproxy-kde = %{version} Provides: libproxy-kde = %{version}
Obsoletes: libproxy-kde < %{version} Obsoletes: libproxy-kde < %{version}
# A generic KDE config loader was introduced in 0.4.12
Obsoletes: libproxy1-config-kde4 < 0.4.12
%description -n libproxy1-config-kde4 %description -n libproxy1-config-kde
A module to extend libproxy with capabilities to query KDE4 about proxy A module to extend libproxy with capabilities to query KDE4 about proxy
settings. settings.
@ -314,9 +311,6 @@ libproxy offers the following features: * extremely small core
%prep %prep
%setup -q -n %{_sourcename} %setup -q -n %{_sourcename}
%patch0
%patch1
%patch2 -p1
mkdir build mkdir build
%build %build
@ -441,9 +435,9 @@ rm -f %{buildroot}%{_datadir}/vala/vapi/libproxy-1.0.vapi
%if ! 0%{?windows} %if ! 0%{?windows}
%files -n libproxy1-config-kde4 %files -n libproxy1-config-kde
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libproxy-%{version}/modules/config_kde4.so %{_libdir}/libproxy-%{version}/modules/config_kde.so
%if 0%{?favor_gtk2} %if 0%{?favor_gtk2}

15
libproxy-pxgsettings-crash.patch
View File

@ -1,15 +0,0 @@
Index: libproxy/modules/pxgsettings.cpp
===================================================================
--- libproxy/modules/pxgsettings.cpp.orig
+++ libproxy/modules/pxgsettings.cpp
@@ -157,9 +157,7 @@ int main(int argc, char **argv) {
g_main_loop_run(loop);
// Cleanup
- while (G_IS_OBJECT(client)) {
- g_object_unref(client);
- }
+ g_object_unref(client);
g_io_channel_shutdown(inchan, FALSE, NULL);
g_io_channel_shutdown(outchan, FALSE, NULL);
g_io_channel_unref(inchan);

27
libproxy-pxgsettings-signals.patch
View File

@ -1,27 +0,0 @@
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] ));
}

26
libproxy.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Tue Jan 12 16:46:37 UTC 2016 - dimstar@opensuse.org
- Update to version 0.4.12:
+ Move development to github.com/libproxy/libproxy.
+ Fix fd leak in get_pac (Bug #185).
+ Detect running MATE session (Bug #186, Part1).
+ Fix linking of perl bindings to pthread (Bug #182).
+ Correctly detect spidermonky (mozjs185) (Bug #188).
+ Stop pxgsettings from segfaulting on exit (Bug #192).
+ Fix test #10 (Bug #189).
+ Fix build on Mac OS X (Bug #183).
+ Add a generic KDE Config module (fix crashes of Qt5 based
apps) (issue#4).
- Drop upstream fixed patches:
+ libproxy-pxgsettings-crash.patch
+ libproxy-no-libperl.patch
+ libproxy-pxgsettings-signals.patch
- Rename libproxy1-config-kde4 subpackage to libproxy-config-kde,
following upstreams introduction of the generic config loader.
- Require libKF5ConfigCore5 from libproxy1-config-kde (we don't
really need the library, but kreadconfig5 in this package).
- Replace libkde4-devel and libqt4-devel BuildRequires with
libKF5ConfigCore5: the new KDE config parser interacts directly
with kreadconfig5 and does not link to Qt.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 15 10:00:14 UTC 2015 - dimstar@opensuse.org Fri May 15 10:00:14 UTC 2015 - dimstar@opensuse.org

30
libproxy.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libproxy # spec file for package libproxy
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2016 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
@ -31,7 +31,7 @@ Name: libproxy
Summary: Libproxy provides consistent proxy configuration to applications Summary: Libproxy provides consistent proxy configuration to applications
License: GPL-2.0+ and LGPL-2.1+ License: GPL-2.0+ and LGPL-2.1+
Group: System/Libraries Group: System/Libraries
Version: 0.4.11 Version: 0.4.12
Release: 0 Release: 0
# FIXME: verify if test suite works - 0.4.10 has weird behavior in some cases, where the internal server times out. # FIXME: verify if test suite works - 0.4.10 has weird behavior in some cases, where the internal server times out.
%if 0%{?build_snapshot} %if 0%{?build_snapshot}
@ -39,16 +39,10 @@ Release: 0
%else %else
%define _sourcename %{_name}-%{version} %define _sourcename %{_name}-%{version}
%endif %endif
Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.gz Source: https://github.com/libproxy/%{_name}/archive/%{version}.tar.gz
# Script used for automatic snapshot updates # Script used for automatic snapshot updates
Source98: update-from-svn.sh Source98: update-from-svn.sh
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-UPSTREAM libproxy-pxgsettings-crash.patch bnc#836576 dimstar@opensuse.org -- Fix crash when pxgsettings is closing, taken from svn.
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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -74,8 +68,7 @@ BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(webkitgtk-3.0) BuildRequires: pkgconfig(webkitgtk-3.0)
%endif %endif
BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-devel
BuildRequires: libkde4-devel BuildRequires: libKF5ConfigCore5
BuildRequires: libqt4-devel
%if %{build_mozjs} %if %{build_mozjs}
BuildRequires: pkgconfig(mozjs185) BuildRequires: pkgconfig(mozjs185)
%endif %endif
@ -188,10 +181,12 @@ Obsoletes: libproxy-gnome < %{version}
A module to extend libproxy with capabilities to query GNOME about A module to extend libproxy with capabilities to query GNOME about
proxy settings. proxy settings.
%package -n libproxy1-config-kde4 %package -n libproxy1-config-kde
Summary: Libproxy module for KDE configuration Summary: Libproxy module for KDE configuration
Group: System/Libraries Group: System/Libraries
Requires: libproxy1 = %{version} Requires: libproxy1 = %{version}
# We don't really need the library, but this package brings kreadconfig5
Requires: libKF5ConfigCore5
%if 0%{?suse_version} %if 0%{?suse_version}
Recommends: libproxy1-pacrunner = %{version} Recommends: libproxy1-pacrunner = %{version}
Supplements: packageand(libproxy1:libkde4) Supplements: packageand(libproxy1:libkde4)
@ -200,8 +195,10 @@ Requires: libproxy1-pacrunner = %{version}
%endif %endif
Provides: libproxy-kde = %{version} Provides: libproxy-kde = %{version}
Obsoletes: libproxy-kde < %{version} Obsoletes: libproxy-kde < %{version}
# A generic KDE config loader was introduced in 0.4.12
Obsoletes: libproxy1-config-kde4 < 0.4.12
%description -n libproxy1-config-kde4 %description -n libproxy1-config-kde
A module to extend libproxy with capabilities to query KDE4 about proxy A module to extend libproxy with capabilities to query KDE4 about proxy
settings. settings.
@ -314,9 +311,6 @@ libproxy offers the following features: * extremely small core
%prep %prep
%setup -q -n %{_sourcename} %setup -q -n %{_sourcename}
%patch0
%patch1
%patch2 -p1
mkdir build mkdir build
%build %build
@ -441,9 +435,9 @@ rm -f %{buildroot}%{_datadir}/vala/vapi/libproxy-1.0.vapi
%if ! 0%{?windows} %if ! 0%{?windows}
%files -n libproxy1-config-kde4 %files -n libproxy1-config-kde
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libproxy-%{version}/modules/config_kde4.so %{_libdir}/libproxy-%{version}/modules/config_kde.so
%if 0%{?favor_gtk2} %if 0%{?favor_gtk2}