[gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/, net-libs/libproxy/files/
commit: 3c640d1bd2c057b4e2b0c5b8905ad3c77a201664 Author: Matt Turner gentoo org> AuthorDate: Sat Jul 22 16:10:23 2023 + Commit: Matt Turner gentoo org> CommitDate: Sat Jul 22 16:12:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c640d1b net-libs/libproxy: Drop old versions Bug: https://bugs.gentoo.org/754954 Closes: https://bugs.gentoo.org/893704 Signed-off-by: Matt Turner gentoo.org> net-libs/libproxy/Manifest | 2 - .../libproxy/files/libproxy-0.4.12-macosx.patch| 70 - ...proxy-0.4.18-Fix-building-without-duktape.patch | 33 .../files/libproxy-0.4.18-avoid-nm-build-dep.patch | 90 -- net-libs/libproxy/files/proxy.1| 23 -- net-libs/libproxy/libproxy-0.4.18.ebuild | 83 net-libs/libproxy/libproxy-0.5.2.ebuild| 71 - net-libs/libproxy/metadata.xml | 2 - 8 files changed, 374 deletions(-) diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest index 69fdf63ced84..b51521aacb35 100644 --- a/net-libs/libproxy/Manifest +++ b/net-libs/libproxy/Manifest @@ -1,3 +1 @@ -DIST libproxy-0.4.18.tar.gz 98037 BLAKE2B 12505cc7afe9ca27bb387df31d7368ed3ac83696255e6bd8fdbca1528fb6fe83510cdf7c6bda09939dcb55daefba24cf9c52435f664c6cba01daad87ddff3f2a SHA512 1148d688a9f070273a1a2b110a788561789799089660292bbba59fbf0a9caf7d28cb039a9ccdcb935f752e1e34739b2d2f4c784b1bb3bbaa03d108e7b38a4754 -DIST libproxy-0.5.2.tar.gz 60024 BLAKE2B 7484b61f5eb3dbb148bce69c6d5d30d218c9392c559661c7e01e02339546c246afb47ab28956d90076d835f4a72ec260690cd0d3a52b8302ec238f1bb1eb87c0 SHA512 10d2d435288e8259bc16e6fc678bbd5edee7de8ef4235de29ed7740493690b33c3b1820f1a9befb60254069946e3ff3cc6130c7d19f34fff8062aec16dc1cbc8 DIST libproxy-0.5.3.tar.gz 60069 BLAKE2B adfa982344470251667b113f12f77722f6793ceeec902ccf82e32e80e15836384fbe1ccbec8865fc877fa04b25e6985847eef75b4ce437dbf0410d16e2bd5f36 SHA512 0fa4c677372afa76a9f143abb1472af1df85e1190425ec4168b98e575a9b9c9fe3dcc56062609da8ef266d56dfb153e7f7a1c15aed2d385003d9f3f421d08590 diff --git a/net-libs/libproxy/files/libproxy-0.4.12-macosx.patch b/net-libs/libproxy/files/libproxy-0.4.12-macosx.patch deleted file mode 100644 index 052e6b0a7fe8.. --- a/net-libs/libproxy/files/libproxy-0.4.12-macosx.patch +++ /dev/null @@ -1,70 +0,0 @@ -https://trac.macports.org/browser/trunk/dports/net/libproxy/files/patch-libproxy-cmake.diff - -diff -ur libproxy/cmake.orig/libproxy.cmk libproxy/cmake/libproxy.cmk a/libproxy/cmake/libproxy.cmk 2012-10-02 07:20:40.0 -0700 -+++ b/libproxy/cmake/libproxy.cmk 2012-10-19 13:47:50.0 -0700 -@@ -18,7 +18,7 @@ - set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp - PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES}) - # When changing the SOVERSION here remember to also bump the 'favorite proxy .so' in python bindings. --set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1) -+set_target_properties(libproxy PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" PREFIX "" VERSION 1.0.0 SOVERSION 1) - set_target_properties(libproxy PROPERTIES INTERFACE_LINK_LIBRARIES "") - set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "") - install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR}) -diff -ur libproxy/cmake.orig/modules/config_envvar.cmk libproxy/cmake/modules/config_envvar.cmk libproxy/cmake.orig/modules/config_envvar.cmk 2010-06-14 10:40:47.0 -0700 -+++ b/libproxy/cmake/modules/config_envvar.cmk 2012-10-19 13:45:42.0 -0700 -@@ -1,3 +1,3 @@ --if (NOT WIN32 AND NOT APPLE) -+if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) - set(ENVVAR_FOUND 1) --endif() -\ No newline at end of file -+endif() -diff -ur libproxy/cmake.orig/modules/config_gnome.cmk libproxy/cmake/modules/config_gnome.cmk libproxy/cmake.orig/modules/config_gnome.cmk 2012-10-02 07:20:40.0 -0700 -+++ b/libproxy/cmake/modules/config_gnome.cmk 2012-10-19 13:45:42.0 -0700 -@@ -1,4 +1,4 @@ --if (NOT WIN32 AND NOT APPLE) -+if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) - option(WITH_GNOME2 "Target a GNOME 2 system (gconf)" OFF) - option(WITH_GNOME3 "Target a GNOME 3 system (gsettings)" ON) - if(WITH_GNOME3) -diff -ur libproxy/cmake.orig/modules/config_macosx.cmk libproxy/cmake/modules/config_macosx.cmk libproxy/cmake.orig/modules/config_macosx.cmk 2010-06-14 10:40:47.0 -0700 -+++ b/libproxy/cmake/modules/config_macosx.cmk 2012-10-19 13:45:42.0 -0700 -@@ -1,4 +1,4 @@ --if(APPLE) -+if(APPLE AND MP_MACOSX) - find_library(SC_LIBRARIES SystemConfiguration) - find_library(CF_LIBRARIES CoreFoundation) - if(SC_LIBRARIES) -@@ -7,4 +7,4 @@ - if(CF_LIBRARIES) - set(CF_FOUND 1) - endif() --endif() -\ No newline at end of file -+endif() -diff -ur libproxy/
[gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/, net-libs/libproxy/files/
commit: 4f9bdf3ff851a3d92511a61dee004fd42090a4bc Author: Matt Turner gentoo org> AuthorDate: Mon May 15 16:44:40 2023 + Commit: Matt Turner gentoo org> CommitDate: Tue May 16 17:14:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f9bdf3f net-libs/libproxy: Version bump to 0.5.0 * Bump to EAPI=8 * Switch from cmake to meson * Drop non-Duktape PAC-parsing options (webkit, spidermonkey), per upstream Bug: https://bugs.gentoo.org/893704 Signed-off-by: Matt Turner gentoo.org> net-libs/libproxy/Manifest | 1 + ...ager-test-with-pacrunner-duktape-option-2.patch | 26 net-libs/libproxy/libproxy-0.5.0.ebuild| 77 ++ 3 files changed, 104 insertions(+) diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest index a92c1f4d02d5..eb7e2829d864 100644 --- a/net-libs/libproxy/Manifest +++ b/net-libs/libproxy/Manifest @@ -1 +1,2 @@ DIST libproxy-0.4.18.tar.gz 98037 BLAKE2B 12505cc7afe9ca27bb387df31d7368ed3ac83696255e6bd8fdbca1528fb6fe83510cdf7c6bda09939dcb55daefba24cf9c52435f664c6cba01daad87ddff3f2a SHA512 1148d688a9f070273a1a2b110a788561789799089660292bbba59fbf0a9caf7d28cb039a9ccdcb935f752e1e34739b2d2f4c784b1bb3bbaa03d108e7b38a4754 +DIST libproxy-0.5.0.tar.gz 58746 BLAKE2B a93217d4b3112b9c2761d7156de1359278b764bdfb3ba0942653e930e4cb60c00adf936fa1210668dc584c6e34fccfe405acdbabfff1927fd25b9de953b7 SHA512 699d09d747c3e56247b1d0a8dee0cd7c122199cc4296aa61753a4e52b4346ad5d98d608f953d28a5779e7d49f64be639e22c696ac82d48bbdaa7b743501b18e6 diff --git a/net-libs/libproxy/files/0.5.0-Guard-PxManager-test-with-pacrunner-duktape-option-2.patch b/net-libs/libproxy/files/0.5.0-Guard-PxManager-test-with-pacrunner-duktape-option-2.patch new file mode 100644 index ..6af2ebbe7f86 --- /dev/null +++ b/net-libs/libproxy/files/0.5.0-Guard-PxManager-test-with-pacrunner-duktape-option-2.patch @@ -0,0 +1,26 @@ +From f6aab7bc2a821117b2079f7504ab444dd13f4708 Mon Sep 17 00:00:00 2001 +From: Jan-Michael Brummer +Date: Tue, 16 May 2023 15:10:53 +0200 +Subject: [PATCH] Guard PxManager test with pacrunner-duktape option (#215) + +Fixes: https://github.com/libproxy/libproxy/issues/213 +--- + tests/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 4ae8e7d..c8fe11f 100644 +--- a/tests/meson.build b/tests/meson.build +@@ -17,7 +17,7 @@ if get_option('tests') +env: envs + ) + +- if soup_dep.found() ++ if soup_dep.found() and get_option('pacrunner-duktape') + px_manager_test = executable('test-px-manager', + ['px-manager-test.c', 'px-manager-helper.c'], + include_directories: px_backend_inc, +-- +2.39.3 + diff --git a/net-libs/libproxy/libproxy-0.5.0.ebuild b/net-libs/libproxy/libproxy-0.5.0.ebuild new file mode 100644 index ..19c04bc6750a --- /dev/null +++ b/net-libs/libproxy/libproxy-0.5.0.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson-multilib vala + +DESCRIPTION="Library for automatic proxy configuration management" +HOMEPAGE="https://github.com/libproxy/libproxy"; +SRC_URI="https://github.com/libproxy/libproxy/archive/refs/tags/${P}.tar.gz"; + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="duktape gnome gtk-doc +introspection kde test vala" +REQUIRED_USE=" + gtk-doc? ( introspection ) + vala? ( introspection ) +" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + >=dev-libs/glib-2.71.3:2[${MULTILIB_USEDEP}] + gnome? ( gnome-base/gsettings-desktop-schemas ) + duktape? ( + dev-lang/duktape:= + net-misc/curl + ) +" +DEPEND="${COMMON_DEPEND} + test? ( net-libs/libsoup:3.0[${MULTILIB_USEDEP}] ) +" +RDEPEND="${COMMON_DEPEND} + kde? ( kde-frameworks/kconfig:5 ) +" +BDEPEND=" + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +S="${WORKDIR}/${PN}-${P}" + +PATCHES=( + "${FILESDIR}"/${PV}-Guard-PxManager-test-with-pacrunner-duktape-option-2.patch +) + +src_prepare() { + use vala && vala_setup + default +} + +multilib_src_configure() { + local emesonargs=( + $(meson_native_use_bool gtk-doc docs) + $(meson_use test tests) + -Dconfig-env=true + $(meson_use gnome config-gnome) + -Dconfig-windows=false + -Dconfig-sysconfig=true + -Dconfig-osx=false + $(meson_use kde config-kde) + $(meson_native_use_bool duktape pacrunner-duktape) + $(meson_native_use_bool vala vapi) + $(meson_use duktape curl) + $(meson_native_use_bool introspection) + ) + meson_src_configure +} + +multilib_src_ins
[gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/, net-libs/libproxy/files/
commit: 6633430d22c6a5049c8a2709b914d09efdb55453 Author: Sam James gentoo org> AuthorDate: Thu Nov 24 03:12:44 2022 + Commit: Sam James gentoo org> CommitDate: Thu Nov 24 07:20:39 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6633430d net-libs/libproxy: drop 0.4.17-r1 Signed-off-by: Sam James gentoo.org> net-libs/libproxy/Manifest | 1 - .../files/libproxy-0.4.10-disable-pac-test.patch | 29 .../files/libproxy-0.4.16-avoid-nm-build-dep.patch | 87 -- .../libproxy/files/libproxy-0.4.17-mozjs.patch | 15 net-libs/libproxy/libproxy-0.4.17-r1.ebuild| 83 - 5 files changed, 215 deletions(-) diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest index 6d388cb8b367..a92c1f4d02d5 100644 --- a/net-libs/libproxy/Manifest +++ b/net-libs/libproxy/Manifest @@ -1,2 +1 @@ -DIST libproxy-0.4.17.tar.gz 95542 BLAKE2B 70b78c90aebb0ea308d105ec6d2c61bb54dea36df2d99db835f29c6ffa91168c15e73e01823b799a37fa89a9cb6fca51013ea057006b608fa2a79f4056a5d3c5 SHA512 589045538a78dc7453335ed61c60adad3352b840b224885d4a58ae284e52224ae3ff2eebd77df57aebbc3ae75d7b6d69a825f24f01c19e75bf0a3345dce53126 DIST libproxy-0.4.18.tar.gz 98037 BLAKE2B 12505cc7afe9ca27bb387df31d7368ed3ac83696255e6bd8fdbca1528fb6fe83510cdf7c6bda09939dcb55daefba24cf9c52435f664c6cba01daad87ddff3f2a SHA512 1148d688a9f070273a1a2b110a788561789799089660292bbba59fbf0a9caf7d28cb039a9ccdcb935f752e1e34739b2d2f4c784b1bb3bbaa03d108e7b38a4754 diff --git a/net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch b/net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch deleted file mode 100644 index 91658574134e.. --- a/net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5a1a8d2b920006e54d9de971999b443073f50843 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Tue, 16 Oct 2012 03:30:50 -0400 -Subject: [PATCH] Disable PAC test - -get-pac-test freezes when run from the ebuild, but succeeds when -building manually. Using Xemake/virtualx.eclass doesn't seem to help. - libproxy/test/CMakeLists.txt | 7 --- - 1 file changed, 7 deletions(-) - -diff --git a/libproxy/test/CMakeLists.txt b/libproxy/test/CMakeLists.txt -index 8894425..69543a4 100644 a/libproxy/test/CMakeLists.txt -+++ b/libproxy/test/CMakeLists.txt -@@ -17,10 +17,3 @@ if(WIN32) - target_link_libraries(url-encode ws2_32) - endif() - add_test(NAME url-encode COMMAND ${CMAKE_CURRENT_BINARY_DIR}/url-encode) -- --# Get PAC --if (NOT WIN32) --add_executable(get-pac-test ${CMAKE_CURRENT_SOURCE_DIR}/get-pac-test.cpp ${PROJECT_SOURCE_DIR}/url.cpp) --target_link_libraries(get-pac-test pthread) --add_test(NAME get-pac-test COMMAND ${CMAKE_CURRENT_BINARY_DIR}/get-pac-test) --endif() --- -1.7.12.3 - diff --git a/net-libs/libproxy/files/libproxy-0.4.16-avoid-nm-build-dep.patch b/net-libs/libproxy/files/libproxy-0.4.16-avoid-nm-build-dep.patch deleted file mode 100644 index a50bcc130cc7.. --- a/net-libs/libproxy/files/libproxy-0.4.16-avoid-nm-build-dep.patch +++ /dev/null @@ -1,87 +0,0 @@ -https://github.com/libproxy/libproxy/issues/28 - -From 703ac16ea2b508dc16d433b3fd597fcd496d05c1 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Mon, 29 Apr 2013 23:02:25 -0400 -Subject: [PATCH] Avoid build-time dependency on NetworkManager - -Needed to prevent a dependency loop: -nm -> libsoup -> glib-networking -> libproxy -> nm - -https://bugs.gentoo.org/467696 - -* ast...@gentoo.org: Rebased on top of 0.4.15 - also revert 423801295921ab1ec0d98565fcbc2635088d45da -* s...@gentoo.org: Rebased on top of 0.4.16 - (same revert included) - libproxy/cmake/modules.cmk| 6 ++--- - .../cmake/modules/network_networkmanager.cmk | 5 +--- - libproxy/modules/network_networkmanager.cpp | 23 ++- - 3 files changed, 21 insertions(+), 13 deletions(-) - -diff --git a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk -index 11d2d43..cc2b58f 100644 a/libproxy/cmake/modules.cmk -+++ b/libproxy/cmake/modules.cmk -@@ -40,10 +40,10 @@ px_module(config_w32reg"${WIN32}"1) - px_module(ignore_domain1 1) - px_module(ignore_hostname 1 1) - px_module(ignore_ip1 1) --if(NM_FOUND OR NMold_FOUND) -+if(NM_FOUND) - set(NM_BUILD 1) --endif(NM_FOUND OR NMold_FOUND) --px_module(network_networkmanager "${NM_BUILD}" 0 ${NM_LIBRARIES}${NMold_LIBRARIES}) -+endif(NM_FOUND) -+px_module(network_networkmanager "${NM_BUILD}" 0 ${NM_LIBRARIES}) - px_module(pacrunner_mozjs 0 ${BIPR} ${MOZJS_LIBRARIES}) - px_module(pacrunner_natus "${NATUS_FOUND}" ${BIPR} ${NATUS_LIBRARIES}) - px_module(pacrunner_webkit "${WEBKIT_FOUND}" ${BIPR} ${WEBKIT_LIBRARIES}) -diff --git a/libproxy/cmake/modules/ne
[gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/, net-libs/libproxy/files/
commit: 64b8854267134d2539c6b66d793a25fc2157a085 Author: Matt Turner gentoo org> AuthorDate: Tue Jun 21 04:13:04 2022 + Commit: Matt Turner gentoo org> CommitDate: Tue Jun 21 04:40:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64b88542 net-libs/libproxy: Version bump to 0.4.18 * Add IUSE=duktape (bug #842714) * Fix IUSE=webkit (broken by commit 0fdbf838a0ef 5.5 years ago) * Drop libproxy-0.4.10-disable-pac-test.patch; test seems to pass now Closes: https://bugs.gentoo.org/842714 Signed-off-by: Matt Turner gentoo.org> net-libs/libproxy/Manifest | 1 + ...proxy-0.4.18-Fix-building-without-duktape.patch | 33 .../files/libproxy-0.4.18-avoid-nm-build-dep.patch | 90 ++ net-libs/libproxy/libproxy-0.4.18.ebuild | 84 net-libs/libproxy/metadata.xml | 1 + 5 files changed, 209 insertions(+) diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest index 58615016c9cb..6d388cb8b367 100644 --- a/net-libs/libproxy/Manifest +++ b/net-libs/libproxy/Manifest @@ -1 +1,2 @@ DIST libproxy-0.4.17.tar.gz 95542 BLAKE2B 70b78c90aebb0ea308d105ec6d2c61bb54dea36df2d99db835f29c6ffa91168c15e73e01823b799a37fa89a9cb6fca51013ea057006b608fa2a79f4056a5d3c5 SHA512 589045538a78dc7453335ed61c60adad3352b840b224885d4a58ae284e52224ae3ff2eebd77df57aebbc3ae75d7b6d69a825f24f01c19e75bf0a3345dce53126 +DIST libproxy-0.4.18.tar.gz 98037 BLAKE2B 12505cc7afe9ca27bb387df31d7368ed3ac83696255e6bd8fdbca1528fb6fe83510cdf7c6bda09939dcb55daefba24cf9c52435f664c6cba01daad87ddff3f2a SHA512 1148d688a9f070273a1a2b110a788561789799089660292bbba59fbf0a9caf7d28cb039a9ccdcb935f752e1e34739b2d2f4c784b1bb3bbaa03d108e7b38a4754 diff --git a/net-libs/libproxy/files/libproxy-0.4.18-Fix-building-without-duktape.patch b/net-libs/libproxy/files/libproxy-0.4.18-Fix-building-without-duktape.patch new file mode 100644 index ..dd834687553a --- /dev/null +++ b/net-libs/libproxy/files/libproxy-0.4.18-Fix-building-without-duktape.patch @@ -0,0 +1,33 @@ +https://github.com/libproxy/libproxy/pull/180 + +From 54a08b73f4a9bc43356dd50fe91942b4270bfe10 Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Tue, 21 Jun 2022 00:08:57 -0400 +Subject: [PATCH] Fix building without duktape + +Otherwise configuring fails with + +CMake Error at libproxy/cmake/modules.cmk:26 (math): + math cannot parse the expression: "0+0+0+": syntax error, unexpected end of + file (6). +Call Stack (most recent call first): + libproxy/CMakeLists.txt:14 (include) +--- + libproxy/cmake/modules/pacrunner_duktape.cmk | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libproxy/cmake/modules/pacrunner_duktape.cmk b/libproxy/cmake/modules/pacrunner_duktape.cmk +index e7918a8..a468125 100644 +--- a/libproxy/cmake/modules/pacrunner_duktape.cmk b/libproxy/cmake/modules/pacrunner_duktape.cmk +@@ -17,5 +17,7 @@ else() + link_directories(${DUKTAPE_LIBRARIES}) + link_libraries(duktape) + endif() ++ else() ++set(DUKTAPE_FOUND 0) + endif() + endif() +-- +2.35.1 + diff --git a/net-libs/libproxy/files/libproxy-0.4.18-avoid-nm-build-dep.patch b/net-libs/libproxy/files/libproxy-0.4.18-avoid-nm-build-dep.patch new file mode 100644 index ..d62eac9af879 --- /dev/null +++ b/net-libs/libproxy/files/libproxy-0.4.18-avoid-nm-build-dep.patch @@ -0,0 +1,90 @@ +From f0ae8a0022a18fb26dff0ace0608d1916c68d179 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Mon, 29 Apr 2013 23:02:25 -0400 +Subject: [PATCH] Avoid build-time dependency on NetworkManager + +Needed to prevent a dependency loop: +nm -> libsoup -> glib-networking -> libproxy -> nm + +https://bugs.gentoo.org/467696 + +* ast...@gentoo.org: Rebased on top of 0.4.15 + also revert 423801295921ab1ec0d98565fcbc2635088d45da +* s...@gentoo.org: Rebased on top of 0.4.16 + (same revert included) +* matts...@gentoo.org: Rebased on top of 0.4.18 + (same revert included) +--- + libproxy/cmake/modules.cmk| 6 ++--- + .../cmake/modules/network_networkmanager.cmk | 5 +--- + libproxy/modules/network_networkmanager.cpp | 23 ++- + 3 files changed, 21 insertions(+), 13 deletions(-) + +diff --git a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk +index 6eaaa01..0afce2f 100644 +--- a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk +@@ -43,10 +43,10 @@ px_module(config_w32reg"${WIN32}"1) + px_module(ignore_domain1 1) + px_module(ignore_hostname 1 1) + px_module(ignore_ip1 1) +-if(NM_FOUND OR NMold_FOUND) ++if(NM_FOUND) + set(NM_BUILD 1) +-endif(NM_FOUND OR NMold_FOUND) +-px_module(network_networkmanager "${NM_BUILD}" 0 ${NM_LIBRARIES}${NMold_LIBRARIES}) ++endif(NM_FOUND) ++px_module(network_networkmanager "${NM_BUILD}" 0 ${NM_LIBRARIES}) + px_module(pacrunner_moz
[gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/, net-libs/libproxy/files/
commit: a41f166f29ca3995195e2e3179cc868a18cf8310 Author: Jakov Smolić gentoo org> AuthorDate: Fri Mar 25 19:55:05 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Thu Apr 21 16:35:14 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a41f166f net-libs/libproxy: Enable mozjs detection Closes: https://bugs.gentoo.org/811858 Signed-off-by: Jakov Smolić gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/24750 Signed-off-by: Jakov Smolić gentoo.org> net-libs/libproxy/files/libproxy-0.4.17-mozjs.patch | 15 +++ .../{libproxy-0.4.17.ebuild => libproxy-0.4.17-r1.ebuild} | 5 - 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/net-libs/libproxy/files/libproxy-0.4.17-mozjs.patch b/net-libs/libproxy/files/libproxy-0.4.17-mozjs.patch new file mode 100644 index ..cf31c77ae53f --- /dev/null +++ b/net-libs/libproxy/files/libproxy-0.4.17-mozjs.patch @@ -0,0 +1,15 @@ +Enable mozjs detection. +Backported from https://github.com/libproxy/libproxy/commit/66b30ef388a45f66f9b118d51cc76b53fdb8bbf4 +Bug: https://bugs.gentoo.org/811858 + +--- a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk +@@ -44,7 +44,7 @@ if(NM_FOUND) + set(NM_BUILD 1) + endif(NM_FOUND) + px_module(network_networkmanager "${NM_BUILD}" 0 ${NM_LIBRARIES}) +-px_module(pacrunner_mozjs 0 ${BIPR} ${MOZJS_LIBRARIES}) ++px_module(pacrunner_mozjs "${MOZJS_FOUND}" ${BIPR} ${MOZJS_LIBRARIES}) + px_module(pacrunner_natus "${NATUS_FOUND}" ${BIPR} ${NATUS_LIBRARIES}) + px_module(pacrunner_webkit "${WEBKIT_FOUND}" ${BIPR} ${WEBKIT_LIBRARIES}) + px_module(wpad_dns_alias 1 1) diff --git a/net-libs/libproxy/libproxy-0.4.17.ebuild b/net-libs/libproxy/libproxy-0.4.17-r1.ebuild similarity index 95% rename from net-libs/libproxy/libproxy-0.4.17.ebuild rename to net-libs/libproxy/libproxy-0.4.17-r1.ebuild index 4777e3c49fcd..0f5687d4a18a 100644 --- a/net-libs/libproxy/libproxy-0.4.17.ebuild +++ b/net-libs/libproxy/libproxy-0.4.17-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -44,6 +44,9 @@ PATCHES=( # prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696 # https://github.com/libproxy/libproxy/issues/28 "${FILESDIR}/${PN}-0.4.16-avoid-nm-build-dep.patch" + + # enable mozjs detection, bug #811858 + "${FILESDIR}/${PN}-0.4.17-mozjs.patch" ) multilib_src_configure() {
[gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/, net-libs/libproxy/files/
commit: 010d992874cfb87e8f32d610f4ea18f1a169eb13 Author: John Helmert III posteo net> AuthorDate: Thu Dec 31 18:15:34 2020 + Commit: Sam James gentoo org> CommitDate: Fri Jan 1 00:21:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=010d9928 net-libs/libproxy: security cleanup (drop <0.4.16) Bug: https://bugs.gentoo.org/741538 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: John Helmert III posteo.net> Closes: https://github.com/gentoo/gentoo/pull/18889 Signed-off-by: Sam James gentoo.org> net-libs/libproxy/Manifest | 1 - .../libproxy/files/libproxy-0.4.15-gcc-11.patch| 118 - .../files/libproxy-0.4.15-mozjs-52-1.patch | 101 -- .../files/libproxy-0.4.15-mozjs-52-2.patch | 23 .../files/libproxy-0.4.15-python-3.7.patch | 23 net-libs/libproxy/libproxy-0.4.15-r1.ebuild| 85 --- net-libs/libproxy/libproxy-0.4.15-r2.ebuild| 86 --- 7 files changed, 437 deletions(-) diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest index fbf9cd36718..42ddcd2569f 100644 --- a/net-libs/libproxy/Manifest +++ b/net-libs/libproxy/Manifest @@ -1,3 +1,2 @@ -DIST libproxy-0.4.15.tar.gz 93084 BLAKE2B 9aa86403eaf4e1791958013c2739e251c61f11da40e66b3296b33a7f380828895f621175add5efb3cd17222ff016941801c25c2d70c19ef3a6652510268a0b3d SHA512 8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b DIST libproxy-0.4.16.tar.gz 95534 BLAKE2B 163f4fa359758a2186802683005b7d2bbd68933d2512f2c4a284912b6d07e3aa288613e3b473d1bd8d9fe941033da634490c78367692a489da31184dd4dc3cb8 SHA512 28bca7c86e486d08ddc1699e562dd98366b569ec9a7a965f7d15d265ede508575e6eae43abde1778f46d55c3304d32218d891d01ba6a8c360820412748ed5ca1 DIST libproxy-0.4.17.tar.gz 95542 BLAKE2B 70b78c90aebb0ea308d105ec6d2c61bb54dea36df2d99db835f29c6ffa91168c15e73e01823b799a37fa89a9cb6fca51013ea057006b608fa2a79f4056a5d3c5 SHA512 589045538a78dc7453335ed61c60adad3352b840b224885d4a58ae284e52224ae3ff2eebd77df57aebbc3ae75d7b6d69a825f24f01c19e75bf0a3345dce53126 diff --git a/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch b/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch deleted file mode 100644 index 2d40a6c1600..000 --- a/net-libs/libproxy/files/libproxy-0.4.15-gcc-11.patch +++ /dev/null @@ -1,118 +0,0 @@ -https://bugs.gentoo.org/732700 -https://github.com/libproxy/libproxy/issues/127 - a/libproxy/extension_config.hpp -+++ b/libproxy/extension_config.hpp -@@ -31,7 +31,7 @@ using namespace libmodman; - class DLL_PUBLIC config_extension : public extension { - public: - // Abstract methods -- virtual vector get_config(const url &dst) throw (runtime_error)=0; -+ virtual vector get_config(const url &dst)=0; - - // Virtual methods - virtual string get_ignore(const url &dst); a/libproxy/extension_pacrunner.cpp -+++ b/libproxy/extension_pacrunner.cpp -@@ -30,7 +30,7 @@ pacrunner_extension::~pacrunner_extension() { - if (this->pr) delete this->pr; - } - --pacrunner* pacrunner_extension::get(string pac, const url& pacurl) throw (bad_alloc) { -+pacrunner* pacrunner_extension::get(string pac, const url& pacurl) { - if (this->pr) { - if (this->last == pac) - return this->pr; a/libproxy/extension_pacrunner.hpp -+++ b/libproxy/extension_pacrunner.hpp -@@ -26,7 +26,7 @@ - #define PX_PACRUNNER_MODULE_EZ(name, symb, smod) \ - class name ## _pacrunner_extension : public pacrunner_extension { \ - protected: \ -- virtual pacrunner* create(string pac, const url& pacurl) throw (bad_alloc) { \ -+ virtual pacrunner* create(string pac, const url& pacurl) { \ - return new name ## _pacrunner(pac, pacurl); \ - } \ - }; \ -@@ -41,13 +41,13 @@ class DLL_PUBLIC pacrunner { - public: - pacrunner(string pac, const url& pacurl); - virtual ~pacrunner() {}; -- virtual string run(const url& url) throw (bad_alloc)=0; -+ virtual string run(const url& url)=0; - }; - - class DLL_PUBLIC pacrunner_extension : public extension { - public: - // Virtual methods -- virtual pacrunner* get(string pac, const url& pacurl) throw (bad_alloc); -+ virtual pacrunner* get(string pac, const url& pacurl); - virtual ~pacrunner_extension(); - - // Final methods -@@ -55,7 +55,7 @@ public: - - protected: - // Abstract methods -- virtual pacrunner* create(string pac, const url& pacurl) throw (bad_alloc)=0; -+ virtual pacrunner* create(string pac, const url& pacurl)=0; - - private: - pacrunner* pr; a/libproxy/modules/config_envvar.cpp -+++ b/libproxy/modules/config_envvar.cpp -@@ -24,7 +24,7 @@ using namespace libproxy; - - class envvar_config_extension : public config_ex
[gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/, net-libs/libproxy/files/
commit: 94919576bc66fd8a8de264b075de7aecc7b39ab7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 29 09:02:01 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 30 08:01:56 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94919576 net-libs/libproxy: Drop 0.4.13-r2 Package-Manager: Portage-2.3.96, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> net-libs/libproxy/Manifest | 1 - .../files/libproxy-0.4.11-avoid-nm-build-dep.patch | 60 -- .../libproxy/files/libproxy-0.4.12-mozjs.pc.patch | 23 -- .../libproxy/files/libproxy-0.4.13-cmake-37.patch | 27 --- net-libs/libproxy/libproxy-0.4.13-r2.ebuild| 94 -- 5 files changed, 205 deletions(-) diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest index 1e6520ca0b2..a35afe3e315 100644 --- a/net-libs/libproxy/Manifest +++ b/net-libs/libproxy/Manifest @@ -1,2 +1 @@ -DIST libproxy-0.4.13.tar.gz 89296 BLAKE2B 05e1c6a56e562a9fc8c8123bead6f3a264589f97895079f3d90cd0edd03d980c9b2bb0a4a3c2d2c2aa553e0ed0450863bd74236c00d94b9c42930efe9c37bff1 SHA512 babbe5e9326cb2bfdf4504662533b314f72c3475687f8b57c235614698cb18e0ed31752b834cb1d33cc94ecd3af6589684b2846e73830f0be3557c465a1f1c42 DIST libproxy-0.4.15.tar.gz 93084 BLAKE2B 9aa86403eaf4e1791958013c2739e251c61f11da40e66b3296b33a7f380828895f621175add5efb3cd17222ff016941801c25c2d70c19ef3a6652510268a0b3d SHA512 8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b diff --git a/net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch b/net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch deleted file mode 100644 index 59e368b696e..000 --- a/net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 518214ee85e10c5bc99d3b115ae7ac9cc3fc14fc Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Mon, 29 Apr 2013 23:02:25 -0400 -Subject: [PATCH] Avoid build-time dependency on NetworkManager - -Needed to prevent a dependency loop: -nm -> libsoup -> glib-networking -> libproxy -> nm - -https://bugs.gentoo.org/467696 - libproxy/cmake/modules/network_networkmanager.cmk | 4 ++-- - libproxy/modules/network_networkmanager.cpp | 21 - - 2 files changed, 22 insertions(+), 3 deletions(-) - -diff --git a/libproxy/cmake/modules/network_networkmanager.cmk b/libproxy/cmake/modules/network_networkmanager.cmk -index d9f9588..2586bbd 100644 a/libproxy/cmake/modules/network_networkmanager.cmk -+++ b/libproxy/cmake/modules/network_networkmanager.cmk -@@ -1,3 +1,3 @@ - if (NOT WIN32 AND NOT APPLE) -- px_check_modules(NM NetworkManager dbus-1) --endif() -\ No newline at end of file -+ px_check_modules(NM dbus-1) -+endif() -diff --git a/libproxy/modules/network_networkmanager.cpp b/libproxy/modules/network_networkmanager.cpp -index 564c275..a03425b 100644 a/libproxy/modules/network_networkmanager.cpp -+++ b/libproxy/modules/network_networkmanager.cpp -@@ -23,7 +23,26 @@ - using namespace libproxy; - - #include --#include -+ -+ -+/* -+ * copy-pasted from NetworkManager-0.9.6.4's NetworkManager.h to prevent -+ * a circular dependency; https://bugs.gentoo.org/467696 -+ */ -+#define NM_DBUS_PATH "/org/freedesktop/NetworkManager" -+#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager" -+typedef enum { -+ NM_STATE_UNKNOWN = 0, -+ NM_STATE_ASLEEP = 10, -+ NM_STATE_DISCONNECTED = 20, -+ NM_STATE_DISCONNECTING= 30, -+ NM_STATE_CONNECTING = 40, -+ NM_STATE_CONNECTED_LOCAL = 50, -+ NM_STATE_CONNECTED_SITE = 60, -+ NM_STATE_CONNECTED_GLOBAL = 70 -+} NMState; -+#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL -+ - - class networkmanager_network_extension : public network_extension { - public: --- -1.8.2.1 - diff --git a/net-libs/libproxy/files/libproxy-0.4.12-mozjs.pc.patch b/net-libs/libproxy/files/libproxy-0.4.12-mozjs.pc.patch deleted file mode 100644 index bf69fc31d93..000 --- a/net-libs/libproxy/files/libproxy-0.4.12-mozjs.pc.patch +++ /dev/null @@ -1,23 +0,0 @@ a/libproxy/cmake/modules/pacrunner_mozjs.cmk 2011-06-20 04:31:41.0 -0600 -+++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk 2013-03-24 19:20:17.910765954 -0600 -@@ -9,12 +9,18 @@ - elseif(NOT APPLE) - option(WITH_MOZJS "Search for MOZJS package" ON) - if (WITH_MOZJS) --pkg_search_module(MOZJS mozjs185) -+pkg_search_module(MOZJS mozjs187) - if(MOZJS_FOUND) - include_directories(${MOZJS_INCLUDE_DIRS}) - link_directories(${MOZJS_LIBRARY_DIRS}) - else() -- set(MOZJS_FOUND 0) -+ pkg_search_module(MOZJS mozjs185) -+ if(MOZJS_FOUND) -+include_directories(${MOZJS_INCLUDE_DIRS}) -+link_directorie
[gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/, net-libs/libproxy/files/
commit: e0d494609a4d9212c5894c8959ae81347945cc52 Author: Michael Palimaka gentoo org> AuthorDate: Thu Feb 23 10:10:27 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Feb 23 10:10:37 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0d49460 net-libs/libproxy: backport patch from upstream solving build failure with USE="mono" Gentoo-bug: 600254 Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../libproxy/files/libproxy-0.4.13-cmake-37.patch | 27 ++ net-libs/libproxy/libproxy-0.4.13-r2.ebuild| 3 +++ 2 files changed, 30 insertions(+) diff --git a/net-libs/libproxy/files/libproxy-0.4.13-cmake-37.patch b/net-libs/libproxy/files/libproxy-0.4.13-cmake-37.patch new file mode 100644 index 00..d96879a7cb --- /dev/null +++ b/net-libs/libproxy/files/libproxy-0.4.13-cmake-37.patch @@ -0,0 +1,27 @@ +From 72bda7188408bd3c2491ea664da294cc483220bc Mon Sep 17 00:00:00 2001 +From: Andrey Rakhmatullin +Date: Sun, 20 Nov 2016 18:40:49 +0500 +Subject: [PATCH] Set CMP0054 CMake policy to NEW. + +CMake 3.7 exports a "t" variable for all projects and because of that +the elseif statement in cmake/CMakeCSharpInformation.cmake:311 works +incorrectly if CMP0054 is not set to NEW (as "t" is expanded to the +variable value). +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5313787..451e7a6 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 2.6) + if(POLICY CMP0011) +cmake_policy(SET CMP0011 NEW) + endif(POLICY CMP0011) ++if(POLICY CMP0054) ++ cmake_policy(SET CMP0054 NEW) ++endif(POLICY CMP0054) + + # Make sure we look in our cmake folder for additional definitions + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake ) diff --git a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild index 725f7d5c08..a5f0d30071 100644 --- a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild +++ b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild @@ -55,6 +55,9 @@ PATCHES=( # https://github.com/libproxy/libproxy/issues/27 "${FILESDIR}/${PN}-0.4.12-macosx.patch" + + # bug 600254 + "${FILESDIR}/${P}-cmake-37.patch" ) multilib_src_configure() {
[gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/, net-libs/libproxy/files/
commit: 69362244e4a27aac1dcaf952e42f2bfac778a23e Author: Pacho Ramos gentoo org> AuthorDate: Fri Feb 10 18:46:27 2017 + Commit: Pacho Ramos gentoo org> CommitDate: Fri Feb 10 18:47:02 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69362244 net-libs/libproxy: Drop old Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-libs/libproxy/Manifest | 1 - .../libproxy/files/libproxy-0.4.11-macosx.patch| 86 .../libproxy/files/libproxy-0.4.11-mozjs.pc.patch | 23 -- net-libs/libproxy/libproxy-0.4.11-r2.ebuild| 94 -- 4 files changed, 204 deletions(-) diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest index ef970e3876..e7803f596c 100644 --- a/net-libs/libproxy/Manifest +++ b/net-libs/libproxy/Manifest @@ -1,2 +1 @@ -DIST libproxy-0.4.11.tar.gz 93757 SHA256 dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe4821864b SHA512 563a837946a73c41e0773cec93332c6308245c0b807a40a0fb052c2445deae4a117ba2780a350c799717fd11c4dbe410183a38ea050a4f04db0b1adcb6f9ad98 WHIRLPOOL 2165fcb9a43592e1112539ff7fdd79963fc6c00821edb5d5f04d92d7d1bd884362019a2a2cd12cb412dfaee25ad8e1554a568e9818910861000666bfe81ca479 DIST libproxy-0.4.13.tar.gz 89296 SHA256 d610bc0ef81a18ba418d759c5f4f87bf7102229a9153fb397d7d490987330ffd SHA512 babbe5e9326cb2bfdf4504662533b314f72c3475687f8b57c235614698cb18e0ed31752b834cb1d33cc94ecd3af6589684b2846e73830f0be3557c465a1f1c42 WHIRLPOOL 1b159efd7e03505c8fd7098a553ba22099cf90002730c3a6c929dbfecb95af3c175aebb93502e4286c66604f75a01d4205cd311144a97f51d425ef69f4345370 diff --git a/net-libs/libproxy/files/libproxy-0.4.11-macosx.patch b/net-libs/libproxy/files/libproxy-0.4.11-macosx.patch deleted file mode 100644 index 09558e3c4d..00 --- a/net-libs/libproxy/files/libproxy-0.4.11-macosx.patch +++ /dev/null @@ -1,86 +0,0 @@ -https://trac.macports.org/browser/trunk/dports/net/libproxy/files/patch-libproxy-cmake.diff - -diff -ur libproxy/cmake.orig/libproxy.cmk libproxy/cmake/libproxy.cmk libproxy/cmake.orig/libproxy.cmk 2012-10-02 07:20:40.0 -0700 -+++ libproxy/cmake/libproxy.cmk2012-10-19 13:47:50.0 -0700 -@@ -18,7 +18,7 @@ - set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp - PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES}) - # When changing the SOVERSION here remember to also bump the 'favorite proxy .so' in python bindings. --set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1) -+set_target_properties(libproxy PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" PREFIX "" VERSION 1.0.0 SOVERSION 1) - set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "") - install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR}) - install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR}) -diff -ur libproxy/cmake.orig/modules/config_envvar.cmk libproxy/cmake/modules/config_envvar.cmk libproxy/cmake.orig/modules/config_envvar.cmk 2010-06-14 10:40:47.0 -0700 -+++ libproxy/cmake/modules/config_envvar.cmk 2012-10-19 13:45:42.0 -0700 -@@ -1,3 +1,3 @@ --if (NOT WIN32 AND NOT APPLE) -+if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) - set(ENVVAR_FOUND 1) --endif() -\ No newline at end of file -+endif() -diff -ur libproxy/cmake.orig/modules/config_gnome.cmk libproxy/cmake/modules/config_gnome.cmk libproxy/cmake.orig/modules/config_gnome.cmk 2012-10-02 07:20:40.0 -0700 -+++ libproxy/cmake/modules/config_gnome.cmk2012-10-19 13:45:42.0 -0700 -@@ -1,4 +1,4 @@ --if (NOT WIN32 AND NOT APPLE) -+if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) - option(WITH_GNOME2 "Target a GNOME 2 system (gconf)" OFF) - option(WITH_GNOME3 "Target a GNOME 3 system (gsettings)" ON) - if(WITH_GNOME3) -diff -ur libproxy/cmake.orig/modules/config_kde4.cmk libproxy/cmake/modules/config_kde4.cmk libproxy/cmake.orig/modules/config_kde4.cmk2010-06-14 10:40:47.0 -0700 -+++ libproxy/cmake/modules/config_kde4.cmk 2012-10-19 13:45:42.0 -0700 -@@ -1,4 +1,4 @@ --if (NOT WIN32 AND NOT APPLE) -+if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) - option(WITH_KDE4 "Search for KDE4 package" ON) - if (WITH_KDE4) - find_package(KDE4) -@@ -16,4 +16,4 @@ - else() - set(KDE4_FOUND 0) - endif() --endif() -\ No newline at end of file -+endif() -diff -ur libproxy/cmake.orig/modules/config_macosx.cmk libproxy/cmake/modules/config_macosx.cmk libproxy/cmake.orig/modules/config_macosx.cmk 2010-06-14 10:40:47.0 -0700 -+++ libproxy/cmake/modules/config_macosx.cmk 2012-10-19 13:45:42.0 -0700 -@@ -1,4 +1,4 @@ --if(APPLE) -+if(APPLE AND MP_MACOSX) - find_library(SC_LIBRARIES SystemConfiguration) - find_library(CF_LIBRARIES CoreFoundation) - if(SC_LIBRARIES) -@@ -7,4 +7,4 @@ - if(CF_LIBRARIES) - set(CF_FOUND 1) - endif() --endif() -\ No newli
[gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/, net-libs/libproxy/files/
commit: d7675df85cdc0851c7ce306290677afb08b8dcbe Author: Jan Chren gmail com> AuthorDate: Thu Apr 28 20:55:05 2016 + Commit: Jason Zaman gentoo org> CommitDate: Sun May 8 04:19:32 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7675df8 net-libs/libproxy: update patches Patches were simply ported from 0.4.11. .../libproxy/files/libproxy-0.4.12-macosx.patch| 70 ++ .../libproxy/files/libproxy-0.4.12-mozjs.pc.patch | 23 +++ net-libs/libproxy/libproxy-0.4.13.ebuild | 18 +++--- 3 files changed, 102 insertions(+), 9 deletions(-) diff --git a/net-libs/libproxy/files/libproxy-0.4.12-macosx.patch b/net-libs/libproxy/files/libproxy-0.4.12-macosx.patch new file mode 100644 index 000..052e6b0 --- /dev/null +++ b/net-libs/libproxy/files/libproxy-0.4.12-macosx.patch @@ -0,0 +1,70 @@ +https://trac.macports.org/browser/trunk/dports/net/libproxy/files/patch-libproxy-cmake.diff + +diff -ur libproxy/cmake.orig/libproxy.cmk libproxy/cmake/libproxy.cmk +--- a/libproxy/cmake/libproxy.cmk 2012-10-02 07:20:40.0 -0700 b/libproxy/cmake/libproxy.cmk 2012-10-19 13:47:50.0 -0700 +@@ -18,7 +18,7 @@ + set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp + PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES}) + # When changing the SOVERSION here remember to also bump the 'favorite proxy .so' in python bindings. +-set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1) ++set_target_properties(libproxy PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" PREFIX "" VERSION 1.0.0 SOVERSION 1) + set_target_properties(libproxy PROPERTIES INTERFACE_LINK_LIBRARIES "") + set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "") + install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR}) +diff -ur libproxy/cmake.orig/modules/config_envvar.cmk libproxy/cmake/modules/config_envvar.cmk +--- libproxy/cmake.orig/modules/config_envvar.cmk 2010-06-14 10:40:47.0 -0700 b/libproxy/cmake/modules/config_envvar.cmk 2012-10-19 13:45:42.0 -0700 +@@ -1,3 +1,3 @@ +-if (NOT WIN32 AND NOT APPLE) ++if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) + set(ENVVAR_FOUND 1) +-endif() +\ No newline at end of file ++endif() +diff -ur libproxy/cmake.orig/modules/config_gnome.cmk libproxy/cmake/modules/config_gnome.cmk +--- libproxy/cmake.orig/modules/config_gnome.cmk 2012-10-02 07:20:40.0 -0700 b/libproxy/cmake/modules/config_gnome.cmk 2012-10-19 13:45:42.0 -0700 +@@ -1,4 +1,4 @@ +-if (NOT WIN32 AND NOT APPLE) ++if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) + option(WITH_GNOME2 "Target a GNOME 2 system (gconf)" OFF) + option(WITH_GNOME3 "Target a GNOME 3 system (gsettings)" ON) + if(WITH_GNOME3) +diff -ur libproxy/cmake.orig/modules/config_macosx.cmk libproxy/cmake/modules/config_macosx.cmk +--- libproxy/cmake.orig/modules/config_macosx.cmk 2010-06-14 10:40:47.0 -0700 b/libproxy/cmake/modules/config_macosx.cmk 2012-10-19 13:45:42.0 -0700 +@@ -1,4 +1,4 @@ +-if(APPLE) ++if(APPLE AND MP_MACOSX) + find_library(SC_LIBRARIES SystemConfiguration) + find_library(CF_LIBRARIES CoreFoundation) + if(SC_LIBRARIES) +@@ -7,4 +7,4 @@ + if(CF_LIBRARIES) + set(CF_FOUND 1) + endif() +-endif() +\ No newline at end of file ++endif() +diff -ur libproxy/cmake.orig/modules/pacrunner_webkit.cmk libproxy/cmake/modules/pacrunner_webkit.cmk +--- libproxy/cmake.orig/modules/pacrunner_webkit.cmk 2012-10-02 07:20:40.0 -0700 b/libproxy/cmake/modules/pacrunner_webkit.cmk 2012-10-19 13:45:42.0 -0700 +@@ -6,7 +6,7 @@ + link_directories(WEBKIT_LIBRARIES) + include_directories("${WEBKIT_INCLUDE_DIR}") + endif() +-elseif(APPLE) ++elseif(APPLE AND MP_MACOSX) + find_library(WEBKIT_LIBRARIES JavaScriptCore) + if(WEBKIT_LIBRARIES) + set(WEBKIT_FOUND 1) +diff -ur libproxy/cmake.orig/pkgconfig.cmk libproxy/cmake/pkgconfig.cmk +--- libproxy/cmake.orig/pkgconfig.cmk 2012-10-02 07:20:40.0 -0700 b/libproxy/cmake/pkgconfig.cmk 2012-10-19 13:45:42.0 -0700 +@@ -1,4 +1,4 @@ +-if(NOT WIN32 AND NOT APPLE) ++if(NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) + find_package(PkgConfig) + + # Define our magical px_check_modules function diff --git a/net-libs/libproxy/files/libproxy-0.4.12-mozjs.pc.patch b/net-libs/libproxy/files/libproxy-0.4.12-mozjs.pc.patch new file mode 100644 index 000..bf69fc3 --- /dev/null +++ b/net-libs/libproxy/files/libproxy-0.4.12-mozjs.pc.patch @@ -0,0 +1,23 @@ +--- a/libproxy/cmake/modules/pacrunner_mozjs.cmk 2011-06-20 04:31:41.0 -0600 b/libproxy/cmake/modules/pacrunner_mozjs.cmk 2013-03-24 19:20:17.910765954 -0600 +@@ -9,12 +9,18 @@ + elseif(NOT APPLE) + option(WITH_MOZJS "Search for MOZJS package" ON) + if (WITH_MOZJS) +-pkg_search_module(MOZJS mozjs185) ++
[gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/, net-libs/libproxy/files/
commit: 31f7b8ba966287ef92361d2e59193e58dcc6adca Author: Jan Chren gmail com> AuthorDate: Thu Apr 28 22:55:08 2016 + Commit: Jason Zaman gentoo org> CommitDate: Sun May 8 04:19:54 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31f7b8ba net-libs/libproxy: add manpage for `proxy` command Manpage fetched from Debian and updated. net-libs/libproxy/files/proxy.1 | 23 +++ net-libs/libproxy/libproxy-0.4.13.ebuild | 2 ++ 2 files changed, 25 insertions(+) diff --git a/net-libs/libproxy/files/proxy.1 b/net-libs/libproxy/files/proxy.1 new file mode 100644 index 000..7111db8 --- /dev/null +++ b/net-libs/libproxy/files/proxy.1 @@ -0,0 +1,23 @@ +.TH PROXY "1" "April 2016" "libproxy" "User Commands" +.SH NAME +proxy \- Display the proxy server that should be used to reach a given a network resource +.SH SYNOPSIS +proxy +.SH DESCRIPTION +Display the proxy server that should be used to reach a given a network resource. +.PP +libproxy is a library that provides automatic proxy configuration management +using different backends. +.SH EXAMPLE +.B echo http://www.example.com/ | proxy + http://webcache:3128 direct:// +.SH AUTHOR +This manual page was written by +.MT bi...@debian.org +Laurent Bigonville +.ME , +for the Debian GNU/Linux system (but may be used by others). +.SH SEE ALSO +.UR https://libproxy.github.io/libproxy/ +libproxy +.UE . diff --git a/net-libs/libproxy/libproxy-0.4.13.ebuild b/net-libs/libproxy/libproxy-0.4.13.ebuild index 480025a..7e3b1e2 100644 --- a/net-libs/libproxy/libproxy-0.4.13.ebuild +++ b/net-libs/libproxy/libproxy-0.4.13.ebuild @@ -87,5 +87,7 @@ src_configure() { } multilib_src_install_all() { + doman "${FILESDIR}/proxy.1" + use python && python_foreach_impl python_domodule 'bindings/python/libproxy.py' }