From 8559989dbb2c03fb4597981820d20a74919b6a8e Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 4 Feb 2026 17:56:03 +0100 Subject: [PATCH] libproxy, bump to version 0.5.12 + enable (#13714) --- ...xy-0.5.9.recipe => libproxy-0.5.12.recipe} | 10 +++-- .../libproxy-0.5.12-optional-static.patch | 44 +++++++++++++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) rename net-libs/libproxy/{libproxy-0.5.9.recipe => libproxy-0.5.12.recipe} (88%) create mode 100644 net-libs/libproxy/patches/libproxy-0.5.12-optional-static.patch diff --git a/net-libs/libproxy/libproxy-0.5.9.recipe b/net-libs/libproxy/libproxy-0.5.12.recipe similarity index 88% rename from net-libs/libproxy/libproxy-0.5.9.recipe rename to net-libs/libproxy/libproxy-0.5.12.recipe index 49fc170ca..cbb743acd 100644 --- a/net-libs/libproxy/libproxy-0.5.9.recipe +++ b/net-libs/libproxy/libproxy-0.5.12.recipe @@ -15,11 +15,12 @@ COPYRIGHT="2022-2023 The Libproxy Team LICENSE="GNU LGPL v2.1" REVISION="1" SOURCE_URI="https://github.com/libproxy/libproxy/archive/refs/tags/$portVersion.tar.gz" -CHECKSUM_SHA256="a1976c3ac4affedc17e6d40cf78c9d8eca6751520ea3cbbec1a8850f7ded1565" +CHECKSUM_SHA256="a1fa55991998b80a567450a9e84382421a7176a84446c95caaa8b72cf09fa86f" SOURCE_FILENAME="libproxy-$portVersion.tar.gz" +PATCHES="libproxy-0.5.12-optional-static.patch" -ARCHITECTURES="?all ?x86_gcc2" -SECONDARY_ARCHITECTURES="?x86" +ARCHITECTURES="ALL !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" commandSuffix=$secondaryArchSuffix commandBinDir=$binDir @@ -51,6 +52,7 @@ PROVIDES_devel=" " REQUIRES_devel=" libproxy$secondaryArchSuffix == $portVersion base + devel:libcurl$secondaryArchSuffix " PROVIDES_tools=" @@ -116,5 +118,7 @@ INSTALL() TEST() { + # 1 test out of 5 failed + # not ok /config/gnome/none - GLib-GIO-FATAL-ERROR: No GSettings schemas are installed on the system meson test -C build --print-errorlogs } diff --git a/net-libs/libproxy/patches/libproxy-0.5.12-optional-static.patch b/net-libs/libproxy/patches/libproxy-0.5.12-optional-static.patch new file mode 100644 index 000000000..377e53d91 --- /dev/null +++ b/net-libs/libproxy/patches/libproxy-0.5.12-optional-static.patch @@ -0,0 +1,44 @@ +From 3205fbb00a07b1622060f19a1013055fe74fff21 Mon Sep 17 00:00:00 2001 +From: Jan-Michael Brummer +Date: Mon, 15 Dec 2025 11:41:06 +0100 +Subject: [PATCH] Make use of meson library + +Use meson library instead of defining shared and static library on their +own. + +Fixes: https://github.com/libproxy/libproxy/issues/343 +--- + src/libproxy/meson.build | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +diff --git a/src/libproxy/meson.build b/src/libproxy/meson.build +index ff8d80e..b508c33 100644 +--- a/src/libproxy/meson.build ++++ b/src/libproxy/meson.build +@@ -32,7 +32,7 @@ elif build_machine.system() == 'sunos' + endif + endif + +-libproxy = shared_library( ++libproxy = library( + 'proxy', + libproxy_sources, + include_directories: px_backend_inc, +@@ -45,17 +45,6 @@ libproxy = shared_library( + install_rpath: pkglibdir, + ) + +-libproxy_static = static_library( +- 'proxy', +- libproxy_sources, +- include_directories: px_backend_inc, +- dependencies: libproxy_deps, +- link_args : vflag, +- link_depends : mapfile, +- install: true, +- install_rpath: pkglibdir, +-) +- + libproxy_dep = declare_dependency ( + include_directories: libproxy_inc, + link_with: libproxy,