summaryrefslogtreecommitdiff
path: root/net-libs/libproxy
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-05-12 16:42:50 +0300
committerV3n3RiX <venerix@koprulu.sector>2022-05-12 16:42:50 +0300
commit752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree330d16e6362a49cbed8875a777fe641a43376cd3 /net-libs/libproxy
parent0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
gentoo resync : 12.05.2022
Diffstat (limited to 'net-libs/libproxy')
-rw-r--r--net-libs/libproxy/Manifest3
-rw-r--r--net-libs/libproxy/files/libproxy-0.4.17-mozjs.patch15
-rw-r--r--net-libs/libproxy/libproxy-0.4.17-r1.ebuild (renamed from net-libs/libproxy/libproxy-0.4.17.ebuild)5
3 files changed, 21 insertions, 2 deletions
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 0a5433adf125..762a0204c0e4 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,7 +1,8 @@
AUX libproxy-0.4.10-disable-pac-test.patch 1017 BLAKE2B f8f7b2e48f587725539cdb126a15fa2e6c2602bc270144236bb7279f9fda9a505a487f569fe7170733e8e6b7e78b8e1fa6892c0ff0be9b3937e9f96f7318bdbf SHA512 a0fa6520c60489675176ca7d5d750d0f54e020592743a3437c184939314b71be68803a7f1cb8cb584fb7ad6ee884c85bfb7905d4bb3e0536d535e990981e9ba9
AUX libproxy-0.4.12-macosx.patch 3387 BLAKE2B 6c16cc9bd73255c106413708db7f88a6391ffbc4617461edf8fdbe6bf6bfe8ce194f7770e25c5eeeeacd14302aaf76f0c8a30793277d459b118bed838f81d1c6 SHA512 bb815f33745fe1304139f5da2502d157f049ce896ebc2dd5a62c012877c9a3e6bf850a47438a919a910f27ef49c20f9666a3da5a7386641d3250e58f481c2753
AUX libproxy-0.4.16-avoid-nm-build-dep.patch 3555 BLAKE2B 3df682dcacb157a1913d53a3358da5c4200de894270d38df4aa29997979b5e284e0207eed53db9c39ea85a528a037c832c44eb7167e433781d862b75ad0d47bf SHA512 a83dde4a161c96e2c059c88e5ae54d20f9348d583d43c94c5dbc5cb53887d75c845937a43f6597544a82c4162bba2ae8ed433ec6229504ddedf33ce146585683
+AUX libproxy-0.4.17-mozjs.patch 760 BLAKE2B df245777cd3b9a1d4c6ea30a691b64fde5fdb5dfd52246ed1356041a036e0c883c0f2388b86f56d892e67697a1e3a8fdde050a26480bb1e3962a77e599fa3e7f SHA512 54f1371bf74531d427114aa6d194f2ed2c9ec6288f14315b4adfa50a0d7722e948429f949b647fdf49cf47fb53c05bf3d45070d261330a83c4eb15b58e8309db
AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
DIST libproxy-0.4.17.tar.gz 95542 BLAKE2B 70b78c90aebb0ea308d105ec6d2c61bb54dea36df2d99db835f29c6ffa91168c15e73e01823b799a37fa89a9cb6fca51013ea057006b608fa2a79f4056a5d3c5 SHA512 589045538a78dc7453335ed61c60adad3352b840b224885d4a58ae284e52224ae3ff2eebd77df57aebbc3ae75d7b6d69a825f24f01c19e75bf0a3345dce53126
-EBUILD libproxy-0.4.17.ebuild 2562 BLAKE2B bb4b1f48c3b14b28252d1777b943ab98ee8ee8d72719d0479c919f2e021d88cf7b0b1b1bd3fc55e6d85c2029288af1cb570438b1957dd3c1cacd852ce16c214c SHA512 64f9b4e0e626af7d475ca819e427a872f43913e94ad572b5887796c2ace9d7b1225303eb076a3a1ec31499482e0167d0b0f367a7d430e989e8d5d2b3ef7328fd
+EBUILD libproxy-0.4.17-r1.ebuild 2642 BLAKE2B 952fe62637e6c5af5ca2cc1ecbecd66f021241874d5fb833a7d2da26c66b9a0723071eff46345fbba6c1cb54bb7eaa5fb3d2ac1b63dbeab1ff055d76c85bcaa0 SHA512 a515b773a896a365af5a57c837b32c9c746b1e9cd0f408841c0f461dc2f7b04e08e66f55a87a1ba24708c23fa56c235bd87101e26a74ab3a5fc63bcf77e71d2f
MISC metadata.xml 692 BLAKE2B e196c11c6fa73bb33410d3eed6a526de85b6d15c56b28b648a32928175ebbceb6cfcca7879dfb23335281a6ace24d571c3726954601d11232ce6a967793318fc SHA512 5d986af4a2e3b887654da557b3466f0b7e3b98a66bbfe7029e24fcd17c4e10d044afd8386e99d0aabe221b79961c68de4c0a8632e4827ac94f6e2da04bd15d07
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 000000000000..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
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() {