Accepting request 987352 from GNOME:Factory
Scripted push from GNOME:Next (forwarded request 987177 from dimstar) OBS-URL: https://build.opensuse.org/request/show/987352 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libproxy?expand=0&rev=83
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
3673670d1a
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bc89f842f654ee1985a31c0ba56dc7e2ce8044a0264ddca84e650f46cd7f8b05
|
||||
size 80136
|
||||
BIN
libproxy-0.4.18.tar.xz
(Stored with Git LFS)
Normal file
BIN
libproxy-0.4.18.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
47
libproxy-perl-cflags.patch
Normal file
47
libproxy-perl-cflags.patch
Normal file
@ -0,0 +1,47 @@
|
||||
From 4d7b2a237b206492cd63d0e96c0c1caf89902352 Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fvogt@suse.de>
|
||||
Date: Tue, 21 Jun 2022 10:45:50 +0200
|
||||
Subject: [PATCH] bindings: perl: Use ccflags from %Config for libproxy module
|
||||
compilation
|
||||
|
||||
This is needed to achieve (binary and source) compatibility. Unfortunately
|
||||
there doesn't appear to be a more official way, even PERL_EXTRA_C_FLAGS is not
|
||||
complete.
|
||||
|
||||
Fixes #182
|
||||
---
|
||||
bindings/perl/CMakeLists.txt | 7 +++++++
|
||||
bindings/perl/src/CMakeLists.txt | 1 +
|
||||
2 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/bindings/perl/CMakeLists.txt b/bindings/perl/CMakeLists.txt
|
||||
index 4db28e1a..368bc56a 100644
|
||||
--- a/bindings/perl/CMakeLists.txt
|
||||
+++ b/bindings/perl/CMakeLists.txt
|
||||
@@ -33,6 +33,13 @@ if(PERL_FOUND AND PERLLIBS_FOUND)
|
||||
OUTPUT_VARIABLE PX_PERL_ARCH)
|
||||
set (PX_PERL_LIB ${PERL_SITELIB})
|
||||
endif()
|
||||
+
|
||||
+ # PERL_EXTRA_C_FLAGS is not complete, we need full flags (including e.g.
|
||||
+ # _FILE_OFFSET_BITS=64) for compatibility.
|
||||
+ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccflags}"
|
||||
+ OUTPUT_VARIABLE PX_PERL_CCFLAGS)
|
||||
+ # Convert it to a "list" suitable for target_compile_options.
|
||||
+ string(REPLACE " " ";" PX_PERL_CCFLAGS ${PX_PERL_CCFLAGS})
|
||||
endif()
|
||||
|
||||
add_subdirectory(lib)
|
||||
diff --git a/bindings/perl/src/CMakeLists.txt b/bindings/perl/src/CMakeLists.txt
|
||||
index 29e656d4..2800a85c 100644
|
||||
--- a/bindings/perl/src/CMakeLists.txt
|
||||
+++ b/bindings/perl/src/CMakeLists.txt
|
||||
@@ -18,6 +18,7 @@ if(PERL_LINK_LIBPERL)
|
||||
endif()
|
||||
|
||||
target_link_libraries(PLlibproxy ${PLlibproxy_LIB_DEPENDENCIES})
|
||||
+target_compile_options(PLlibproxy PRIVATE ${PX_PERL_CCFLAGS})
|
||||
set_target_properties(PLlibproxy PROPERTIES OUTPUT_NAME "Libproxy")
|
||||
set_target_properties(PLlibproxy PROPERTIES PREFIX "")
|
||||
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
Index: libproxy-0.4.17/cmake/FindPython3Interp.cmake
|
||||
===================================================================
|
||||
--- libproxy-0.4.17.orig/cmake/FindPython3Interp.cmake
|
||||
+++ libproxy-0.4.17/cmake/FindPython3Interp.cmake
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
unset(_Python3_NAMES)
|
||||
|
||||
-set(_Python3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
+set(_Python3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
|
||||
if(Python3Interp_FIND_VERSION)
|
||||
if(Python3Interp_FIND_VERSION_COUNT GREATER 1)
|
||||
@ -1,3 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 21 08:50:02 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Add libproxy-perl-cflags.patch: perl: Use ccflags from %Config
|
||||
for libproxy module compilation; fixes perl test suite on i586.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 20 14:01:59 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update to version 0.4.18:
|
||||
+ build: Allow configuration of sysconfig module.
|
||||
+ config_envvar: Add environment variable for pacrunner
|
||||
debugging.
|
||||
+ build: disable mozjs by default.
|
||||
+ python: Support Python 3.10 and above.
|
||||
+ Add Duktape pacrunner module.
|
||||
+ config_kde: Compute list of config file locations ourselves.
|
||||
+ cpmfog_gnome3: Add gnome-wayland to permitted DESKTOP_SESSION.
|
||||
- Drop libproxy-python-310.patch: fixed upstream.
|
||||
- Build duktape pacrunner module:
|
||||
+ Add pkgconfig(duktape): new dependency.
|
||||
+ Split new subpackage libproxy1-pacrunner-duktape.
|
||||
+ Suggest duktape pacrunner for config modules recommending a
|
||||
pacrunner.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 16 10:27:55 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
%bcond_without python2
|
||||
%{!?_assemblies_dir: %global _assemblies_dir %(pkg-config cecil --variable=assemblies_dir)}
|
||||
Name: libproxy%{?dash}%{?name_suffix}
|
||||
Version: 0.4.17
|
||||
Version: 0.4.18
|
||||
Release: 0
|
||||
Summary: Automatic proxy configuration management for applications
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
@ -47,8 +47,8 @@ Group: Development/Libraries/C and C++
|
||||
URL: http://libproxy.github.io/libproxy/
|
||||
Source: https://github.com/libproxy/libproxy/releases/download/%{version}/%{_name}-%{version}.tar.xz
|
||||
Source99: baselibs.conf
|
||||
# PATCH-FIX-OPENSUSE libproxy-python-310.patch dimstar@opensuse.org -- Detect python 3.10. upstream has more sophisticated changes already in the queue
|
||||
Patch0: libproxy-python-310.patch
|
||||
# PATCH-FIX-UPSTREAM libproxy-perl-cflags.patch dimstar@opensuse.org -- perl: Use ccflags from %Config for libproxy module compilation
|
||||
Patch0: libproxy-perl-cflags.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
# netcfg is needed for the test suite.
|
||||
@ -68,6 +68,7 @@ BuildRequires: python3-devel
|
||||
%if %{with python2}
|
||||
BuildRequires: python-devel
|
||||
%endif
|
||||
BuildRequires: pkgconfig(duktape)
|
||||
BuildRequires: pkgconfig(gio-2.0) >= 2.26
|
||||
BuildRequires: pkgconfig(gobject-2.0)
|
||||
BuildRequires: pkgconfig(javascriptcoregtk-4.0)
|
||||
@ -137,6 +138,7 @@ Provides: libproxy-gnome = %{version}
|
||||
Obsoletes: libproxy-gnome < %{version}
|
||||
%if 0%{?suse_version}
|
||||
Recommends: libproxy1-pacrunner = %{version}
|
||||
Suggests: libproxy1-pacrunner-duktape
|
||||
Supplements: (libproxy1 and gnome-session-core)
|
||||
%else
|
||||
Requires: libproxy1-pacrunner = %{version}
|
||||
@ -165,6 +167,7 @@ Requires: libqt5-qttools
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
Recommends: libproxy1-pacrunner = %{version}
|
||||
Suggests: libproxy1-pacrunner-duktape
|
||||
Supplements: (libproxy1 and libkde4)
|
||||
Supplements: (libproxy1 and plasma5-session)
|
||||
%else
|
||||
@ -199,6 +202,22 @@ Supplements: (libproxy1 and libmozjs185-1_0)
|
||||
A module to extend libproxy with capabilities to pass addresses to a
|
||||
WPAD/PAC script and have it find the correct proxy.
|
||||
|
||||
%package -n libproxy1-pacrunner-duktape
|
||||
Summary: Libproxy module to support WPAD/PAC parsing via the WebKit JavaScript Engine
|
||||
Group: System/Libraries
|
||||
Requires: libproxy1 = %{version}
|
||||
# A virtual symbol to identify that this is a pacrunner.
|
||||
Provides: libproxy1-pacrunner = %{version}
|
||||
%if 0%{?suse_version}
|
||||
Supplements: (libproxy1 and %(rpm --qf "%%{name}" -qf $(readlink -f %{_libdir}/libduktape.so)))
|
||||
%endif
|
||||
|
||||
%description -n libproxy1-pacrunner-duktape
|
||||
A module to extend libproxy with capabilities to pass addresses to a
|
||||
WPAD/PAC script and have it find the correct proxy.
|
||||
|
||||
Relies on tuktape to do the javascript parsing
|
||||
|
||||
%package -n libproxy1-pacrunner-webkit
|
||||
Summary: Libproxy module to support WPAD/PAC parsing via the WebKit JavaScript Engine
|
||||
Group: System/Libraries
|
||||
@ -411,6 +430,10 @@ make test
|
||||
%defattr(-, root, root)
|
||||
%{_libdir}/libproxy-%{version}/modules/network_networkmanager.so
|
||||
|
||||
%files -n libproxy1-pacrunner-duktape
|
||||
%defattr(-, root, root)
|
||||
%{_libdir}/libproxy-%{version}/modules/pacrunner_duktape.so
|
||||
|
||||
%files -n libproxy1-pacrunner-webkit
|
||||
%defattr(-, root, root)
|
||||
%{_libdir}/libproxy-%{version}/modules/pacrunner_webkit.so
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user