diff options
| -rw-r--r-- | libraries/libproxy/README | 2 | ||||
| -rw-r--r-- | libraries/libproxy/libproxy.SlackBuild | 12 | ||||
| -rw-r--r-- | libraries/libproxy/libproxy.info | 8 | ||||
| -rw-r--r-- | libraries/libproxy/only_link_mozjs185.diff | 46 |
4 files changed, 58 insertions, 10 deletions
diff --git a/libraries/libproxy/README b/libraries/libproxy/README index 75ae88bd65..6fc94c753b 100644 --- a/libraries/libproxy/README +++ b/libraries/libproxy/README @@ -6,3 +6,5 @@ back to programming. GNOME? KDE? Command line? WPAD? PAC? Network changed? It doesn't matter! Just ask libproxy what proxy to use: you get simple code and your users get correct, consistant behavior and broad infrastructure compatibility. + +This requires mozjs185 and nspr. diff --git a/libraries/libproxy/libproxy.SlackBuild b/libraries/libproxy/libproxy.SlackBuild index b2f4b56ac3..8e440ef3d6 100644 --- a/libraries/libproxy/libproxy.SlackBuild +++ b/libraries/libproxy/libproxy.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libproxy -# Copyright 2009-2011 Robby Workman Northport, AL, USA +# Copyright 2009-2012 Robby Workman Northport, AL, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libproxy -VERSION=${VERSION:-0.4.6} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.4.7} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,9 +69,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# http://code.google.com/p/libproxy/source/detail?r=797 -# This patch brings the 4.6 (r753) code up to r797. -patch -p0 < $CWD/4.6-r797.patch +# 0.4.7 won't build against seamonkey's nss stuff, and the first commit in +# svn after that release disables its use in favor of nspr and js185 +patch -p0 < $CWD/only_link_mozjs185.diff cmake . \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ diff --git a/libraries/libproxy/libproxy.info b/libraries/libproxy/libproxy.info index 3e00d1b4db..4e6f5cd938 100644 --- a/libraries/libproxy/libproxy.info +++ b/libraries/libproxy/libproxy.info @@ -1,10 +1,10 @@ PRGNAM="libproxy" -VERSION="0.4.6" +VERSION="0.4.7" HOMEPAGE="http://code.google.com/p/libproxy/" -DOWNLOAD="http://libproxy.googlecode.com/files/libproxy-0.4.6.tar.gz" -MD5SUM="199c6b120baf1f7258a55f38d5ec74f5" +DOWNLOAD="http://libproxy.googlecode.com/files/libproxy-0.4.7.tar.gz" +MD5SUM="509e03a488a61cd62bfbaf3ab6a2a7a5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" -APPROVED="dsomero" +APPROVED="Erik Hanson" diff --git a/libraries/libproxy/only_link_mozjs185.diff b/libraries/libproxy/only_link_mozjs185.diff new file mode 100644 index 0000000000..84016ac80b --- /dev/null +++ b/libraries/libproxy/only_link_mozjs185.diff @@ -0,0 +1,46 @@ +Index: libproxy/cmake/modules/pacrunner_mozjs.cmk +=================================================================== +--- libproxy/cmake/modules/pacrunner_mozjs.cmk (revision 814) ++++ libproxy/cmake/modules/pacrunner_mozjs.cmk (revision 815) +@@ -7,19 +7,15 @@ + include_directories("${MOZJS_INCLUDE_DIR}") + endif() + elseif(NOT APPLE) +- set(MOZJS_SEARCH_ORDER "mozilla-js;xulrunner-js;firefox-js;seamonkey-js" CACHE STRING "MozJS search order") + option(WITH_MOZJS "Search for MOZJS package" ON) + if (WITH_MOZJS) +- foreach(MOZJSLIB ${MOZJS_SEARCH_ORDER}) +- pkg_search_module(MOZJS ${MOZJSLIB}>=2.0b12) +- if(MOZJS_FOUND) +- include_directories(${MOZJS_INCLUDE_DIRS}) +- link_directories(${MOZJS_LIBRARY_DIRS}) +- break() +- else() +- set(MOZJS_FOUND 0) +- endif() +- endforeach() ++ pkg_search_module(MOZJS mozjs185>=1.8.5) ++ if(MOZJS_FOUND) ++ include_directories(${MOZJS_INCLUDE_DIRS}) ++ link_directories(${MOZJS_LIBRARY_DIRS}) ++ else() ++ set(MOZJS_FOUND 0) ++ endif() + else() + set(MOZJS_FOUND 0) + endif() +Index: NEWS +=================================================================== +--- NEWS (revision 814) ++++ NEWS (revision 815) +@@ -1,3 +1,10 @@ ++New in version 0.4.8 (not yet released) ++============================== ++* Only support standalone mozjs185 as mozilla js engine. ++ xulrunner being part of the now lightning fast moving firefox ++ is impossible to be tracked as a dependency and it is not ++ supported by Mozilla to be used in this scenario. ++ + New in version 0.4.7 + ============================== + * Support/require xulrunner 2.0+ |