Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2012-04-23 16:11:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaFirefox", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2012-03-16 13:19:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2012-04-23 16:11:42.000000000 +0200 @@ -1,0 +2,12 @@ +Sat Apr 21 10:02:37 UTC 2012 - [email protected] + +- update to Firefox 12.0 (bnc#758408) + * rebased patches +- added mozilla-libnotify.patch to allow fallback from libnotify + to xul based events if no notification-daemon is running +- gcc 4.7 fixes + * mozilla-gcc47.patch + * disabled crashreporter temporarily for Factory +- recommend libcanberra0 for proper sound notifications + +------------------------------------------------------------------- Old: ---- firefox-11.0-source.tar.bz2 l10n-11.0.tar.bz2 mozilla-sle11-gcc.patch New: ---- firefox-12.0-source.tar.bz2 l10n-12.0.tar.bz2 mozilla-gcc47.patch mozilla-libnotify.patch mozilla-revert_621446.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -17,8 +17,9 @@ # -%define major 11 +%define major 12 %define mainver %major.0 +%define update_channel release Name: MozillaFirefox BuildRequires: Mesa-devel @@ -48,7 +49,7 @@ BuildRequires: nss-shared-helper-devel Version: %{mainver} Release: 0 -%define releasedate 2012031200 +%define releasedate 2012042100 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -90,7 +91,9 @@ Patch12: mozilla-linux3.patch Patch14: mozilla-disable-neon-option.patch Patch15: mozilla-yarr-pcre.patch -Patch16: mozilla-sle11-gcc.patch +Patch16: mozilla-revert_621446.patch +Patch17: mozilla-libnotify.patch +Patch18: mozilla-gcc47.patch # Firefox/browser Patch31: firefox-browser-css.patch Patch32: firefox-cross-desktop.patch @@ -105,6 +108,7 @@ Requires: %{name}-branding > 4.0 Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) +Recommends: libcanberra0 %define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE4} @@ -126,6 +130,10 @@ %else %define crashreporter 1 %endif +# temporary gcc 4.7 +%if %suse_version > 1210 +%define crashreporter 0 +%endif ### build options end %description @@ -160,7 +168,7 @@ %package translations-other Summary: Extra translations for MozillaFirefox Group: System/Localization -Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu) +Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu) Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -220,6 +228,8 @@ %patch14 -p1 #%patch15 -p1 %patch16 -p1 +%patch17 -p1 +%patch18 -p1 # %patch31 -p1 %patch32 -p1 @@ -282,7 +292,7 @@ ac_add_options --disable-debug ac_add_options --enable-startup-notification #ac_add_options --enable-chrome-format=jar -ac_add_options --enable-update-channel=release +ac_add_options --enable-update-channel=%{update_channel} EOF %if %suse_version > 1130 cat << EOF >> $MOZCONFIG @@ -320,6 +330,8 @@ export MOZ_SOURCE_STAMP=$REV export MOZ_SOURCE_REPO=$REPO make -C browser/installer STRIP=/bin/true +#DEBUG (break the build if searchplugins are missing / temporary) +grep amazondotcom dist/firefox/omni.ja # copy tree into RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{progdir} cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* $RPM_BUILD_ROOT%{progdir} @@ -354,8 +366,9 @@ make -C browser/locales langpack-$locale cp -rL dist/xpi-stage/locale-$locale \ $RPM_BUILD_ROOT%{progdir}/extensions/[email protected] - # remove prefs and profile defaults from langpack + # remove prefs, profile defaults, and hyphenation from langpack rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/[email protected]/defaults + rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/[email protected]/hyphenation # check against the fixed common list and sort into the right filelist _matched=0 for _match in ar ca cs da de en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do @@ -424,6 +437,7 @@ rm -f $RPM_BUILD_ROOT%{progdir}/precomplete rm -f $RPM_BUILD_ROOT%{progdir}/dictionaries/en-US* rm -f $RPM_BUILD_ROOT%{progdir}/firefox +rm -f $RPM_BUILD_ROOT%{progdir}/update-settings.ini # devel mkdir -p %{buildroot}%{_bindir} install -m 755 %SOURCE12 %{buildroot}%{_bindir} ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -2,10 +2,11 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_11_0_RELEASE" -VERSION="11.0" +RELEASE_TAG="FIREFOX_12_0_RELEASE" +VERSION="12.0" # mozilla +echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH mozilla pushd mozilla [ "$RELEASE_TAG" == "default" ] || hg update -r $RELEASE_TAG @@ -15,23 +16,28 @@ echo -n "REPO=" >> ../source-stamp.txt hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" >> ../source-stamp.txt popd +echo "creating archive..." tar cjf firefox-$VERSION-source.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS mozilla # l10n +echo "fetching locales..." test ! -d l10n && mkdir l10n for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do case $locale in ja-JP-mac|en-US) ;; *) + echo "fetching $locale ..." hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac done +echo "creating l10n archive..." tar cjf l10n-$VERSION.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg l10n # compare-locales +echo "creating compare-locales" hg clone http://hg.mozilla.org/build/compare-locales tar cjf compare-locales.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg compare-locales ++++++ firefox-11.0-source.tar.bz2 -> firefox-12.0-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-11.0-source.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-12.0-source.tar.bz2 differ: char 11, line 1 ++++++ firefox-branded-icons.patch ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent efffa19fa0b2530d2aca1ebd5b885a6fc68e51de +# Parent d6bb5c163142d233d00e739e21aa9df16077873e diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -169,16 +169,21 @@ endif # LIBXUL_SDK +@@ -164,16 +164,21 @@ endif # LIBXUL_SDK DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) @@ -54,14 +54,14 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -424,18 +424,21 @@ +@@ -432,18 +432,21 @@ + @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png #ifdef SHIP_FEEDBACK @BINPATH@/distribution/extensions/[email protected] #endif @BINPATH@/chrome/toolkit@JAREXT@ @BINPATH@/chrome/toolkit.manifest - #ifdef XP_UNIX - #ifndef XP_MACOSX + #ifdef MOZ_GTK2 @BINPATH@/chrome/icons/default/default16.png +@BINPATH@/chrome/icons/default/default22.png +@BINPATH@/chrome/icons/default/default24.png @@ -69,10 +69,10 @@ @BINPATH@/chrome/icons/default/default48.png +@BINPATH@/chrome/icons/default/default256.png #endif - #endif - ; shell icons #ifdef XP_UNIX #ifndef XP_MACOSX @BINPATH@/icons/*.xpm + @BINPATH@/icons/*.png + #endif ++++++ firefox-browser-css.patch ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -9,7 +9,7 @@ diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe/browser.css --- a/browser/themes/gnomestripe/browser.css +++ b/browser/themes/gnomestripe/browser.css -@@ -1018,16 +1018,30 @@ toolbar[iconsize="small"] #feed-button { +@@ -1016,16 +1016,30 @@ toolbar[iconsize="small"] #feed-button { } #urlbar-display { @@ -36,7 +36,7 @@ #page-proxy-favicon { width: 16px; height: 16px; + margin: 2px 4px; } - #page-proxy-stack { - width: 24px; + #page-proxy-favicon:not([src]) { ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -2,7 +2,7 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1125 @@ +@@ -0,0 +1,1118 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- @@ -396,27 +396,27 @@ + <panel id="customizeToolbarSheetPopup" + noautohide="true"> + <iframe id="customizeToolbarSheetIFrame" -+ style="&dialog.style;" ++ style="&dialog.dimensions;" + hidden="true"/> + </panel> + + <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/> + + <tooltip id="back-button-tooltip"> -+ <label value="&backButton.tooltip;"/> ++ <label class="tooltip-label" value="&backButton.tooltip;"/> +#ifdef XP_MACOSX -+ <label value="&backForwardButtonMenuMac.tooltip;"/> ++ <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/> +#else -+ <label value="&backForwardButtonMenu.tooltip;"/> ++ <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/> +#endif + </tooltip> + + <tooltip id="forward-button-tooltip"> -+ <label value="&forwardButton.tooltip;"/> ++ <label class="tooltip-label" value="&forwardButton.tooltip;"/> +#ifdef XP_MACOSX -+ <label value="&backForwardButtonMenuMac.tooltip;"/> ++ <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/> +#else -+ <label value="&backForwardButtonMenu.tooltip;"/> ++ <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/> +#endif + </tooltip> + </popupset> @@ -449,9 +449,7 @@ + + <toolbox id="navigator-toolbox" + defaultmode="icons" mode="icons" -+ iconsize="large" -+ tabsontop="true" -+ persist="tabsontop"> ++ iconsize="large"> + <!-- Menu --> + <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true" + defaultset="menubar-items" @@ -509,7 +507,7 @@ + <textbox id="urlbar" flex="1" + placeholder="&urlbar.placeholder;" + type="autocomplete" -+ autocompletesearch="history" ++ autocompletesearch="urlinline history" + autocompletesearchparam="enable-actions" + autocompletepopup="PopupAutoCompleteRichResult" + completeselectedindex="true" @@ -541,12 +539,12 @@ + onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);" + ondragstart="gIdentityHandler.onDragStart(event);"> + <hbox id="identity-box-inner" align="center"> -+ <stack id="page-proxy-stack" -+ onclick="PageProxyClickHandler(event);"> ++ <hbox id="page-proxy-stack" ++ onclick="PageProxyClickHandler(event);"> + <image id="page-proxy-favicon" validate="never" + pageproxystate="invalid" + onerror="this.removeAttribute('src');"/> -+ </stack> ++ </hbox> + <hbox id="identity-icon-labels"> + <label id="identity-icon-label" class="plain" flex="1"/> + <label id="identity-icon-country-label" class="plain"/> @@ -1000,7 +998,6 @@ + hidden="true"> + <vbox flex="1"> + <resizer id="inspector-top-resizer" flex="1" -+ class="inspector-resizer" + dir="top" disabled="true" + element="inspector-tree-box"/> + <hbox> @@ -1021,8 +1018,8 @@ + <toolbarbutton id="inspector-3D-button" + class="devtools-toolbarbutton" + hidden="true" -+ label="&inspect3DButton.label;" -+ accesskey="&inspect3DButton.accesskey;" ++ label="&inspect3DViewButton.label;" ++ accesskey="&inspect3DViewButton.accesskey;" + command="Inspector:Tilt"/> + <toolbarbutton id="inspector-style-button" + class="devtools-toolbarbutton" @@ -1036,10 +1033,6 @@ + oncommand="InspectorUI.closeInspectorUI(false);" + tooltiptext="&inspectCloseButton.tooltiptext;"/> +#endif -+ <resizer id="inspector-end-resizer" -+ class="inspector-resizer" -+ dir="top" disabled="true" -+ element="inspector-tree-box"/> + </hbox> + </vbox> + </toolbar> @@ -1145,11 +1138,11 @@ * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) * content/browser/content.js (content/content.js) * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) + * content/browser/newtab/newTab.xul (content/newtab/newTab.xul) + * content/browser/newtab/newTab.js (content/newtab/newTab.js) + content/browser/newtab/newTab.css (content/newtab/newTab.css) * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) - * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) - * content/browser/pageinfo/pageInfo.xml (content/pageinfo/pageInfo.xml) - * content/browser/pageinfo/feeds.js (content/pageinfo/feeds.js) diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp --- a/browser/components/build/nsModule.cpp +++ b/browser/components/build/nsModule.cpp @@ -1166,13 +1159,13 @@ +#include "nsUnixShellService.h" #endif - #include "nsProfileMigrator.h" #if defined(XP_WIN) && !defined(__MINGW32__) #include "nsIEProfileMigrator.h" #elif defined(XP_MACOSX) #include "nsSafariProfileMigrator.h" #endif -@@ -68,18 +68,16 @@ using namespace mozilla::browser; + +@@ -67,18 +67,16 @@ using namespace mozilla::browser; ///////////////////////////////////////////////////////////////////////////// @@ -1185,13 +1178,13 @@ -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) #endif - NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator) #if defined(XP_WIN) && !defined(__MINGW32__) NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator) #elif defined(XP_MACOSX) NS_GENERIC_FACTORY_CONSTRUCTOR(nsSafariProfileMigrator) #endif -@@ -105,17 +103,17 @@ NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGR + +@@ -102,17 +100,17 @@ NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGR #endif NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); @@ -1205,15 +1198,15 @@ #endif { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor }, { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create }, - { &kNS_FIREFOX_PROFILEMIGRATOR_CID, false, NULL, nsProfileMigratorConstructor }, #if defined(XP_WIN) && !defined(__MINGW32__) { &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor }, #elif defined(XP_MACOSX) { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor }, + { &kNS_SAFARIPROFILEMIGRATOR_CID, false, NULL, nsSafariProfileMigratorConstructor }, diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js --- a/browser/components/preferences/advanced.js +++ b/browser/components/preferences/advanced.js -@@ -697,24 +697,42 @@ var gAdvancedPane = { +@@ -716,24 +716,42 @@ var gAdvancedPane = { var brandBundle = document.getElementById("bundleBrand"); var shellBundle = document.getElementById("bundleShell"); var brandShortName = brandBundle.getString("brandShortName"); @@ -1716,7 +1709,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -440,16 +440,17 @@ +@@ -450,16 +450,17 @@ #endif #endif ++++++ firefox-multilocale-chrome.patch ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -1,12 +1,12 @@ # HG changeset patch # User Wolfgang Rosenauer <[email protected]> -# Parent 8b1b35442fee96324a141ab5d7710c3a88769df5 +# Parent de9c23d6bfd0b0a30aa3dfc55377658756ec6f70 Add searchplugins to chrome packaging for proper localization diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -323,16 +323,20 @@ pref("browser.download.manager.scanWhenD +@@ -341,16 +341,20 @@ pref("browser.download.manager.scanWhenD pref("browser.download.manager.resumeOnWakeDelay", 10000); // search engines URL @@ -30,7 +30,7 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in -@@ -167,29 +167,41 @@ libs:: $(call MERGE_FILES,$(addprefix pr +@@ -153,39 +153,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ; install:: $(addprefix generic/profile/,$(PROFILE_FILES)) @@ -41,26 +41,41 @@ -SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) +SEARCH_PLUGINS = $(shell cat \ -+ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ -+ @srcdir@/en-US/searchplugins/list.txt ) ) ++ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ ++ @srcdir@/en-US/searchplugins/list.txt ) ) -libs:: $(addsuffix .xml,$(SEARCH_PLUGINS)) -- $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins +- $(NSINSTALL) -D $(FINAL_TARGET)/searchplugins +- for SEARCH_PLUGIN in $^; do\ +- SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\ +tmp-search.jar.mn:: + printf "$(AB_CD).jar:" > $@ + printf "$(foreach plugin,$(SEARCH_PLUGINS),$(subst __PLUGIN_SUBST__,$(plugin), \n locale/browser/searchplugins/__PLUGIN_SUBST__.xml (__PLUGIN_SUBST__.xml)))" >> $@ + @echo >> $@ ++ ++searchplugins:: $(addsuffix .xml,$(SEARCH_PLUGINS)) ++ for SEARCH_PLUGIN in $^; do \ + $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ +- $$SEARCH_PLUGIN > $(FINAL_TARGET)/searchplugins/$$SEARCH_PLUGIN_BASE; \ ++ $$SEARCH_PLUGIN > $$SEARCH_PLUGIN-new ; \ ++ mv $$SEARCH_PLUGIN-new $$SEARCH_PLUGIN ; \ + done -install:: $(addsuffix .xml,$(SEARCH_PLUGINS)) -- $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins -+searchplugins: tmp-search.jar.mn +- $(NSINSTALL) -D $(DESTDIR)$(mozappdir)/searchplugins +- for i in $^; do \ +- SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\ +- $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ +- $$SEARCH_PLUGIN > $(DESTDIR)$(mozappdir)/searchplugins/$$SEARCH_PLUGIN_BASE; \ +- done ++searchplugins:: tmp-search.jar.mn + $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ + $(QUIET) -j $(FINAL_TARGET)/chrome \ + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ + -s $(LOCALE_SRCDIR)/searchplugins \ + $(MAKE_JARS_FLAGS) tmp-search.jar.mn -+export:: searchplugins ++libs:: searchplugins + +GARBAGE += tmp-search.jar.mn @@ -80,7 +95,7 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -84,11 +84,12 @@ +@@ -97,11 +97,12 @@ locale/browser-region/region.properties (%chrome/browser-region/region.properties) # the following files are browser-specific overrides * locale/browser/netError.dtd (%chrome/overrides/netError.dtd) ++++++ firefox-no-default-ualocale.patch ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -1,12 +1,12 @@ # HG changeset patch # User Wolfgang Rosenauer <[email protected]> -# Parent 9041ab32e51a397a39de4f95c718a5adf5c21f2f +# Parent d372da4f99f10c6e76fd483abc145cfbc485c168 Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -215,17 +215,17 @@ pref("xpinstall.whitelist.add.36", "getp +@@ -230,17 +230,17 @@ pref("xpinstall.whitelist.add.36", "getp pref("lightweightThemes.update.enabled", true); ++++++ l10n-11.0.tar.bz2 -> l10n-12.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-11.0.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-12.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-sle11-gcc.patch -> mozilla-gcc47.patch ++++++ --- /work/SRC/openSUSE:Factory/MozillaFirefox/mozilla-sle11-gcc.patch 2012-03-16 13:19:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/mozilla-gcc47.patch 2012-04-23 16:11:48.000000000 +0200 @@ -1,24 +1,174 @@ # HG changeset patch -# Parent 39e596b823926b5add22bb263734c6c872ee2aad -diff --git a/layout/xul/base/src/nsXULTooltipListener.h b/layout/xul/base/src/nsXULTooltipListener.h ---- a/layout/xul/base/src/nsXULTooltipListener.h -+++ b/layout/xul/base/src/nsXULTooltipListener.h -@@ -107,17 +107,17 @@ protected: - static void sTooltipCallback (nsITimer* aTimer, void* aListener); - - // screen coordinates of the last mousemove event, stored so that the - // tooltip can be opened at this location. - PRInt32 mMouseScreenX, mMouseScreenY; - - // various constants for tooltips - enum { -- kTooltipMouseMoveTolerance = 7, // 7 pixel tolerance for mousemove event -+ kTooltipMouseMoveTolerance = 7 // 7 pixel tolerance for mousemove event - }; - - // flag specifying if the tooltip has already been displayed by a MouseMove - // event. The flag is reset on MouseOut so that the tooltip will display - // the next time the mouse enters the node (bug #395668). - bool mTooltipShownOnce; +# Parent debab900e37fdd4f8981c06beef6f193a04bd2b7 +Patch to make Mozilla build with gcc 4.7, including +- Bug 725655 - gcc 4.7 build failures (missing headers) (TM: Mozilla13) +- Bug 734490 - "no viable overloaded 'PRIxPTR'" when building with Clang or GCC 4.7 (TM: Mozilla14) + +diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc +--- a/ipc/chromium/src/base/file_util_linux.cc ++++ b/ipc/chromium/src/base/file_util_linux.cc +@@ -1,15 +1,18 @@ + // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. - #ifdef MOZ_XUL + #include "base/file_util.h" + + #include <fcntl.h> ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include <string> + #include <vector> + + #include "base/eintr_wrapper.h" + #include "base/file_path.h" + #include "base/string_util.h" + +diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc +--- a/ipc/chromium/src/base/message_pump_libevent.cc ++++ b/ipc/chromium/src/base/message_pump_libevent.cc +@@ -1,16 +1,19 @@ + // Copyright (c) 2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + + #include "base/message_pump_libevent.h" + + #include <errno.h> + #include <fcntl.h> ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include "eintr_wrapper.h" + #include "base/logging.h" + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" + #include "third_party/libevent/event.h" + +diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc +--- a/ipc/chromium/src/base/time_posix.cc ++++ b/ipc/chromium/src/base/time_posix.cc +@@ -8,16 +8,19 @@ + #include <mach/mach_time.h> + #endif + #include <sys/time.h> + #ifdef ANDROID + #include <time64.h> + #else + #include <time.h> + #endif ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include <limits> + + #include "base/basictypes.h" + #include "base/logging.h" + + namespace base { + +diff --git a/layout/base/tests/TestPoisonArea.cpp b/layout/base/tests/TestPoisonArea.cpp +--- a/layout/base/tests/TestPoisonArea.cpp ++++ b/layout/base/tests/TestPoisonArea.cpp +@@ -392,53 +392,53 @@ ReservePoisonArea() + { + if (sizeof(uintptr_t) == 8) { + // Use the hardware-inaccessible region. + // We have to avoid 64-bit constants and shifts by 32 bits, since this + // code is compiled in 32-bit mode, although it is never executed there. + uintptr_t result = (((uintptr_t(0x7FFFFFFFu) << 31) << 1 | + uintptr_t(0xF0DEAFFFu)) & + ~uintptr_t(PAGESIZE-1)); +- printf("INFO | poison area assumed at 0x%.*"PRIxPTR"\n", SIZxPTR, result); ++ printf("INFO | poison area assumed at 0x%.*" PRIxPTR "\n", SIZxPTR, result); + return result; + } else { + // First see if we can allocate the preferred poison address from the OS. + uintptr_t candidate = (0xF0DEAFFF & ~(PAGESIZE-1)); + void *result = ReserveRegion(candidate, false); + if (result == (void *)candidate) { + // success - inaccessible page allocated +- printf("INFO | poison area allocated at 0x%.*"PRIxPTR ++ printf("INFO | poison area allocated at 0x%.*" PRIxPTR + " (preferred addr)\n", SIZxPTR, (uintptr_t)result); + return candidate; + } + + // That didn't work, so see if the preferred address is within a range + // of permanently inacessible memory. + if (ProbeRegion(candidate)) { + // success - selected page cannot be usable memory + if (result != MAP_FAILED) + ReleaseRegion(result); +- printf("INFO | poison area assumed at 0x%.*"PRIxPTR ++ printf("INFO | poison area assumed at 0x%.*" PRIxPTR + " (preferred addr)\n", SIZxPTR, candidate); + return candidate; + } + + // The preferred address is already in use. Did the OS give us a + // consolation prize? + if (result != MAP_FAILED) { +- printf("INFO | poison area allocated at 0x%.*"PRIxPTR ++ printf("INFO | poison area allocated at 0x%.*" PRIxPTR + " (consolation prize)\n", SIZxPTR, (uintptr_t)result); + return (uintptr_t)result; + } + + // It didn't, so try to allocate again, without any constraint on + // the address. + result = ReserveRegion(0, false); + if (result != MAP_FAILED) { +- printf("INFO | poison area allocated at 0x%.*"PRIxPTR ++ printf("INFO | poison area allocated at 0x%.*" PRIxPTR + " (fallback)\n", SIZxPTR, (uintptr_t)result); + return (uintptr_t)result; + } + + printf("ERROR | no usable poison area found\n"); + return 0; + } + } +@@ -450,17 +450,17 @@ static uintptr_t + ReservePositiveControl() + { + + void *result = ReserveRegion(0, false); + if (result == MAP_FAILED) { + printf("ERROR | allocating positive control | %s\n", LastErrMsg()); + return 0; + } +- printf("INFO | positive control allocated at 0x%.*"PRIxPTR"\n", ++ printf("INFO | positive control allocated at 0x%.*" PRIxPTR "\n", + SIZxPTR, (uintptr_t)result); + return (uintptr_t)result; + } + + /* The "negative control" area confirms that our probe logic does detect a + * page that is readable, writable, or executable. + */ + static uintptr_t +@@ -481,17 +481,17 @@ ReserveNegativeControl() + // Now mark it executable as well as readable and writable. + // (mmap(PROT_EXEC) may fail when applied to anonymous memory.) + + if (MakeRegionExecutable(result)) { + printf("ERROR | making negative control executable | %s\n", LastErrMsg()); + return 0; + } + +- printf("INFO | negative control allocated at 0x%.*"PRIxPTR"\n", ++ printf("INFO | negative control allocated at 0x%.*" PRIxPTR "\n", + SIZxPTR, (uintptr_t)result); + return (uintptr_t)result; + } + + static void + JumpTo(uintptr_t opaddr) + { + #ifdef __ia64 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -3247,9 +3247,9 @@ #endif // Now look up our extensions -diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in ---- a/widget/src/gtk2/Makefile.in -+++ b/widget/src/gtk2/Makefile.in +diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in +--- a/widget/gtk2/Makefile.in ++++ b/widget/gtk2/Makefile.in @@ -135,11 +135,14 @@ DEFINES += -DCAIRO_GFX INCLUDES += \ @@ -3265,9 +3265,9 @@ ifdef MOZ_X11 INCLUDES += -I$(srcdir)/../shared/x11 endif -diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp ---- a/widget/src/gtk2/nsFilePicker.cpp -+++ b/widget/src/gtk2/nsFilePicker.cpp +diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp +--- a/widget/gtk2/nsFilePicker.cpp ++++ b/widget/gtk2/nsFilePicker.cpp @@ -33,16 +33,17 @@ * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. @@ -3580,9 +3580,9 @@ + } + return NS_OK; + } -diff --git a/widget/src/gtk2/nsFilePicker.h b/widget/src/gtk2/nsFilePicker.h ---- a/widget/src/gtk2/nsFilePicker.h -+++ b/widget/src/gtk2/nsFilePicker.h +diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h +--- a/widget/gtk2/nsFilePicker.h ++++ b/widget/gtk2/nsFilePicker.h @@ -89,11 +89,17 @@ protected: nsString mDefault; nsString mDefaultExtension; ++++++ mozilla-libnotify.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <[email protected]> # Parent c684863b1eb3bcae92ef24bc2ac511985b1ad7e4 Bug 737646 - no biff notification if notification-daemon not running diff --git a/toolkit/system/gnome/nsAlertsIconListener.cpp b/toolkit/system/gnome/nsAlertsIconListener.cpp --- a/toolkit/system/gnome/nsAlertsIconListener.cpp +++ b/toolkit/system/gnome/nsAlertsIconListener.cpp @@ -47,16 +47,17 @@ #include <gdk/gdk.h> // Compatibility macro for <libnotify-0.7 #ifndef NOTIFY_CHECK_VERSION #define NOTIFY_CHECK_VERSION(x,y,z) 0 #endif static bool gHasActions = false; +static bool gHasCaps = false; static void notify_action_cb(NotifyNotification *notification, gchar *action, gpointer user_data) { nsAlertsIconListener* alert = static_cast<nsAlertsIconListener*> (user_data); alert->SendCallback(); } @@ -338,27 +339,34 @@ nsAlertsIconListener::InitAlertAsync(con appShortName.AssignLiteral("Mozilla"); } if (!notify_init(appShortName.get())) return NS_ERROR_FAILURE; GList *server_caps = notify_get_server_caps(); if (server_caps) { + gHasCaps = true; for (GList* cap = server_caps; cap != NULL; cap = cap->next) { if (!strcmp((char*) cap->data, "actions")) { gHasActions = true; break; } } g_list_foreach(server_caps, (GFunc)g_free, NULL); g_list_free(server_caps); } } + if (!gHasCaps) { + // if notify_get_server_caps() failed above we need to assume + // there is no notification-server to display anything + return NS_ERROR_FAILURE; + } + if (!gHasActions && aAlertTextClickable) return NS_ERROR_FAILURE; // No good, fallback to XUL nsCOMPtr<nsIObserverService> obsServ = do_GetService("@mozilla.org/observer-service;1"); if (obsServ) obsServ->AddObserver(this, "quit-application", true); ++++++ mozilla-repo.patch ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent e315e5900fa90c2183edccd211fbe1e81cdb4c5f +# Parent 8ea0f829916d7d9dc54567813367bcdfe6cee179 diff --git a/build/Makefile.in b/build/Makefile.in --- a/build/Makefile.in +++ b/build/Makefile.in -@@ -86,17 +86,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ +@@ -91,17 +91,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ APP_INI_DEPS += $(DEPTH)/config/autoconf.mk MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) @@ -48,7 +48,7 @@ diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk -@@ -156,20 +156,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME +@@ -161,20 +161,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME TEST_PACKAGE = $(PKG_BASENAME).tests.zip ifneq (,$(wildcard $(DIST)/bin/application.ini)) @@ -67,14 +67,14 @@ -MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) +#MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) - MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt + MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_SOURCESTAMP_FILE_BASENAME).txt # JavaScript Shell PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -235,17 +235,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR +@@ -236,17 +236,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR endif endif ++++++ mozilla-revert_621446.patch ++++++ # HG changeset patch # Parent 8da41a2cee774ce4d00b9ac1032a495b8bc560a0 Revert investigation patch for bmo#621446; as it is useless on desktop and breaks the build for certain compilers diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp --- a/netwerk/protocol/http/HttpChannelParent.cpp +++ b/netwerk/protocol/http/HttpChannelParent.cpp @@ -52,29 +52,25 @@ #include "nsIBadCertListener2.h" #include "nsICacheEntryDescriptor.h" #include "nsSerializationHelper.h" #include "nsISerializable.h" #include "nsIAssociatedContentSecurity.h" #include "nsIApplicationCacheService.h" #include "nsIOfflineCacheUpdate.h" #include "nsIRedirectChannelRegistrar.h" -#include "prinit.h" namespace mozilla { namespace net { HttpChannelParent::HttpChannelParent(PBrowserParent* iframeEmbedding) : mIPCClosed(false) , mStoredStatus(0) , mStoredProgress(0) , mStoredProgressMax(0) - , mSentRedirect1Begin(false) - , mSentRedirect1BeginFailed(false) - , mReceivedRedirect2Verify(false) { // Ensure gHttpHandler is initialized: we need the atom table up and running. nsIHttpProtocolHandler* handler; CallGetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &handler); NS_ASSERTION(handler, "no http handler"); mTabParent = do_QueryObject(static_cast<TabParent*>(iframeEmbedding)); } @@ -326,21 +322,16 @@ HttpChannelParent::RecvUpdateAssociatedC mAssociatedContentSecurity->SetCountSubRequestsHighSecurity(high); mAssociatedContentSecurity->SetCountSubRequestsLowSecurity(low); mAssociatedContentSecurity->SetCountSubRequestsBrokenSecurity(broken); mAssociatedContentSecurity->SetCountSubRequestsNoSecurity(no); } return true; } -// Bug 621446 investigation, we don't want conditional PR_Aborts bellow to be -// merged to a single address. -#pragma warning(disable : 4068) -#pragma GCC optimize ("O0") - bool HttpChannelParent::RecvRedirect2Verify(const nsresult& result, const RequestHeaderTuples& changedHeaders) { if (NS_SUCCEEDED(result)) { nsCOMPtr<nsIHttpChannel> newHttpChannel = do_QueryInterface(mRedirectChannel); @@ -348,40 +339,21 @@ HttpChannelParent::RecvRedirect2Verify(c for (PRUint32 i = 0; i < changedHeaders.Length(); i++) { newHttpChannel->SetRequestHeader(changedHeaders[i].mHeader, changedHeaders[i].mValue, changedHeaders[i].mMerge); } } } - if (!mRedirectCallback) { - // Bug 621446 investigation (optimization turned off above) - if (mReceivedRedirect2Verify) - NS_RUNTIMEABORT("Duplicate fire"); - if (mSentRedirect1BeginFailed) - NS_RUNTIMEABORT("Send to child failed"); - if (mSentRedirect1Begin && NS_FAILED(result)) - NS_RUNTIMEABORT("Redirect failed"); - if (mSentRedirect1Begin && NS_SUCCEEDED(result)) - NS_RUNTIMEABORT("Redirect succeeded"); - if (!mRedirectChannel) - NS_RUNTIMEABORT("Missing redirect channel"); - } - - mReceivedRedirect2Verify = true; - mRedirectCallback->OnRedirectVerifyCallback(result); mRedirectCallback = nsnull; return true; } -// Bug 621446 investigation -#pragma GCC reset_options - bool HttpChannelParent::RecvDocumentChannelCleanup() { // From now on only using mAssociatedContentSecurity. Free everything else. mChannel = 0; // Reclaim some memory sooner. mCacheDescriptor = 0; // Else we'll block other channels reading same URI return true; } @@ -583,24 +555,18 @@ HttpChannelParent::StartRedirect(PRUint3 nsHttpChannel *httpChan = static_cast<nsHttpChannel *>(mChannel.get()); nsHttpResponseHead *responseHead = httpChan->GetResponseHead(); bool result = SendRedirect1Begin(newChannelId, IPC::URI(newURI), redirectFlags, responseHead ? *responseHead : nsHttpResponseHead()); - if (!result) { - // Bug 621446 investigation - mSentRedirect1BeginFailed = true; + if (!result) return NS_BINDING_ABORTED; - } - - // Bug 621446 investigation - mSentRedirect1Begin = true; // Result is handled in RecvRedirect2Verify above mRedirectChannel = newChannel; mRedirectCallback = callback; return NS_OK; } diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h --- a/netwerk/protocol/http/HttpChannelParent.h +++ b/netwerk/protocol/http/HttpChannelParent.h @@ -128,18 +128,14 @@ private: nsCOMPtr<nsIChannel> mRedirectChannel; nsCOMPtr<nsIAsyncVerifyRedirectCallback> mRedirectCallback; // state for combining OnStatus/OnProgress with OnDataAvailable // into one IPDL call to child. nsresult mStoredStatus; PRUint64 mStoredProgress; PRUint64 mStoredProgressMax; - - bool mSentRedirect1Begin : 1; - bool mSentRedirect1BeginFailed : 1; - bool mReceivedRedirect2Verify : 1; }; } // namespace net } // namespace mozilla #endif // mozilla_net_HttpChannelParent_h ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.SHS110/_old 2012-04-23 16:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SHS110/_new 2012-04-23 16:11:55.000000000 +0200 @@ -1,2 +1,2 @@ -REV=b967d9c07377 +REV=a294a5b4f12d REPO=http://hg.mozilla.org/releases/mozilla-release -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
