From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 30 01:36:23 2011 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 660D51065672 for ; Fri, 30 Sep 2011 01:36:23 +0000 (UTC) (envelope-from poyopoyo@puripuri.plala.or.jp) Received: from msa01b.plala.or.jp (msa01.plala.or.jp [58.93.240.1]) by mx1.freebsd.org (Postfix) with ESMTP id EB0A18FC12 for ; Fri, 30 Sep 2011 01:36:22 +0000 (UTC) Received: from i220-109-122-8.s02.a026.ap.plala.or.jp ([220.109.122.8]) by msa01b.plala.or.jp with ESMTP id <20110930013621.ECLI9116.msa01b.plala.or.jp@i220-109-122-8.s02.a026.ap.plala.or.jp>; Fri, 30 Sep 2011 10:36:21 +0900 Date: Fri, 30 Sep 2011 10:36:20 +0900 Message-ID: <864nzustez.wl%poyopoyo@puripuri.plala.or.jp> From: poyopoyo@puripuri.plala.or.jp To: Beat =?ISO-2022-JP-2?B?RxskKEQrIxsoQnR6aQ==?= In-Reply-To: <607E4945-B4C3-4613-8F9C-5E4E1BB52542@FreeBSD.org> References: <86aa9ps16l.wl%poyopoyo@puripuri.plala.or.jp> <607E4945-B4C3-4613-8F9C-5E4E1BB52542@FreeBSD.org> Mail-Followup-To: Beat =?ISO-2022-JP-2?B?RxskKEQrIxsoQnR6aQ==?= , poyopoyo@puripuri.plala.or.jp, gecko@FreeBSD.org User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?ISO-2022-JP-2?B?R29qGyQoRCtXGyhC?=) APEL/10.8 Emacs/23.3 (amd64-portbld-freebsd9.0) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=ISO-2022-JP-2 X-VirusScan: Outbound; msa01b; Fri, 30 Sep 2011 10:36:21 +0900 Cc: gecko@FreeBSD.org Subject: Re: firefox-7 and environment, startup script X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Sep 2011 01:36:23 -0000 At Thu, 29 Sep 2011 19:17:38 +0200, Beat G$(D+#(Btzi wrote: > Looks like this is caused by the startup improvements in Firefox 7: > https://bugzilla.mozilla.org/show_bug.cgi?id=552864 > > This makes our MOZ_PLUGIN_PATH patch to run-mozilla.sh useless > (see ports/www/firefox/files/patch-build_unix_run-mozilla.sh). Thanks. That lengthy discussion seems to be mainly about getting rid of LD_LIBRARY_PATH from startup script and not about other environments set in the script. As MOZ_PLUGIN_PATH was our hack, we should provide replacement of our plugins-out-of-the-box mechanism (searching ${LOCALBASE}/npapi/symlinks/firefox for plugins) at least because it stopped working now. perhaps sed -e 's|/usr/lib/mozilla/plugins|${LOCALBASE}/npapi/symlinks/firefox|' in xpcom/io/nsAppFileLocationProvider.cpp ? It seems this is THE MOZILLA WAY(TM) to provide system-wide default plugins directory. As we would never have /usr/lib/mozilla, no problem for us to embed ours, isn't it? There is a room of discussion for other archs than i386/amd64 but I confirmed this works on my 9-BETA2(pre-broken-socket)/amd64. -- kuro == fix our system-wide plugin directory detection. diff -urN ../local/firefox/Makefile firefox/Makefile --- ../local/firefox/Makefile 2011-09-29 01:19:48.000000000 +0900 +++ firefox/Makefile 2011-09-30 09:35:40.637038079 +0900 @@ -7,7 +7,7 @@ PORTNAME= firefox DISTVERSION= 7.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -117,7 +117,8 @@ @${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 -urN ../local/firefox/files/patch-xpcom-io-nsAppFileLocationProvider.cpp firefox/files/patch-xpcom-io-nsAppFileLocationProvider.cpp --- ../local/firefox/files/patch-xpcom-io-nsAppFileLocationProvider.cpp 1970-01-01 09:00:00.000000000 +0900 +++ firefox/files/patch-xpcom-io-nsAppFileLocationProvider.cpp 2011-09-30 10:21:23.147035632 +0900 @@ -0,0 +1,11 @@ +--- ./xpcom/io/nsAppFileLocationProvider.cpp.orig 2011-09-23 05:20:43.000000000 +0900 ++++ ./xpcom/io/nsAppFileLocationProvider.cpp 2011-09-30 09:05:57.027032294 +0900 +@@ -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));