diff options
Diffstat (limited to 'net-libs/libproxy/files')
4 files changed, 0 insertions, 216 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 deleted file mode 100644 index 052e6b0a7fe8..000000000000 --- 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.000000000 -0700 -+++ b/libproxy/cmake/libproxy.cmk 2012-10-19 13:47:50.000000000 -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.000000000 -0700 -+++ b/libproxy/cmake/modules/config_envvar.cmk 2012-10-19 13:45:42.000000000 -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.000000000 -0700 -+++ b/libproxy/cmake/modules/config_gnome.cmk 2012-10-19 13:45:42.000000000 -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.000000000 -0700 -+++ b/libproxy/cmake/modules/config_macosx.cmk 2012-10-19 13:45:42.000000000 -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.000000000 -0700 -+++ b/libproxy/cmake/modules/pacrunner_webkit.cmk 2012-10-19 13:45:42.000000000 -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.000000000 -0700 -+++ b/libproxy/cmake/pkgconfig.cmk 2012-10-19 13:45:42.000000000 -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.18-Fix-building-without-duktape.patch b/net-libs/libproxy/files/libproxy-0.4.18-Fix-building-without-duktape.patch deleted file mode 100644 index dd834687553a..000000000000 --- a/net-libs/libproxy/files/libproxy-0.4.18-Fix-building-without-duktape.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://github.com/libproxy/libproxy/pull/180 - -From 54a08b73f4a9bc43356dd50fe91942b4270bfe10 Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -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 deleted file mode 100644 index d62eac9af879..000000000000 --- a/net-libs/libproxy/files/libproxy-0.4.18-avoid-nm-build-dep.patch +++ /dev/null @@ -1,90 +0,0 @@ -From f0ae8a0022a18fb26dff0ace0608d1916c68d179 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -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 - -* asturm@gentoo.org: Rebased on top of 0.4.15 - also revert 423801295921ab1ec0d98565fcbc2635088d45da -* sam@gentoo.org: Rebased on top of 0.4.16 - (same revert included) -* mattst88@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_domain 1 1) - px_module(ignore_hostname 1 1) - px_module(ignore_ip 1 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 "${MOZJS_FOUND}" ${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/network_networkmanager.cmk b/libproxy/cmake/modules/network_networkmanager.cmk -index 6ef6ead..2586bbd 100644 ---- a/libproxy/cmake/modules/network_networkmanager.cmk -+++ b/libproxy/cmake/modules/network_networkmanager.cmk -@@ -1,6 +1,3 @@ - if (NOT WIN32 AND NOT APPLE) -- px_check_modules(NM libnm dbus-1) -- if (NOT NM_FOUND) -- px_check_modules(NMold NetworkManager dbus-1) -- endif (NOT NM_FOUND) -+ px_check_modules(NM dbus-1) - endif() -diff --git a/libproxy/modules/network_networkmanager.cpp b/libproxy/modules/network_networkmanager.cpp -index 546a8ee..317f1ab 100644 ---- a/libproxy/modules/network_networkmanager.cpp -+++ b/libproxy/modules/network_networkmanager.cpp -@@ -23,13 +23,24 @@ - using namespace libproxy; - - #include <dbus/dbus.h> --#include <NetworkManager.h> - --// Backwards compatibility: with the switch to libnm, NM_STATE_CONNECTED is no --// longer defined. NM_STATE_CONNECTED_GLOBAL appeared with NM 0.9 and was aliased --#ifndef NM_STATE_CONNECTED -- #define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL --#endif -+/* -+ * copy-pasted from NetworkManager-1.26.0'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: --- -2.35.1 - diff --git a/net-libs/libproxy/files/proxy.1 b/net-libs/libproxy/files/proxy.1 deleted file mode 100644 index 7111db864943..000000000000 --- a/net-libs/libproxy/files/proxy.1 +++ /dev/null @@ -1,23 +0,0 @@ -.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 bigon@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 . |