diff options
author | ryoon <ryoon> | 2012-03-10 03:08:24 +0000 |
---|---|---|
committer | ryoon <ryoon> | 2012-03-10 03:08:24 +0000 |
commit | 0d04f0d0c4a95a9df6369a5242e7f07506b74ce6 (patch) | |
tree | de5aacd00a57148b72a44222fb922212f76bbe60 /devel | |
parent | d86c6e9f39b4c3a6c364cf0f0c3a7d34f7929a36 (diff) | |
download | pkgsrc-0d04f0d0c4a95a9df6369a5242e7f07506b74ce6.tar.gz |
* Fix Firefox's official branding bug by upstream.
* Fix for inclusion from mail/thunderbird and www/seamonkey (mozilla-common.mk).
No functional change for devel/xulrunner.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/xulrunner/Makefile | 5 | ||||
-rw-r--r-- | devel/xulrunner/distinfo | 3 | ||||
-rw-r--r-- | devel/xulrunner/mozilla-common.mk | 5 | ||||
-rw-r--r-- | devel/xulrunner/patches/patch-browser_confvars.sh | 11 |
4 files changed, 18 insertions, 6 deletions
diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile index f46192012c5..f00a849690a 100644 --- a/devel/xulrunner/Makefile +++ b/devel/xulrunner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2012/03/06 12:34:08 ryoon Exp $ +# $NetBSD: Makefile,v 1.67 2012/03/10 03:08:24 ryoon Exp $ .include "dist.mk" PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR} @@ -27,6 +27,9 @@ ALL_ENV+= MOZILLA_PKG_NAME=xulrunner MAKE_ENV+= FREEBL_NO_DEPEND=0 +# workround for link of xulrunner-bin etc. +LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/xulrunner + .include "mozilla-common.mk" .include "options.mk" diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo index 03a7bdf82ef..8ef2b25c69d 100644 --- a/devel/xulrunner/distinfo +++ b/devel/xulrunner/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.59 2012/03/06 12:34:08 ryoon Exp $ +$NetBSD: distinfo,v 1.60 2012/03/10 03:08:25 ryoon Exp $ SHA1 (firefox-10.0.2.source.tar.bz2) = d9b459d915d4638a48b3e249fcbaf7cafc27e834 RMD160 (firefox-10.0.2.source.tar.bz2) = 50c45cf2d561290ecfdfeea3fefae22cbae9ce85 @@ -30,6 +30,7 @@ SHA1 (patch-bd) = e09718d6492739a66dc5e21d3ed2cc1a404acd30 SHA1 (patch-bf) = ef6d6ccbbfee2c72aef76c70695b202e346c5038 SHA1 (patch-bg) = 85d82348c43257eded6426ac84af9815619eb759 SHA1 (patch-bi) = b190a1c338550b70b65c02f29639338708295075 +SHA1 (patch-browser_confvars.sh) = 32dfbd761946779105eda40b748a6a7f77f3f673 SHA1 (patch-build_autoconf_gcc-pr49911.m4) = 252dbdf1c319e17455b5225254281b656dbb397b SHA1 (patch-build_autoconf_nss.m4) = 2cd3f2d824273fe58c1a1f0a4b05605430ed3471 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = b4ce48ef10635feef8ac48017e03737f4a259d95 diff --git a/devel/xulrunner/mozilla-common.mk b/devel/xulrunner/mozilla-common.mk index 750f5d89a33..88b59371a07 100644 --- a/devel/xulrunner/mozilla-common.mk +++ b/devel/xulrunner/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.30 2012/03/06 12:34:08 ryoon Exp $ +# $NetBSD: mozilla-common.mk,v 1.31 2012/03/10 03:08:25 ryoon Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -55,9 +55,6 @@ CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub -# workround for link of xulrunner-bin etc. -LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/xulrunner - PYTHON_FOR_BUILD_ONLY= yes .include "../../lang/python/application.mk" CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} diff --git a/devel/xulrunner/patches/patch-browser_confvars.sh b/devel/xulrunner/patches/patch-browser_confvars.sh new file mode 100644 index 00000000000..b8dc1493484 --- /dev/null +++ b/devel/xulrunner/patches/patch-browser_confvars.sh @@ -0,0 +1,11 @@ +$NetBSD: patch-browser_confvars.sh,v 1.1 2012/03/10 03:08:25 ryoon Exp $ + +--- browser/confvars.sh.orig 2012-02-16 06:40:24.000000000 +0000 ++++ browser/confvars.sh +@@ -49,5 +49,5 @@ MOZ_EXTENSIONS_DEFAULT=" gnomevfs" + # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh + # Changing either of these values requires a clobber to ensure correct results, + # because branding dependencies are broken. +-MOZ_BRANDING_DIRECTORY=browser/branding/official ++MOZ_BRANDING_DIRECTORY=browser/branding/aurora + MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official |