--- mozilla.orig/xpcom/glue/standalone/Makefile.in +++ mozilla/xpcom/glue/standalone/Makefile.in @@ -96,7 +96,7 @@ # Force use of PIC FORCE_USE_PIC = 1 -GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX)) +GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) SRCS_IN_OBJDIR = 1 --- mozilla.orig/build/unix/Makefile.in +++ mozilla/build/unix/Makefile.in @@ -71,7 +71,7 @@ $(MOZ_APP_NAME)-js.pc $(MOZ_APP_NAME)-gtkmozembed.pc \ $(MOZ_APP_NAME)-nss.pc $(MOZ_APP_NAME)-plugin.pc -GARBAGE = $(pkg_config_files) mozilla-config +GARBAGE = $(pkg_config_files) $(MOZ_APP_NAME)-config $(MOZ_APP_NAME)-config:: mozilla-config.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk cat $< | sed \ --- mozilla.orig/configure.in +++ mozilla/configure.in @@ -559,10 +559,6 @@ AC_PATH_PROG(WHOAMI, whoami, :) AC_PATH_PROG(AUTOCONF, autoconf, :) AC_PATH_PROG(UNZIP, unzip, :) -AC_PATH_PROGS(ZIP, zip) -if test -z "$ZIP" || test "$ZIP" = ":"; then - AC_MSG_ERROR([zip not found in \$PATH]) -fi AC_PATH_PROG(SYSTEM_MAKEDEPEND, makedepend) AC_PATH_PROG(XARGS, xargs) if test -z "$XARGS" || test "$XARGS" = ":"; then @@ -827,17 +823,24 @@ OS_RELEASE= OS_TEST="${target_cpu}" case "${target_os}" in - linux*) OS_ARCH=Linux ;; + linux*) OS_ARCH=Linux OS_TARGET=Linux;; solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; mingw*) OS_ARCH=WINNT ;; wince*) OS_ARCH=WINCE ;; darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; esac else - OS_TARGET=`uname -s` - OS_ARCH=`uname -s | sed -e 's|/|_|g'` + OS_TARGET="${host_os}" + OS_ARCH=`echo $host_os | sed -e 's|/|_|g'` OS_RELEASE=`uname -r` - OS_TEST=`uname -m` + OS_TEST="${host_cpu}" + case "${host_os}" in + linux*) OS_ARCH=Linux OS_TARGET=Linux;; + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; + mingw*) OS_ARCH=WINNT ;; + wince*) OS_ARCH=WINCE ;; + darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; + esac fi _COMPILER_PREFIX= @@ -2650,8 +2652,7 @@ ]) if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \ "$ac_cv_have_visibility_class_bug" = "no"; then - VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' - WRAP_SYSTEM_INCLUDES=1 + VISIBILITY_FLAGS='-fvisibility=hidden' else VISIBILITY_FLAGS='-fvisibility=hidden' fi # have visibility pragma bug @@ -3783,7 +3784,7 @@ AC_CHECK_LIB(jpeg, jpeg_destroy_compress, [SYSTEM_JPEG=1 JPEG_LIBS="-ljpeg $JPEG_LIBS"], SYSTEM_JPEG=, $JPEG_LIBS) fi -if test "$SYSTEM_JPEG" = 1; then +if test "$SYSTEM_JPEG" = 0; then LIBS="$JPEG_LIBS $LIBS" AC_TRY_RUN( #include @@ -3828,7 +3829,7 @@ AC_CHECK_LIB(z, gzread, [SYSTEM_ZLIB=1 ZLIB_LIBS="-lz $ZLIB_LIBS"], [SYSTEM_ZLIB= ZLIB_CFLAGS= ZLIB_LIBS=], $ZLIB_LIBS) fi -if test "$SYSTEM_ZLIB" = 1; then +if test "$SYSTEM_ZLIB" = 0; then LIBS="$ZLIB_LIBS $LIBS" AC_TRY_RUN([ #include @@ -3881,7 +3882,7 @@ AC_CHECK_LIB(png, png_get_valid, [SYSTEM_PNG=1 PNG_LIBS="-lpng $PNG_LIBS"], SYSTEM_PNG=, $PNG_LIBS) fi -if test "$SYSTEM_PNG" = 1; then +if test "$SYSTEM_PNG" = 0; then LIBS="$PNG_LIBS $LIBS" AC_TRY_RUN( #include @@ -4311,7 +4325,7 @@ browser) MOZ_APP_NAME=firefox - MOZ_APP_DISPLAYNAME=BonEcho + MOZ_APP_DISPLAYNAME=Iceweasel MOZ_XUL_APP=1 MOZ_PHOENIX=1 MOZ_SAFE_BROWSING=1 @@ -6129,6 +6143,14 @@ AC_MSG_ERROR([--enable-chrome-format must be set to either jar, flat, both, or symlink]) fi +if test "$MOZ_CHROME_FILE_FORMAT" = "jar" || + test "$MOZ_CHROME_FILE_FORMAT" = "both"; then + AC_PATH_PROGS(ZIP, zip) + if test -z "$ZIP" || test "$ZIP" = ":"; then + AC_MSG_ERROR([zip not found in \$PATH]) + fi +fi + dnl ======================================================== dnl = Define default location for MOZILLA_FIVE_HOME dnl ======================================================== --- mozilla.orig/iceweasel.1 +++ mozilla/iceweasel.1 @@ -0,0 +1,165 @@ +.TH ICEWEASEL 1 "November 4, 2004" iceweasel "Linux User's Manual" +.SH NAME +iceweasel - a Web browser for X11 derived from the Mozilla browser + +.SH SYNOPSIS +.B iceweasel +[\fIOPTIONS\fR] [\fIURL\fR] + +.B /usr/lib/iceweasel/firefox\-bin +[\fIOPTIONS\fR] [\fIURL\fR] + +.SH DESCRIPTION +\fBIceweasel\fR is an open-source web browser, designed for +standards compliance, performance and portability. + +.SH USAGE +\fBiceweasel\fR is a simple shell script that will set up the +environment for the actual executable, \fBfirefox\-bin\fR. +If there is a Iceweasel browser already running, \fBiceweasel\fR will +arrange for it to create a new browser window; otherwise it will start +the Iceweasel application. + +.SH OPTIONS +A summary of the options supported by \fBiceweasel\fR is included below. + +.SS "GTK options" +\fB\-\-gdk\-debug=\fR\fIFLAGS\fR +Gdk debugging flags to set +.TP +\fB\-\-gdk\-no\-debug=\fR\fIFLAGS\fR +Gdk debugging flags to unset +.TP +\fB\-\-gtk\-debug=\fR\fIFLAGS\fR +Gtk+ debugging flags to set +.TP +\fB\-\-gtk\-no\-debug=\fR\fIFLAGS\fR +Gtk+ debugging flags to unset +.TP +\fB\-\-gtk\-module=\fR\fIMODULE\fR +Load an additional Gtk module + +.SS "X11 options" +.TP +.BI \-\-display= DISPLAY +X display to use +.TP +.B \-\-sync +Make X calls synchronous +.TP +.B \-\-no\-xshm +Don't use X shared memory extension +.TP +.BI \-\-xim\-preedit= STYLE +.TP +.BI \-\-xim\-status= STYLE +.TP +.B \-\-g\-fatal\-warnings +Make all warnings fatal + +.SS "Mozilla options" +.TP +\fB\-height\fR \fIvalue\fR +Set height of startup window to \fIvalue\fR pixels. +.TP +.B \-h, \-help +Show summary of options. +.TP +.B \-installer +Start with Mozilla 4.x migration window. +.TP +\fB\-width\fR \fIvalue\fR +Set width of startup window to \fIvalue\fR pixels. +.TP +.B \-v, \-version +Print Iceweasel version. +.TP +.B \-no\-remote +Don't connect to a running iceweasel instance. +.TP +\fB\-a\fR \fIapplication\-id\fR +Check for a running Iceweasel started with the specified +\fIapplication\-id\fR. When \fBiceweasel\fR is invoked for +the first time with a particular \fIapplication\-id\fR, a new Iceweasel +application is started; subsequent invocations of \fBiceweasel\fR +with the same \fIapplication\-id\fR will cause the already-running +Iceweasel to bring up a new window. + +The default is \fB\-a firefox\fR. +.TP +\fB\-CreateProfile\fR \fIprofile\fR +Create \fIprofile\fR. +Implies \fB\-a firefox\-\-\fR\fIprofile\fR, or \fB\-a default\fR +if \fIprofile\fR is \fBdefault\fR. +.TP +\fB\-P\fR \fIprofile\fR +Start with \fIprofile\fR. +Implies \fB\-a firefox\-\-\fR\fIprofile\fR, or \fB\-a default\fR +if \fIprofile\fR is \fBdefault\fR. +.TP +.B \-ProfileManager +Start with profile manager. +Implies \fB\-a\fR with a fresh unique \fIapplication\-id\fR. +.TP +\fB\-UILocale\fR \fIlocale\fR +Start with \fIlocale\fR resources as User Interface locale. By default, it is +guessed from environment and available locales for Iceweasel. +.TP +\fB\-contentLocale\fR \fIlocale\fR +Start with \fIlocale\fR resources as content locale. By default, it is +guessed from environment and available locales for Iceweasel. +.TP +\fB\-new-window\fR \fIURL\fR +Open \fIURL\fR in a new window in an already running Iceweasel process. +\fB\-new-tab\fR \fIURL\fR +Open \fIURL\fR in a new tab in an already running Iceweasel process. + +.TP +.B \-jsconsole +Start with Javascript Console +.TP +\fB\-chrome\fR \fIurl\fR +Load the specified chrome. +.TP +.B \-safe\-mode +Starts Iceweasel in safe mode, that is disabling all extensions and +showing a bit more debugging messages. + +.SS "Debugger options" +.TP +.B \-g, \-debug +Starts Iceweasel through a debugger (gdb by default). +.TP +\fB\-\-debugger\fR \fIprogram\fR +Use \fIprogram\fR as a debugger for Iceweasel. Implies \fB\-debug\fR. + +.SH ENVIRONMENT +\fIICEWEASEL_DSP\fR - configures the /dev/dsp wrapper to use. Accepted values +are "auto", "artsdsp", "esddsp", "aoss" or "none" (default). + +.SH FILES +\fI/usr/bin/iceweasel\fR - shell script wrapping +\fBfirefox\-bin\fR +.br + +\fI/usr/lib/iceweasel/firefox\-bin\fR - \fBiceweasel\fR +executable +.br + +\fI/etc/iceweasel/iceweaselrc\fR - file containing environment +variables to be passed to Iceweasel. +.br + +\fI${HOME}/.mozilla/firefox/rc\fR - file containing environment variables to +be passed to Iceweasel. Overrides \fI/etc/iceweasel/iceweaselrc\fR + +.SH BUGS +To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR + +.SH "SEE ALSO" +.BR mozilla(1) + +.SH AUTHORS +.TP +.B The Mozilla Organization +.I http://www.mozilla.org/about.html --- mozilla.orig/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties +++ mozilla/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties @@ -39,7 +39,7 @@ extensionsTitle=Extensions -globalItemList=The following items are available to all users. \nYou can start Firefox with -lock-item "{GUID}" to prevent users from uninstalling or disabling an item. To unlock an item, start Firefox with -unlock-item "{GUID}" +globalItemList=The following items are available to all users. \nYou can start Iceweasel with -lock-item "{GUID}" to prevent users from uninstalling or disabling an item. To unlock an item, start Iceweasel with -unlock-item "{GUID}" globalItemListExtensions=\n\nGlobally Available Extensions:\n==============================\n\n globalItemListThemes=\n\nGlobally Available Themes:\n==========================\n\n --- mozilla.orig/toolkit/xre/nsAppRunner.cpp +++ mozilla/toolkit/xre/nsAppRunner.cpp @@ -1019,14 +1019,14 @@ printf("%s-height %sSet height of startup window to .\n",HELP_SPACER_1,HELP_SPACER_2); printf("%s-h or -help%sPrint this message.\n",HELP_SPACER_1,HELP_SPACER_2); printf("%s-width %sSet width of startup window to .\n",HELP_SPACER_1,HELP_SPACER_2); - printf("%s-v or -version%sPrint %s version.\n",HELP_SPACER_1,HELP_SPACER_2, gAppData->name); + printf("%s-v or -version%sPrint %s version.\n",HELP_SPACER_1,HELP_SPACER_2, gAppData->displayName); printf("%s-P %sStart with .\n",HELP_SPACER_1,HELP_SPACER_2); printf("%s-ProfileManager%sStart with Profile Manager.\n",HELP_SPACER_1,HELP_SPACER_2); printf("%s-UILocale %sStart with resources as UI Locale.\n",HELP_SPACER_1,HELP_SPACER_2); printf("%s-contentLocale %sStart with resources as content Locale.\n",HELP_SPACER_1,HELP_SPACER_2); printf("%s-safe-mode%sDisables extensions and themes for this session.\n",HELP_SPACER_1,HELP_SPACER_2); #if defined(XP_WIN) || defined(XP_OS2) - printf("%s-console%sStart %s with a debugging console.\n",HELP_SPACER_1,HELP_SPACER_2,gAppData->name); + printf("%s-console%sStart %s with a debugging console.\n",HELP_SPACER_1,HELP_SPACER_2,gAppData->displayName); #endif // this works, but only after the components have registered. so if you drop in a new command line handler, -help @@ -1111,7 +1111,7 @@ static void DumpVersion() { - printf("%s %s %s, %s\n", gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version, gAppData->copyright); + printf("%s %s %s, %s\n", gAppData->vendor ? gAppData->vendor : "", gAppData->displayName, gAppData->version, gAppData->copyright); } #ifdef MOZ_ENABLE_XREMOTE @@ -1464,7 +1464,7 @@ sbs->CreateBundle(kProfileProperties, getter_AddRefs(sb)); NS_ENSURE_TRUE_LOG(sbs, NS_ERROR_FAILURE); - NS_ConvertUTF8toUTF16 appName(gAppData->name); + NS_ConvertUTF8toUTF16 appName(gAppData->displayName); const PRUnichar* params[] = {appName.get(), appName.get()}; nsXPIDLString killMessage; --- mozilla.orig/browser/components/nsBrowserGlue.js +++ mozilla/browser/components/nsBrowserGlue.js @@ -174,7 +174,7 @@ // component defined in this file -const kServiceName = "Firefox Browser Glue Service"; +const kServiceName = "Iceweasel Browser Glue Service"; const kServiceId = "{eab9012e-5f74-4cbc-b2b5-a590235513cc}"; const kServiceCtrId = "@mozilla.org/browser/browserglue;1"; const kServiceConstructor = BrowserGlue; --- mozilla.orig/browser/locales/en-US/chrome/overrides/appstrings.properties +++ mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties @@ -35,22 +35,22 @@ # ***** END LICENSE BLOCK ***** malformedURI=The URL is not valid and cannot be loaded. -fileNotFound=Firefox can't find the file at %S. -dnsNotFound=Firefox can't find the server at %S. -protocolNotFound=Firefox doesn't know how to open this address, because the protocol (%S) isn't associated with any program. -connectionFailure=Firefox can't establish a connection to the server at %S. +fileNotFound=Iceweasel can't find the file at %S. +dnsNotFound=Iceweasel can't find the server at %S. +protocolNotFound=Iceweasel doesn't know how to open this address, because the protocol (%S) isn't associated with any program. +connectionFailure=Iceweasel can't establish a connection to the server at %S. netInterrupt=The connection to %S was interrupted while the page was loading. netTimeout=The server at %S is taking too long to respond. -redirectLoop=Firefox has detected that the server is redirecting the request for this address in a way that will never complete. +redirectLoop=Iceweasel has detected that the server is redirecting the request for this address in a way that will never complete. repost=The page you are trying to view contains POSTDATA that has expired from cache. If you resend the data, any action the form carried out (such as a search or online purchase) will be repeated. To resend the data, click OK. Otherwise, click Cancel. repostConfirm=The page you are trying to view contains POSTDATA. If you resend the data, any action the form carried out (such as a search or online purchase) will be repeated. To resend the data, click OK. Otherwise, click Cancel. -unknownSocketType=Firefox doesn't know how to communicate with the server. +unknownSocketType=Iceweasel doesn't know how to communicate with the server. netReset=The connection to the server was reset while the page was loading. -netOffline=Firefox is currently in offline mode and can't browse the Web. +netOffline=Iceweasel is currently in offline mode and can't browse the Web. isprinting=The document cannot change while Printing or in Print Preview. -deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Firefox has canceled the request for your protection. -proxyResolveFailure=Firefox is configured to use a proxy server that can't be found. -proxyConnectFailure=Firefox is configured to use a proxy server that is refusing connections. +deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Iceweasel has canceled the request for your protection. +proxyResolveFailure=Iceweasel is configured to use a proxy server that can't be found. +proxyConnectFailure=Iceweasel is configured to use a proxy server that is refusing connections. externalProtocolTitle=External Protocol Request externalProtocolPrompt=An external application must be launched to handle %1$S: links.\n\n\nRequested link:\n\n%2$S\n\nApplication: %3$S\n\n\nIf you were not expecting this request it may be an attempt to exploit a weakness in that other program. Cancel this request unless you are sure it is not malicious.\n #LOCALIZATION NOTE (externalProtocolUnknown): The following string is shown if the application name can't be determined --- mozilla.orig/browser/locales/en-US/chrome/branding/brand.properties +++ mozilla/browser/locales/en-US/chrome/branding/brand.properties @@ -1,3 +1,3 @@ -brandShortName=Bon Echo -brandFullName=Bon Echo +brandShortName=Iceweasel +brandFullName=Iceweasel vendorShortName=Mozilla --- mozilla.orig/browser/locales/en-US/chrome/branding/brand.dtd +++ mozilla/browser/locales/en-US/chrome/branding/brand.dtd @@ -1,3 +1,3 @@ - - + + --- mozilla.orig/browser/locales/en-US/chrome/browser/preferences/advanced.dtd +++ mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd @@ -51,7 +51,7 @@ - + --- mozilla.orig/browser/locales/en-US/chrome/browser/credits.dtd +++ mozilla/browser/locales/en-US/chrome/browser/credits.dtd @@ -1,4 +1,4 @@ - + --- mozilla.orig/browser/locales/en-US/chrome/browser/aboutDialog.dtd +++ mozilla/browser/locales/en-US/chrome/browser/aboutDialog.dtd @@ -2,8 +2,5 @@ - + --- mozilla.orig/browser/locales/en-US/updater/updater.ini +++ mozilla/browser/locales/en-US/updater/updater.ini @@ -1,4 +1,4 @@ ; This file is in the UTF-8 encoding [Strings] Title=Software Update -Info=Firefox is installing your updates and will start in a few moments ... +Info=Iceweasel is installing your updates and will start in a few moments ... --- mozilla.orig/browser/locales/en-US/searchplugins/google.xml +++ mozilla/browser/locales/en-US/searchplugins/google.xml @@ -3,7 +3,7 @@ Google Search UTF-8 data:image/x-icon;base64,R0lGODlhEAAQAPfLAAATVikwdA8SnxUfgAsWpAAilholjxw4jBc7kwAlvQQ2sRMsoBUqqhMzuhY/vxw4tSgmiyM1mSUztiQ6sTE3sQ4qyxMxxRoyxiAuxR1CtBxJsBxasSJuuTFguBte0Rlf2xVc9h9W9xVjzxVr0gdj6BRh4R1o5yBcyiZbyydT1i9b2Ddb1iFY6CJg2Vpor1dzvEJu20Z0yi23QDy1REi2OUy0O1WzOVC4PU+tVUe5Sk2xQU2zRUO4UE21Ula2SmKEqWWF2HyPx2+a6X6e6Xqk1m+s78sUDs4UGdEQB9YfDdwaANEfHd0YEscjAM4mAM0qANIoD9IkGdslGswuItYgL4aP0ImP2YGZ36Opzaq2wq/S+rzX/7/e8MrS1MLO/sTb48rT8snX/83c89PZ+crq+cH1/9Dl/9Ln/93r/9fy/+Hf7P/42eDm/O7u/+T29uX2/eT2/+f4/+f5/+j/9u//8+3/9u7/9ur5/+j//+n//+v//u3//+7//e7//+////b66/T/6vX/6/f/7f/07fj/4fv/4Pj/5v/45v7/4/r+7/3/6fDw+Pfx//D/9/X/8fT/8/f/8ff/8/D///H///L8/fL///P///X7//b6/ff/+/T///b9//f///v19//w9v/09P/29v/x+f/y///z///1+v/1///2///3//j79P/58/z/8/z99/z/9v7/9P7/9vn7//v6//j9//n9//j///n///v//vv////4+v/5+//6+P/4///6/P/6/v/6///7///9+P/8+v/9+v7/+Pz////8/f/9/f79///8///9//7//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAMsALAAAAAAQABAAAAj/AEn4oIFjBw8bOnrMuJGjhowZM1T8UdYJUZ5ZcNRYWjSrVK5QU0DMmtUnzRAXEy4o6FCEy6NDTkQIq1MmRgM0eZTlCXMgQJtRSE4gmgUkwh1EiZTNUiamy6NUUExcuoJgDCdDjQg9KgVL2SNFT1hwEvKglLBWuixZ+jSrlSBdRlL04bBBkTBdpZTpIqWsFaBcTEr0QaEhl6dWlswKW6poDRUPlmAUQKWMkTJLc76QMQNGUZMWgIgkCFJnlq5WXigwkFClVZQQyuRgELAlk7JBymCZGYAF0ZEPrQixgUDAihxVdPpoAZAFUZIRfThxgvPCwAILDipk+OFG2ZIVoxApERtPfvwlvZ+kQFzPvv0MJQEBADs= - + @@ -11,7 +11,7 @@ - + -http://www.google.com/firefox +http://www.google.com/ --- mozilla.orig/browser/base/content/baseMenuOverlay.xul +++ mozilla/browser/base/content/baseMenuOverlay.xul @@ -92,20 +92,7 @@ accesskey="&helpForIEUsers.accesskey;" oncommand="openHelp('ieusers', 'chrome://browser/locale/help/help.rdf');"/> #endif - - -#ifndef XP_MACOSX - -#endif
-

&brandFullName;™ +

&brandFullName;
&brandMotto;