From 914cc1d7fea82acfd7e41d9d5d6afafb08133cfb Mon Sep 17 00:00:00 2001 From: Beat Gaetzi Date: Fri, 30 Sep 2011 15:07:49 +0000 Subject: - Update to 7.0.1 - Fix system-wide plugin directory detection as Firefox 7 no longer uses run-mozilla.sh to start an therefore our patch to set MOZ_PLUGIN_PATH is useless. [1] Submitted by: poyopoyo AT puripuri.plala.or.jp [1] --- www/firefox/Makefile | 6 +++--- www/firefox/distinfo | 4 ++-- .../files/patch-xpcom-io-nsAppFileLocationProvider.cpp | 11 +++++++++++ 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 www/firefox/files/patch-xpcom-io-nsAppFileLocationProvider.cpp (limited to 'www/firefox') diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 0c88f8687ab6..32f3f1b13fb5 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -6,8 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 7.0 -PORTREVISION= 1 +DISTVERSION= 7.0.1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -117,7 +116,8 @@ post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/security/manager/ssl/src/Makefile.in \ ${WRKSRC}/js/src/config/mkdepend/Makefile.in \ - ${WRKSRC}/js/src/config/config.mk + ${WRKSRC}/js/src/config/config.mk \ + ${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g ; \ s|echo aout|echo elf|g ; \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 92cad936e0f1..7026e9397537 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,2 +1,2 @@ -SHA256 (firefox-7.0.source.tar.bz2) = 82d46cff57d9cae41f8d3b764808d8348a8d8c65b189f2591aa721d6346deaba -SIZE (firefox-7.0.source.tar.bz2) = 69282568 +SHA256 (firefox-7.0.1.source.tar.bz2) = 81ecf63fca67186094d49dd5a6fe7f5dbd143a39f872ad126de38f246334fc04 +SIZE (firefox-7.0.1.source.tar.bz2) = 69278554 diff --git a/www/firefox/files/patch-xpcom-io-nsAppFileLocationProvider.cpp b/www/firefox/files/patch-xpcom-io-nsAppFileLocationProvider.cpp new file mode 100644 index 000000000000..c16124abefa0 --- /dev/null +++ b/www/firefox/files/patch-xpcom-io-nsAppFileLocationProvider.cpp @@ -0,0 +1,11 @@ +--- xpcom/io/nsAppFileLocationProvider.cpp.orig 2011-09-30 15:52:07.000000000 +0200 ++++ xpcom/io/nsAppFileLocationProvider.cpp 2011-09-30 15:52:40.000000000 +0200 +@@ -238,7 +238,7 @@ + #if defined(HAVE_USR_LIB64_DIR) && defined(__LP64__) + "/usr/lib64/mozilla/plugins"; + #else +- "/usr/lib/mozilla/plugins"; ++ "%%LOCALBASE%%/lib/npapi/symlinks/firefox"; + #endif + rv = NS_NewNativeLocalFile(nsDependentCString(sysLPlgDir), + PR_FALSE, getter_AddRefs(localFile)); -- cgit v1.2.3