Hello community,
here is the log from the commit of package libproxy for openSUSE:Factory checked in at 2016-05-05 12:11:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libproxy (Old)
and /work/SRC/openSUSE:Factory/.libproxy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libproxy"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libproxy/libproxy-plugins.changes 2016-01-21 23:41:14.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libproxy.new/libproxy-plugins.changes 2016-05-05 12:11:03.000000000 +0200
@@ -1,0 +2,23 @@
+Thu Apr 28 16:54:40 UTC 2016 - dimstar@opensuse.org
+
+- Update to version 0.4.13:
+ + Allow linking webkit pacrunner against javascriptcore-4.0
+ (webkit2).
+ + Allow to disable building of the KDE module
+ (-DWITH_KDE=ON/OFF).
+ + Fix compilation errors with CLang on MacOSX.
+ + bindings: perl: Add an option to explicitly link against
+ libperl.so. Some distributions want to do it, other prefer not
+ to, the library is anyway in context of perl.
+ + config_kde: Add a basic cache and invalidation: performance
+ improvement for the KDE module.
+- Pass -DWITH_KDE=OFF to cmake when building core.
+- Replace pkgconfig(webkitgtk-3.0) BuildRequires with
+ pkgconfig(javascriptcoregtk-4.0): make use of the WebKit2 port.
+
+-------------------------------------------------------------------
+Thu Jan 14 11:56:33 UTC 2016 - fcrozat@suse.com
+
+- Disable building libproxy-config-kde on SLE.
+
+-------------------------------------------------------------------
libproxy.changes: same change
Old:
----
0.4.12.tar.gz
New:
----
0.4.13.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libproxy-plugins.spec ++++++
--- /var/tmp/diff_new_pack.jPNxRV/_old 2016-05-05 12:11:04.000000000 +0200
+++ /var/tmp/diff_new_pack.jPNxRV/_new 2016-05-05 12:11:04.000000000 +0200
@@ -31,7 +31,7 @@
Summary: Libproxy provides consistent proxy configuration to applications
License: GPL-2.0+ and LGPL-2.1+
Group: System/Libraries
-Version: 0.4.12
+Version: 0.4.13
Release: 0
# 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}
@@ -57,7 +57,7 @@
BuildRequires: gconf2-devel
# For directory ownership, but also because we want to rebuild the modules if
# the library changed
-BuildRequires: libproxy1
+BuildRequires: libproxy1 = %{version}
%if 0%{?favor_gtk2}
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gobject-2.0)
@@ -65,10 +65,12 @@
%else
BuildRequires: pkgconfig(gio-2.0) >= 2.26
BuildRequires: pkgconfig(gobject-2.0)
-BuildRequires: pkgconfig(webkitgtk-3.0)
+BuildRequires: pkgconfig(javascriptcoregtk-4.0)
%endif
BuildRequires: NetworkManager-devel
+%if 0%{?is_opensuse}
BuildRequires: libKF5ConfigCore5
+%endif
%if %{build_mozjs}
BuildRequires: pkgconfig(mozjs185)
%endif
@@ -202,7 +204,6 @@
A module to extend libproxy with capabilities to query KDE4 about proxy
settings.
-
%if %{build_mozjs}
%package -n libproxy1-pacrunner-mozjs
Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine
@@ -349,6 +350,7 @@
-DWITH_DOTNET=OFF \
-DWITH_PERL=OFF \
-DWITH_PYTHON=OFF \
+ -DWITH_KDE=OFF \
%endif
%if 0%{?suse_version} && 0%{?suse_version} < 1120
-DCMAKE_BUILD_TYPE=DebugFull \
@@ -434,10 +436,11 @@
%else
%if ! 0%{?windows}
-
+%if 0%{?is_opensuse}
%files -n libproxy1-config-kde
%defattr(-, root, root)
%{_libdir}/libproxy-%{version}/modules/config_kde.so
+%endif
%if 0%{?favor_gtk2}
++++++ libproxy.spec ++++++
--- /var/tmp/diff_new_pack.jPNxRV/_old 2016-05-05 12:11:04.000000000 +0200
+++ /var/tmp/diff_new_pack.jPNxRV/_new 2016-05-05 12:11:04.000000000 +0200
@@ -31,7 +31,7 @@
Summary: Libproxy provides consistent proxy configuration to applications
License: GPL-2.0+ and LGPL-2.1+
Group: System/Libraries
-Version: 0.4.12
+Version: 0.4.13
Release: 0
# 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}
@@ -57,7 +57,7 @@
BuildRequires: gconf2-devel
# For directory ownership, but also because we want to rebuild the modules if
# the library changed
-BuildRequires: libproxy1
+BuildRequires: libproxy1 = %{version}
%if 0%{?favor_gtk2}
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gobject-2.0)
@@ -65,10 +65,12 @@
%else
BuildRequires: pkgconfig(gio-2.0) >= 2.26
BuildRequires: pkgconfig(gobject-2.0)
-BuildRequires: pkgconfig(webkitgtk-3.0)
+BuildRequires: pkgconfig(javascriptcoregtk-4.0)
%endif
BuildRequires: NetworkManager-devel
+%if 0%{?is_opensuse}
BuildRequires: libKF5ConfigCore5
+%endif
%if %{build_mozjs}
BuildRequires: pkgconfig(mozjs185)
%endif
@@ -202,7 +204,6 @@
A module to extend libproxy with capabilities to query KDE4 about proxy
settings.
-
%if %{build_mozjs}
%package -n libproxy1-pacrunner-mozjs
Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine
@@ -349,6 +350,7 @@
-DWITH_DOTNET=OFF \
-DWITH_PERL=OFF \
-DWITH_PYTHON=OFF \
+ -DWITH_KDE=OFF \
%endif
%if 0%{?suse_version} && 0%{?suse_version} < 1120
-DCMAKE_BUILD_TYPE=DebugFull \
@@ -434,10 +436,11 @@
%else
%if ! 0%{?windows}
-
+%if 0%{?is_opensuse}
%files -n libproxy1-config-kde
%defattr(-, root, root)
%{_libdir}/libproxy-%{version}/modules/config_kde.so
+%endif
%if 0%{?favor_gtk2}
++++++ 0.4.12.tar.gz -> 0.4.13.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libproxy-0.4.12/.travis.yml new/libproxy-0.4.13/.travis.yml
--- old/libproxy-0.4.12/.travis.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/libproxy-0.4.13/.travis.yml 2016-04-28 19:04:41.000000000 +0200
@@ -0,0 +1,35 @@
+language: cpp
+
+os:
+ - linux
+ - osx
+
+compiler:
+ - clang
+ - gcc
+
+matrix:
+ allow_failures:
+ - os: osx
+
+install:
+# create /etc/sysconfig so that the build process enables this module (build test)
+ - |
+ if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then
+ sudo mkdir /etc/sysconfig
+ sudo apt-get -qq update
+ sudo apt-get install -y libjavascriptcoregtk-3.0-dev
+ fi
+
+script:
+ - |
+ cmake . \
+ -DWITH_PERL=ON \
+ -DWITH_PYTHON=ON \
+ -DWITH_GNOME3=ON \
+ -DWITH_KDE=ON \
+ -DWITH_WEBKIT3=ON \
+ -DBIPR=0
+ - make
+ - sudo make install
+ - make test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libproxy-0.4.12/INSTALL new/libproxy-0.4.13/INSTALL
--- old/libproxy-0.4.12/INSTALL 2016-01-12 17:41:07.000000000 +0100
+++ new/libproxy-0.4.13/INSTALL 2016-04-28 19:04:41.000000000 +0200
@@ -84,6 +84,11 @@
in the vendor directory, which is the one used by most
packagers.
+PERL_LINK_LIBPERL: Default to ON if PERL_VENDORINSTALL is OFF, default to
+ OFF otherwise. Explicitly links the Perl binding
+ against libperl.so. It must be ON for linking to work
+ when --no-undefined is passed to the linker.
+
WITH_DOTNET: Default to OFF. Enable Mono .NET bindings.
WITH_GNOME: Default to ON. Enable Gnome2/GConf bindings.
@@ -91,7 +96,10 @@
WITH_GNOME3: Default to ON. Build the Gnome3/GSettings bindings.
instead of Gnome2/GConf based one.
-WITH_KDE4: Default to ON. Enables KDE4/Kconf bindings.
+WITH_KDE: Default to ON. Enables plug-in to read proxy settings
+ from either KDE4 or KDE Frameworks 5.
+ Note: this plug-in only has a *runtime* dependency on
+ either kreadconfig or kreadconfig5.
WITH_MOZJS: Default to ON. Enable Mozilla javascript bindings. As
Mozilla Javascript engine is often installed multiple
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libproxy-0.4.12/NEWS new/libproxy-0.4.13/NEWS
--- old/libproxy-0.4.12/NEWS 2016-01-12 17:41:07.000000000 +0100
+++ new/libproxy-0.4.13/NEWS 2016-04-28 19:04:41.000000000 +0200
@@ -1,3 +1,15 @@
+New in Version 0.4.13
+==============================
+* Allow linking webkit pacrunner against javascriptcore-4.0
+ (webkit2).
+* Allow to disable building of the KDE module (-DWITH_KDE=ON/OFF).
+* Fix compilation errors with CLang on MacOSX.
+* bindings: perl: Add an option to explicitly link against libperl.so
+ Some distributions want to do it, other prefer not to, the library
+ is anyway in context of perl.
+* config_kde: Add a basic cache and invalidation: performance improvement
+ for the KDE module.
+
New in version 0.4.12
==============================
* Move development to github.com/libproxy/libproxy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libproxy-0.4.12/bindings/perl/CMakeLists.txt new/libproxy-0.4.13/bindings/perl/CMakeLists.txt
--- old/libproxy-0.4.12/bindings/perl/CMakeLists.txt 2016-01-12 17:41:07.000000000 +0100
+++ new/libproxy-0.4.13/bindings/perl/CMakeLists.txt 2016-04-28 19:04:41.000000000 +0200
@@ -10,6 +10,19 @@
# Some distributions install perl packages in vendor when shipped with the distro.
# Let's make their lifes easier by offering an install flag for this usecase.
option(PERL_VENDORINSTALL "Install Perl package in vendor directory" OFF)
+
+ # Offer an option to explicitly link against libperl.so, with a default
+ # that depends on the value of the PERL_VENDORINSTALL option: if the
+ # binding is installed into a version-independent directory such as
+ # vendor_perl the chances of it needing a rebuild on each Perl update are
+ # lower. Note: not linking against libperl.so does not work if
+ # --no-undefined is passed to the linker.
+ if(PERL_VENDORINSTALL)
+ option(PERL_LINK_LIBPERL "Explicitly link against libperl.so" OFF)
+ else()
+ option(PERL_LINK_LIBPERL "Explicitly link against libperl.so" ON)
+ endif()
+
if(PERL_VENDORINSTALL)
set (PX_PERL_ARCH ${PERL_VENDORARCH})
set (PX_PERL_LIB ${PERL_VENDORLIB})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libproxy-0.4.12/bindings/perl/src/CMakeLists.txt new/libproxy-0.4.13/bindings/perl/src/CMakeLists.txt
--- old/libproxy-0.4.12/bindings/perl/src/CMakeLists.txt 2016-01-12 17:41:07.000000000 +0100
+++ new/libproxy-0.4.13/bindings/perl/src/CMakeLists.txt 2016-04-28 19:04:41.000000000 +0200
@@ -12,7 +12,12 @@
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/blib/arch/auto/Net)
add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS})
-target_link_libraries(PLlibproxy libproxy pthread)
+set(PLlibproxy_LIB_DEPENDENCIES libproxy pthread)
+if(PERL_LINK_LIBPERL)
+ set(PLlibproxy_LIB_DEPENDENCIES ${PERL_LIBRARY} ${PLlibproxy_LIB_DEPENDENCIES})
+endif()
+
+target_link_libraries(PLlibproxy ${PLlibproxy_LIB_DEPENDENCIES})
set_target_properties(PLlibproxy PROPERTIES OUTPUT_NAME "Libproxy")
set_target_properties(PLlibproxy PROPERTIES PREFIX "")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libproxy-0.4.12/bindings/python/libproxy.py new/libproxy-0.4.13/bindings/python/libproxy.py
--- old/libproxy-0.4.12/bindings/python/libproxy.py 2016-01-12 17:41:07.000000000 +0100
+++ new/libproxy-0.4.13/bindings/python/libproxy.py 2016-04-28 19:04:41.000000000 +0200
@@ -40,8 +40,12 @@
else:
_libc = _load("c", 6)
+_libc.free.argtypes = ctypes.c_void_p,
+
# Load libproxy
_libproxy = _load("proxy", 1)
+_libproxy.px_proxy_factory_new.restype = ctypes.POINTER(ctypes.c_void_p)
+_libproxy.px_proxy_factory_free.argtypes = ctypes.c_void_p,
_libproxy.px_proxy_factory_get_proxies.restype = ctypes.POINTER(ctypes.c_void_p)
class ProxyFactory(object):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libproxy-0.4.12/libproxy/CMakeLists.txt new/libproxy-0.4.13/libproxy/CMakeLists.txt
--- old/libproxy-0.4.12/libproxy/CMakeLists.txt 2016-01-12 17:41:07.000000000 +0100
+++ new/libproxy-0.4.13/libproxy/CMakeLists.txt 2016-04-28 19:04:41.000000000 +0200
@@ -1,6 +1,6 @@
### Project info
project(libproxy)
-set_project_version(0 4 12)
+set_project_version(0 4 13)
### Add a global compilation stuff
if (WIN32)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libproxy-0.4.12/libproxy/cmake/modules/config_kde.cmk new/libproxy-0.4.13/libproxy/cmake/modules/config_kde.cmk
--- old/libproxy-0.4.12/libproxy/cmake/modules/config_kde.cmk 2016-01-12 17:41:07.000000000 +0100
+++ new/libproxy-0.4.13/libproxy/cmake/modules/config_kde.cmk 2016-04-28 19:04:41.000000000 +0200
@@ -1,6 +1,4 @@
-find_program(KDE4_CONF kreadconfig)
-find_program(KF5_CONF kreadconfig5)
+option(WITH_KDE "Build module to read proxy settings from KDE4/KF5" ON)
-if (KDE4_CONF OR KF5_CONF)
- set(KDE_FOUND 1)
-endif()
+# There are no additional detections; kreadconfig (from KDE4) and kreadconfig5
+# (from KF5) are only needed at runtime.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libproxy-0.4.12/libproxy/cmake/modules/pacrunner_webkit.cmk new/libproxy-0.4.13/libproxy/cmake/modules/pacrunner_webkit.cmk
--- old/libproxy-0.4.12/libproxy/cmake/modules/pacrunner_webkit.cmk 2016-01-12 17:41:07.000000000 +0100
+++ new/libproxy-0.4.13/libproxy/cmake/modules/pacrunner_webkit.cmk 2016-04-28 19:04:41.000000000 +0200
@@ -13,11 +13,14 @@
endif()
else()
if(WITH_WEBKIT3)
- px_check_modules(WEBKIT "javascriptcoregtk-3.0 >= 1.5.0")
+ px_check_modules(WEBKIT "javascriptcoregtk-4.0")
if(NOT WEBKIT_LIBRARIES)
- px_check_modules(WEBKIT "webkitgtk-3.0 < 1.5.0")
+ px_check_modules(WEBKIT "javascriptcoregtk-3.0 >= 1.5.0")
+ if(NOT WEBKIT_LIBRARIES)
+ px_check_modules(WEBKIT "webkitgtk-3.0 < 1.5.0")
+ endif(NOT WEBKIT_LIBRARIES)
endif(NOT WEBKIT_LIBRARIES)
- else()
+ else(WITH_WEBKIT3)
px_check_modules(WEBKIT webkit-1.0)
endif()
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libproxy-0.4.12/libproxy/cmake/modules.cmk new/libproxy-0.4.13/libproxy/cmake/modules.cmk
--- old/libproxy-0.4.12/libproxy/cmake/modules.cmk 2016-01-12 17:41:07.000000000 +0100
+++ new/libproxy-0.4.13/libproxy/cmake/modules.cmk 2016-04-28 19:04:41.000000000 +0200
@@ -32,7 +32,7 @@
px_module(config_sysconfig "${SYSCONFIG_FOUND}" 1)
px_module(config_gnome "${GNOME2_FOUND}" 0)
px_module(config_gnome3 "${GNOME3_FOUND}" 0)
-px_module(config_kde "${KDE_FOUND}" 0)
+px_module(config_kde "${WITH_KDE}" 0)
px_module(config_macosx "${SC_FOUND}" 1 ${SC_LIBRARIES} ${CF_LIBRARIES})
px_module(config_w32reg "${WIN32}" 1)
px_module(ignore_domain 1 1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libproxy-0.4.12/libproxy/modules/config_kde.cpp new/libproxy-0.4.13/libproxy/modules/config_kde.cpp
--- old/libproxy-0.4.12/libproxy/modules/config_kde.cpp 2016-01-12 17:41:07.000000000 +0100
+++ new/libproxy-0.4.13/libproxy/modules/config_kde.cpp 2016-04-28 19:04:41.000000000 +0200
@@ -18,9 +18,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
******************************************************************************/
+#include