diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-10-24 22:18:03 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-10-24 22:18:03 +0000 |
| commit | 2334c0d0c06e490c4eb3bcc601c77b74fcc8332f (patch) | |
| tree | 0b1c48f66733a83a05b8985dfb62a35fdec22d75 /www/libproxy | |
| parent | c5216557390c7e4f00c60b283c486d42ba9d48a8 (diff) | |
| download | pkgsrc-2334c0d0c06e490c4eb3bcc601c77b74fcc8332f.tar.gz | |
Apply upstream patch to fix build on OSX.
Diffstat (limited to 'www/libproxy')
| -rw-r--r-- | www/libproxy/distinfo | 3 | ||||
| -rw-r--r-- | www/libproxy/patches/patch-libproxy_modules_config__macosx.cpp | 26 |
2 files changed, 28 insertions, 1 deletions
diff --git a/www/libproxy/distinfo b/www/libproxy/distinfo index 0a6f3422d8b..f0e4c9c26c0 100644 --- a/www/libproxy/distinfo +++ b/www/libproxy/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.12 2013/05/24 18:31:49 wiz Exp $ +$NetBSD: distinfo,v 1.13 2013/10/24 22:18:03 jperkin Exp $ SHA1 (libproxy-0.4.11.tar.gz) = c037969434095bc65d29437e11a7c9e0293a5149 RMD160 (libproxy-0.4.11.tar.gz) = 382110e088faf7a170ac838864d675204d886237 Size (libproxy-0.4.11.tar.gz) = 93757 bytes SHA1 (patch-libproxy_CMakeLists.txt) = fc283f97eebf0ef0cfbd81341a7db311755ab2ec +SHA1 (patch-libproxy_modules_config__macosx.cpp) = 75ce7f0f6cc6df17d73ec12051621ec2ebe35ee6 diff --git a/www/libproxy/patches/patch-libproxy_modules_config__macosx.cpp b/www/libproxy/patches/patch-libproxy_modules_config__macosx.cpp new file mode 100644 index 00000000000..fa075b48653 --- /dev/null +++ b/www/libproxy/patches/patch-libproxy_modules_config__macosx.cpp @@ -0,0 +1,26 @@ +$NetBSD: patch-libproxy_modules_config__macosx.cpp,v 1.1 2013/10/24 22:18:03 jperkin Exp $ + +Patch from upstream to fix OSX build. + +--- libproxy/modules/config_macosx.cpp.orig 2012-07-05 16:50:06.000000000 +0000 ++++ libproxy/modules/config_macosx.cpp +@@ -114,7 +114,7 @@ static string capitalize(string str) { + + class macosx_config_extension : public config_extension { + public: +- vector<url> get_config(const url &url) throw (runtime_error) { ++ vector<url> get_config(const url &the_url) throw (runtime_error) { + string tmp; + CFDictionaryRef proxies = SCDynamicStoreCopyProxies(NULL); + vector<url> response; +@@ -136,8 +136,8 @@ public: + } + + // http:// or socks:// (TODO: gopher:// and rtsp:// ???) +- else if ((protocol_url(proxies, toupper(url.get_scheme()), tmp) && url::is_valid(tmp)) || +- (protocol_url(proxies, capitalize(url.get_scheme()), tmp) && url::is_valid(tmp)) || ++ else if ((protocol_url(proxies, toupper(the_url.get_scheme()), tmp) && url::is_valid(tmp)) || ++ (protocol_url(proxies, capitalize(the_url.get_scheme()), tmp) && url::is_valid(tmp)) || + (protocol_url(proxies, toupper("http"), tmp) && url::is_valid(tmp)) || + (protocol_url(proxies, toupper("socks"), tmp) && url::is_valid(tmp))) { + CFRelease(proxies); |