Date: Sat, 23 Jun 2012 13:59:11 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r795 - in branches/experimental: mail/thunderbird mail/thunderbird-beta mail/thunderbird-beta/files mail/thunderbird-esr mail/thunderbird-esr/files mail/thunderbird/files www/libxul www/libxul/files www/seamonkey www/seamonkey/files Message-ID: <201206231359.q5NDxBRQ058453@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Jun 23 13:59:11 2012
New Revision: 795
Log:
followup to r723: system-wide plugins for seamonkey, thunderbird, xulrunner-stub
Added:
branches/experimental/mail/thunderbird-beta/files/patch-mail-app-nsMailApp.cpp
- copied, changed from r794, branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp
branches/experimental/mail/thunderbird-esr/files/patch-mail-app-nsMailApp.cpp
- copied, changed from r794, branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp
branches/experimental/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp
- copied, changed from r794, branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp
branches/experimental/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp
branches/experimental/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp
- copied, changed from r794, branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp
Deleted:
branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp
Modified:
branches/experimental/mail/thunderbird-beta/Makefile
branches/experimental/mail/thunderbird-esr/Makefile
branches/experimental/mail/thunderbird/Makefile
branches/experimental/www/libxul/Makefile
branches/experimental/www/seamonkey/Makefile
Modified: branches/experimental/mail/thunderbird-beta/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-beta/Makefile Sat Jun 23 13:38:34 2012 (r794)
+++ branches/experimental/mail/thunderbird-beta/Makefile Sat Jun 23 13:59:11 2012 (r795)
@@ -127,7 +127,8 @@
${MOZSRC}/storage/build/Makefile.in \
${MOZSRC}/toolkit/library/Makefile.in \
${MOZSRC}/db/sqlite3/src/Makefile.in
- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/mail/app/nsMailApp.cpp \
${MOZSRC}/security/manager/ssl/src/Makefile.in \
${MOZSRC}/js/src/config/mkdepend/Makefile.in \
${MOZSRC}/js/src/config/config.mk
Copied and modified: branches/experimental/mail/thunderbird-beta/files/patch-mail-app-nsMailApp.cpp (from r794, branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp)
==============================================================================
--- branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp Sat Jun 23 13:38:34 2012 (r794, copy source)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mail-app-nsMailApp.cpp Sat Jun 23 13:59:11 2012 (r795)
@@ -1,6 +1,6 @@
---- browser/app/nsBrowserApp.cpp~
-+++ browser/app/nsBrowserApp.cpp
-@@ -197,6 +197,7 @@ int main(int argc, char* argv[])
+--- mail/app/nsMailApp.cpp~
++++ mail/app/nsMailApp.cpp
+@@ -154,6 +154,7 @@ int main(int argc, char* argv[])
TriggerQuirks();
#endif
Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 23 13:38:34 2012 (r794)
+++ branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 23 13:59:11 2012 (r795)
@@ -128,7 +128,8 @@
${MOZSRC}/storage/build/Makefile.in \
${MOZSRC}/toolkit/library/Makefile.in \
${MOZSRC}/db/sqlite3/src/Makefile.in
- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/mail/app/nsMailApp.cpp \
${MOZSRC}/security/manager/ssl/src/Makefile.in \
${MOZSRC}/js/src/config/mkdepend/Makefile.in \
${MOZSRC}/js/src/config/config.mk
Copied and modified: branches/experimental/mail/thunderbird-esr/files/patch-mail-app-nsMailApp.cpp (from r794, branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp)
==============================================================================
--- branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp Sat Jun 23 13:38:34 2012 (r794, copy source)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mail-app-nsMailApp.cpp Sat Jun 23 13:59:11 2012 (r795)
@@ -1,6 +1,6 @@
---- browser/app/nsBrowserApp.cpp~
-+++ browser/app/nsBrowserApp.cpp
-@@ -197,6 +197,7 @@ int main(int argc, char* argv[])
+--- mail/app/nsMailApp.cpp~
++++ mail/app/nsMailApp.cpp
+@@ -154,6 +154,7 @@ int main(int argc, char* argv[])
TriggerQuirks();
#endif
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Sat Jun 23 13:38:34 2012 (r794)
+++ branches/experimental/mail/thunderbird/Makefile Sat Jun 23 13:59:11 2012 (r795)
@@ -128,7 +128,8 @@
${MOZSRC}/storage/build/Makefile.in \
${MOZSRC}/toolkit/library/Makefile.in \
${MOZSRC}/db/sqlite3/src/Makefile.in
- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/mail/app/nsMailApp.cpp \
${MOZSRC}/security/manager/ssl/src/Makefile.in \
${MOZSRC}/js/src/config/mkdepend/Makefile.in \
${MOZSRC}/js/src/config/config.mk
Copied and modified: branches/experimental/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp (from r794, branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp)
==============================================================================
--- branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp Sat Jun 23 13:38:34 2012 (r794, copy source)
+++ branches/experimental/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp Sat Jun 23 13:59:11 2012 (r795)
@@ -1,6 +1,6 @@
---- browser/app/nsBrowserApp.cpp~
-+++ browser/app/nsBrowserApp.cpp
-@@ -197,6 +197,7 @@ int main(int argc, char* argv[])
+--- mail/app/nsMailApp.cpp~
++++ mail/app/nsMailApp.cpp
+@@ -154,6 +154,7 @@ int main(int argc, char* argv[])
TriggerQuirks();
#endif
Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile Sat Jun 23 13:38:34 2012 (r794)
+++ branches/experimental/www/libxul/Makefile Sat Jun 23 13:59:11 2012 (r795)
@@ -90,7 +90,7 @@
${WRKSRC}/toolkit/library/Makefile.in \
${WRKSRC}/db/sqlite3/src/Makefile.in
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/browser/app/nsBrowserApp.cpp \
+ ${WRKSRC}/xulrunner/stub/nsXULStub.cpp \
${WRKSRC}/js/src/config/mkdepend/Makefile.in \
${WRKSRC}/js/src/config/config.mk
Deleted: branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp
==============================================================================
--- branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp Sat Jun 23 13:59:11 2012 (r794)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- browser/app/nsBrowserApp.cpp~
-+++ browser/app/nsBrowserApp.cpp
-@@ -197,6 +197,7 @@ int main(int argc, char* argv[])
- TriggerQuirks();
- #endif
-
-+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox", 0);
- nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath);
- if (NS_FAILED(rv)) {
- Output("Couldn't calculate the application directory.\n");
Added: branches/experimental/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp Sat Jun 23 13:59:11 2012 (r795)
@@ -0,0 +1,11 @@
+--- xulrunner/stub/nsXULStub.cpp~
++++ xulrunner/stub/nsXULStub.cpp
+@@ -202,6 +202,8 @@ main(int argc, char **argv)
+ char greDir[MAXPATHLEN];
+ bool greFound = false;
+
++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox", 0);
++
+ #if defined(XP_MACOSX)
+ CFBundleRef appBundle = CFBundleGetMainBundle();
+ if (!appBundle)
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Sat Jun 23 13:38:34 2012 (r794)
+++ branches/experimental/www/seamonkey/Makefile Sat Jun 23 13:59:11 2012 (r795)
@@ -132,7 +132,8 @@
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/suite/app/nsSuiteApp.cpp \
${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \
${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in
${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
Copied and modified: branches/experimental/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp (from r794, branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp)
==============================================================================
--- branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp Sat Jun 23 13:38:34 2012 (r794, copy source)
+++ branches/experimental/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp Sat Jun 23 13:59:11 2012 (r795)
@@ -1,10 +1,11 @@
---- browser/app/nsBrowserApp.cpp~
-+++ browser/app/nsBrowserApp.cpp
-@@ -197,6 +197,7 @@ int main(int argc, char* argv[])
+--- suite/app/nsSuiteApp.cpp~
++++ suite/app/nsSuiteApp.cpp
+@@ -215,6 +215,8 @@ int main(int argc, char* argv[])
+ #ifdef XP_MACOSX
TriggerQuirks();
#endif
-
++
+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox", 0);
+
nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath);
if (NS_FAILED(rv)) {
- Output("Couldn't calculate the application directory.\n");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206231359.q5NDxBRQ058453>