Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2013-05-17 08:26:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaFirefox" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2013-04-14 10:35:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2013-05-17 08:26:15.000000000 +0200 @@ -1,0 +2,20 @@ +Fri May 10 05:25:39 UTC 2013 - [email protected] + +- update to Firefox 21.0 (bnc#819204) + * removed upstreamed patch firefox-712763.patch + * removed disabled mozilla-disable-neon-option.patch + * MFSA 2013-41/CVE-2013-0801/CVE-2013-1669 + Miscellaneous memory safety hazards + * MFSA 2013-42/CVE-2013-1670 (bmo#853709) + Privileged access for content level constructor + * MFSA 2013-43/CVE-2013-1671 (bmo#842255) + File input control has access to full path + * MFSA 2013-46/CVE-2013-1674 (bmo#860971) + Use-after-free with video and onresize event + * MFSA 2013-47/CVE-2013-1675 (bmo#866825) + Uninitialized functions in DOMSVGZoomEvent + * MFSA 2013-48/CVE-2013-1676/CVE-2013-1677/CVE-2013-1678/ + CVE-2013-1679/CVE-2013-1680/CVE-2013-1681 + Memory corruption found using Address Sanitizer + +------------------------------------------------------------------- Old: ---- firefox-20.0-source.tar.bz2 firefox-712763.patch l10n-20.0.tar.bz2 mozilla-disable-neon-option.patch New: ---- firefox-21.0-source.tar.bz2 l10n-21.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.2ROiWy/_old 2013-05-17 08:26:52.000000000 +0200 +++ /var/tmp/diff_new_pack.2ROiWy/_new 2013-05-17 08:26:52.000000000 +0200 @@ -17,7 +17,7 @@ # -%define major 20 +%define major 21 %define mainver %major.0 %define update_channel release @@ -50,7 +50,7 @@ %else BuildRequires: wireless-tools %endif -BuildRequires: mozilla-nspr-devel >= 4.9.5 +BuildRequires: mozilla-nspr-devel >= 4.9.6 BuildRequires: mozilla-nss-devel >= 3.14.3 BuildRequires: nss-shared-helper-devel %if %suse_version > 1140 @@ -60,7 +60,7 @@ %endif Version: %{mainver} Release: 0 -%define releasedate 2013032900 +%define releasedate 2013051000 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -99,7 +99,6 @@ Patch8: mozilla-ntlm-full-path.patch Patch9: mozilla-repo.patch Patch10: mozilla-sle11.patch -Patch11: mozilla-disable-neon-option.patch Patch12: mozilla-arm-disable-edsp.patch Patch13: mozilla-ppc.patch Patch14: mozilla-gstreamer-760140.patch @@ -111,12 +110,10 @@ Patch33: firefox-no-default-ualocale.patch Patch34: firefox-multilocale-chrome.patch Patch35: firefox-branded-icons.patch -Patch36: firefox-712763.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils -Requires: %{name}-branding > 4.0 -Conflicts: %{name}-branding > %{version} +Requires: %{name}-branding > 20.0 Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) Recommends: libcanberra0 @@ -191,7 +188,7 @@ %package branding-upstream Summary: Upstream branding for Firefox Group: Productivity/Networking/Web/Browsers -Provides: %{name}-branding = 5.0 +Provides: %{name}-branding = %{version} Conflicts: otherproviders(%{name}-branding) Supplements: packageand(%{name}:branding-upstream) #BRAND: Provide three files - @@ -234,7 +231,6 @@ %if %suse_version < 1120 %patch10 -p1 %endif -#%patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 @@ -250,7 +246,6 @@ %patch33 -p1 %patch34 -p1 %patch35 -p1 -%patch36 -p1 %build # no need to add build time to binaries @@ -267,6 +262,7 @@ source %{SOURCE5} export MOZ_SOURCE_STAMP=$REV export SOURCE_REPO=$REPO +export source_repo=$REPO export MOZ_SOURCE_REPO=$REPO export MOZ_BUILD_DATE=%{releasedate} export MOZILLA_OFFICIAL=1 @@ -352,17 +348,17 @@ export MOZ_SOURCE_REPO=$REPO make -C browser/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0 #DEBUG (break the build if searchplugins are missing / temporary) -grep amazondotcom dist/firefox/omni.ja +grep amazondotcom dist/firefox/browser/omni.ja # copy tree into RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{progdir} +mkdir -p $RPM_BUILD_ROOT%{progdir} cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* $RPM_BUILD_ROOT%{progdir} -mkdir -p $RPM_BUILD_ROOT/%{progdir}/distribution/extensions -mkdir -p $RPM_BUILD_ROOT%{progdir}/searchplugins -mkdir -p $RPM_BUILD_ROOT%{progdir}/defaults/preferences/ +mkdir -p $RPM_BUILD_ROOT%{progdir}/distribution/extensions +mkdir -p $RPM_BUILD_ROOT%{progdir}/browser/searchplugins +mkdir -p $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/ # install kde.js %if %suse_version >= 1110 -install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/defaults/preferences/kde.js -install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{progdir}/defaults/preferences/firefox.js +install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/kde.js +install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/firefox.js %endif # install add-plugins.sh sed "s:%%PROGDIR:%{progdir}:g" \ @@ -385,17 +381,17 @@ LOCALE_MERGEDIR=$RPM_BUILD_DIR/l10n-merged/$locale \ make -C browser/locales langpack-$locale cp -rL dist/xpi-stage/locale-$locale \ - $RPM_BUILD_ROOT%{progdir}/extensions/[email protected] + $RPM_BUILD_ROOT%{progdir}/browser/extensions/[email protected] # 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 + rm -rf $RPM_BUILD_ROOT%{progdir}/browser/extensions/[email protected]/defaults + rm -rf $RPM_BUILD_ROOT%{progdir}/browser/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 [ "$_match" = "$locale" ] && _matched=1 done [ $_matched -eq 1 ] && _l10ntarget=common || _l10ntarget=other - echo %{progdir}/extensions/[email protected] \ + echo %{progdir}/browser/extensions/[email protected] \ >> %{_tmppath}/translations.$_l10ntarget esac done @@ -437,15 +433,15 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/%{firefox_appid} mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_appid} mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ -ln -sf %{progdir}/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.png -ln -sf %{progdir}/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}-gnome.png +ln -sf %{progdir}/browser/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.png +ln -sf %{progdir}/browser/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}-gnome.png %if %branding for size in 16 22 24 32 48 256; do %else for size in 16 32 48; do %endif mkdir -p $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/ - ln -sf %{progdir}/chrome/icons/default/default$size.png \ + ln -sf %{progdir}/browser/chrome/icons/default/default$size.png \ $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/%{progname}.png done %suse_update_desktop_file %{desktop_file_name} Network WebBrowser GTK @@ -552,23 +548,29 @@ %files %defattr(-,root,root) %dir %{progdir} -%dir %{progdir}/chrome/ +%dir %{progdir}/browser/ +%dir %{progdir}/browser/chrome/ +%dir %{progdir}/browser/extensions/ +%{progdir}/browser/components/ +%{progdir}/browser/defaults +%{progdir}/browser/icons/ +%{progdir}/browser/chrome/icons +%{progdir}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} +%{progdir}/browser/searchplugins/ +%{progdir}/browser/blocklist.xml +%{progdir}/browser/chrome.manifest +%{progdir}/browser/omni.ja %dir %{progdir}/distribution/ -%{progdir}/chrome/icons +%{progdir}/distribution/extensions/ %{progdir}/components/ %{progdir}/defaults/ %{progdir}/dictionaries/ -%dir %{progdir}/extensions/ -%{progdir}/distribution/extensions/ -%{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -%{progdir}/icons/ -%{progdir}/searchplugins/ +%{progdir}/webapprt/ %attr(755,root,root) %{progdir}/%{progname}.sh %{progdir}/firefox %{progdir}/firefox-bin %{progdir}/add-plugins.sh %{progdir}/application.ini -%{progdir}/blocklist.xml %{progdir}/dependentlibs.list %{progdir}/*.so %{progdir}/mozilla-xremote-client @@ -576,14 +578,13 @@ %{progdir}/platform.ini %{progdir}/plugin-container %{progdir}/webapprt-stub -%{progdir}/webapprt/ +%{progdir}/chrome.manifest %if %crashreporter -%{progdir}/crashreporter-override.ini %{progdir}/crashreporter %{progdir}/crashreporter.ini %{progdir}/Throbber-small.gif +%{progdir}/browser/crashreporter-override.ini %endif -%{progdir}/chrome.manifest %{_datadir}/applications/%{desktop_file_name}.desktop %{_datadir}/mime/packages/%{progname}.xml %{_datadir}/pixmaps/firefox* @@ -607,12 +608,12 @@ %files translations-common -f %{_tmppath}/translations.common %defattr(-,root,root) %dir %{progdir} -%dir %{progdir}/extensions/ +%dir %{progdir}/browser/extensions/ %files translations-other -f %{_tmppath}/translations.other %defattr(-,root,root) %dir %{progdir} -%dir %{progdir}/extensions/ +%dir %{progdir}/browser/extensions/ %endif # this package does not need to provide files but is needed to fulfill ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.2ROiWy/_old 2013-05-17 08:26:53.000000000 +0200 +++ /var/tmp/diff_new_pack.2ROiWy/_new 2013-05-17 08:26:53.000000000 +0200 @@ -5,7 +5,7 @@ <size unit="G">9</size> </disk> <memory> - <size unit="M">2900</size> + <size unit="M">3500</size> </memory> </hardware> </constraints> ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.2ROiWy/_old 2013-05-17 08:26:53.000000000 +0200 +++ /var/tmp/diff_new_pack.2ROiWy/_new 2013-05-17 08:26:53.000000000 +0200 @@ -2,12 +2,30 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_20_0_RELEASE" -VERSION="20.0" +RELEASE_TAG="FIREFOX_21_0_RELEASE" +VERSION="21.0" # mozilla -echo "cloning $BRANCH..." -hg clone http://hg.mozilla.org/$BRANCH mozilla +if [ -d mozilla ]; then + pushd mozilla + _repourl=$(hg paths) + case "$_repourl" in + *$BRANCH*) + echo "updating previous tree" + hg pull + popd + ;; + * ) + echo "removing obsolete tree" + popd + rm -rf mozilla + ;; + esac +fi +if [ ! -d mozilla ]; then + echo "cloning new $BRANCH..." + hg clone http://hg.mozilla.org/$BRANCH mozilla +fi pushd mozilla [ "$RELEASE_TAG" == "default" ] || hg update -r $RELEASE_TAG # get repo and source stamp ++++++ firefox-20.0-source.tar.bz2 -> firefox-21.0-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-20.0-source.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-21.0-source.tar.bz2 differ: char 11, line 1 ++++++ firefox-branded-icons.patch ++++++ --- /var/tmp/diff_new_pack.2ROiWy/_old 2013-05-17 08:26:53.000000000 +0200 +++ /var/tmp/diff_new_pack.2ROiWy/_new 2013-05-17 08:26:53.000000000 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent 716c063a34dc33046c36b49e3bd2b4ec867d2b5b +# Parent ad0e2fcaa00769bc56cc2b58d1264209f8c32623 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -131,16 +131,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d +@@ -132,16 +132,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d endif ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) @@ -29,14 +29,14 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in --- a/browser/branding/official/Makefile.in +++ b/browser/branding/official/Makefile.in -@@ -42,18 +42,21 @@ OSX_BRANDING_FILES = \ - firefox.icns \ - disk.icns \ +@@ -47,18 +47,21 @@ BRANDING_FILES := \ document.icns \ dsstore \ $(NULL) + endif - LINUX_BRANDING_FILES = \ + ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) + BRANDING_FILES := \ default16.png \ + default22.png \ + default24.png \ @@ -45,34 +45,34 @@ + default256.png \ mozicon128.png \ $(NULL) + endif - OS2_BRANDING_FILES = \ + ifeq ($(OS_ARCH),OS2) + BRANDING_FILES := \ firefox-os2.ico \ document-os2.ico \ - $(NULL) - 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 -@@ -552,18 +552,21 @@ - @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png +@@ -558,18 +558,21 @@ + @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png #ifdef SHIP_FEEDBACK - @BINPATH@/distribution/extensions/[email protected] + @BINPATH@/browser/distribution/extensions/[email protected] #endif @BINPATH@/chrome/toolkit@JAREXT@ @BINPATH@/chrome/toolkit.manifest #ifdef MOZ_GTK2 - @BINPATH@/chrome/icons/default/default16.png -+@BINPATH@/chrome/icons/default/default22.png -+@BINPATH@/chrome/icons/default/default24.png - @BINPATH@/chrome/icons/default/default32.png - @BINPATH@/chrome/icons/default/default48.png -+@BINPATH@/chrome/icons/default/default256.png + @BINPATH@/browser/chrome/icons/default/default16.png ++@BINPATH@/browser/chrome/icons/default/default22.png ++@BINPATH@/browser/chrome/icons/default/default24.png + @BINPATH@/browser/chrome/icons/default/default32.png + @BINPATH@/browser/chrome/icons/default/default48.png ++@BINPATH@/browser/chrome/icons/default/default256.png #endif ; shell icons #ifdef XP_UNIX #ifndef XP_MACOSX - @BINPATH@/icons/*.xpm - @BINPATH@/icons/*.png - #endif + ; shell icons + @BINPATH@/browser/icons/*.png + #ifdef MOZ_UPDATER ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.2ROiWy/_old 2013-05-17 08:26:53.000000000 +0200 +++ /var/tmp/diff_new_pack.2ROiWy/_new 2013-05-17 08:26:53.000000000 +0200 @@ -2,7 +2,7 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1221 @@ +@@ -0,0 +1,1216 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- @@ -189,7 +189,7 @@ + align="start" + role="alert"> + <hbox flex="1"> -+ <image src="chrome://browser/content/social-icon.png" class="popup-notification-icon"/> ++ <image id="social-activation-icon" class="popup-notification-icon"/> + <vbox flex="1"> + <description id="social-activation-message" class="popup-notification-description"/> + <spacer flex="1"/> @@ -270,7 +270,6 @@ + class="social-panel" + type="arrow" + hidden="true" -+ consumeoutsideclicks="true" + noautofocus="true"/> + <panel id="social-flyout-panel" + class="social-panel" @@ -279,6 +278,8 @@ + side="right" + type="arrow" + hidden="true" ++ rolluponmousewheel="true" ++ consumeoutsideclicks="false" + noautofocus="true" + position="topcenter topright"/> + @@ -317,7 +318,7 @@ + <menupopup id="contentAreaContextMenu" pagemenu="start" + onpopupshowing="if (event.target != this) + return true; -+ gContextMenu = new nsContextMenu(this, gBrowser, event.shiftKey); ++ gContextMenu = new nsContextMenu(this, event.shiftKey); + if (gContextMenu.shouldDisplay) + updateEditUIVisibility(); + return gContextMenu.shouldDisplay;" @@ -399,29 +400,6 @@ + </hbox> + </panel> + -+ <panel id="allTabs-panel" hidden="true" norestorefocus="true" ignorekeys="true" -+ onmouseover="allTabs._updateTabCloseButton(event);"> -+ <hbox id="allTabs-meta" align="center"> -+ <spacer flex="1"/> -+ <textbox id="allTabs-filter" -+ tooltiptext="&allTabs.filter.emptyText;" -+ type="search" -+ oncommand="allTabs.filter();"/> -+ <spacer flex="1"/> -+ <toolbarbutton class="KUI-panel-closebutton" -+ oncommand="allTabs.close()" -+ tooltiptext="&closeCmd.label;"/> -+ </hbox> -+ <stack id="allTabs-stack"> -+ <vbox id="allTabs-container"><hbox/></vbox> -+ <toolbarbutton id="allTabs-tab-close-button" -+ class="tabs-closebutton" -+ oncommand="allTabs.closeTab(event);" -+ tooltiptext="&closeCmd.label;" -+ style="visibility:hidden"/> -+ </stack> -+ </panel> -+ + <!-- Bookmarks and history tooltip --> + <tooltip id="bhTooltip"/> + @@ -476,11 +454,23 @@ + <label id="geolocation-learnmore-link" class="text-link"/> + </popupnotificationcontent> + </popupnotification> ++ ++ <popupnotification id="mixed-content-blocked-notification" hidden="true"> ++ <popupnotificationcontent orient="vertical" align="start"> ++ <separator/> ++ <description id="mixed-content-blocked-moreinfo">&mixedContentBlocked.moreinfo;</description> ++ <separator/> ++ <label id="mixed-content-blocked-helplink" class="text-link" ++ value="&mixedContentBlocked.helplink;"/> ++ </popupnotificationcontent> ++ </popupnotification> ++ + </popupset> + +#ifdef CAN_DRAW_IN_TITLEBAR +<vbox id="titlebar"> + <hbox id="titlebar-content"> ++#ifdef MENUBAR_CAN_AUTOHIDE + <hbox id="appmenu-button-container"> + <button id="appmenu-button" + type="menu" @@ -489,6 +479,7 @@ +#include browser-appmenu.inc + </button> + </hbox> ++#endif + <spacer id="titlebar-spacer" flex="1"/> + <hbox id="titlebar-buttonbox-container" align="start"> + <hbox id="titlebar-buttonbox"> @@ -562,7 +553,7 @@ + <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true" + title="&locationItem.title;" class="chromeclass-location" removable="true"> + <textbox id="urlbar" flex="1" -+ placeholder="&urlbar.placeholder;" ++ placeholder="&urlbar.placeholder2;" + type="autocomplete" + autocompletesearch="urlinline history" + autocompletesearchparam="enable-actions" @@ -590,6 +581,7 @@ + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/> ++ <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> + </box> @@ -1110,7 +1102,9 @@ + persist="width"> + <browser id="social-sidebar-browser" + type="content" ++ context="contentAreaContextMenu" + disableglobalhistory="true" ++ tooltip="aHTMLTooltip" + flex="1" + style="min-width: 14em; width: 18em; max-width: 36em;"/> + </vbox> @@ -1139,6 +1133,7 @@ + </hbox> + + <vbox id="browser-bottombox" layer="true"> ++ <notificationbox id="global-notificationbox"/> + <toolbar id="developer-toolbar" + class="devtools-toolbar" + hidden="true"> @@ -1268,7 +1263,7 @@ #include "rdf.h" #include "nsFeedSniffer.h" -@@ -34,18 +34,16 @@ using namespace mozilla::browser; +@@ -31,18 +31,16 @@ using namespace mozilla::browser; ///////////////////////////////////////////////////////////////////////////// @@ -1287,8 +1282,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) -@@ -70,17 +68,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID) - NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); +@@ -60,17 +58,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME + NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID); #endif static const mozilla::Module::CIDEntry kBrowserCIDs[] = { @@ -1332,7 +1327,7 @@ // when the user will select the default. We refresh here periodically // in case the default changes. On other Windows OS's defaults can also // be set while the prefs are open. -@@ -791,14 +797,25 @@ var gAdvancedPane = { +@@ -792,14 +798,25 @@ var gAdvancedPane = { * Set browser as the operating system default browser. */ setDefaultBrowser: function() @@ -1794,9 +1789,9 @@ 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 -@@ -578,19 +578,21 @@ +@@ -588,19 +588,21 @@ @BINPATH@/defaults/autoconfig/prefcalls.js - @BINPATH@/defaults/profile/prefs.js + @BINPATH@/browser/defaults/profile/prefs.js #ifndef LIBXUL_SDK ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) @@ -1811,8 +1806,8 @@ #endif ; Services (gre) prefs - #ifdef MOZ_SERVICES_AITC - @BINPATH@/defaults/pref/services-aitc.js - #endif #ifdef MOZ_SERVICES_NOTIFICATIONS @BINPATH@/defaults/pref/services-notifications.js + #endif + #ifdef MOZ_SERVICES_SYNC + @BINPATH@/defaults/pref/services-sync.js ++++++ firefox-multilocale-chrome.patch ++++++ --- /var/tmp/diff_new_pack.2ROiWy/_old 2013-05-17 08:26:53.000000000 +0200 +++ /var/tmp/diff_new_pack.2ROiWy/_new 2013-05-17 08:26:53.000000000 +0200 @@ -1,12 +1,12 @@ # HG changeset patch +# Parent 4730f10113d354094e4c93aad9af5efa4abe15e0 # User Wolfgang Rosenauer <[email protected]> -# Parent 1352398be333989afdf06a2d87d63df9fed61333 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 -@@ -338,16 +338,20 @@ pref("browser.download.panel.shown", fal +@@ -341,16 +341,20 @@ pref("browser.download.panel.shown", fal pref("browser.download.panel.firstSessionCompleted", false); // search engines URL @@ -30,86 +30,122 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in -@@ -124,39 +124,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr - install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ; +@@ -71,20 +71,22 @@ UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(ST - install:: $(addprefix generic/profile/,$(PROFILE_FILES)) - $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile + STUB_HOOK = $(NSINSTALL) -D "$(_ABS_DIST)/$(PKG_INST_PATH)"; \ + $(RM) "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ + cp ../installer/windows/l10ngen/stub.exe "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ + chmod 0755 "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ + $(NULL) + endif + +-SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) ++SEARCHPLUGINS_NAMES = $(shell cat \ ++ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ ++ @srcdir@/en-US/searchplugins/list.txt ) ) + SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins + SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) +-PP_TARGETS += SEARCHPLUGINS ++#PP_TARGETS += SEARCHPLUGINS + + # Required for l10n.mk - defines a list of app sub dirs that should + # be included in langpack xpis. + ifdef MOZ_METRO + # metro build, include both app folders + DIST_SUBDIRS = browser metro + else + DIST_SUBDIRS = $(DIST_SUBDIR) +@@ -142,20 +144,44 @@ install:: $(addprefix generic/profile/,$ install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome --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 ) ) + # metro build calls back here for search engine plugins + searchplugins: $(addprefix $(FINAL_TARGET)/searchplugins/,$(SEARCHPLUGINS)) + .PHONY: searchplugins --libs:: $(addsuffix .xml,$(SEARCH_PLUGINS)) -- $(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 >> $@ ++ printf "$(foreach plugin,$(SEARCHPLUGINS), \n locale/browser/searchplugins/$(plugin) ($(plugin)))" >> $@ ++ @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)) -- $(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 ++searchplugins-jar:: $(SEARCHPLUGINS) ++ for SEARCHPLUGIN in $^; do \ ++ $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ ++ $$SEARCHPLUGIN > $$SEARCHPLUGIN-new ; \ ++ mv $$SEARCHPLUGIN-new $$SEARCHPLUGIN ; \ ++ done ++ ++searchplugins-jar:: 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 - -+libs:: searchplugins ++ ++libs:: searchplugins-jar + +GARBAGE += tmp-search.jar.mn - ++ libs-%: $(NSINSTALL) -D $(DIST)/install @$(MAKE) -C ../../toolkit/locales libs-$* @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* -+ @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$* ++ @$(MAKE) -B searchplugins-jar AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) + ifdef MOZ_METRO + @$(MAKE) -C ../metro/locales AB_CD=$* XPI_NAME=locale-$* + endif @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* - repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe - repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) - @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." +diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml +--- a/browser/locales/en-US/searchplugins/google.xml ++++ b/browser/locales/en-US/searchplugins/google.xml +@@ -9,24 +9,16 @@ + <Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABUUlEQVR42pWTzUsCYRCH9y9zu3SooCCkjhIRRLeIykXokiWCJ7PvDpZRlz6si1lIQZ3SQxQdOhREpgSm0JeQvfu0+i6I7LKLh4F5h5nnnRl+o6jTdHn8omAYbVqhXqvYFXcEBKFDwcoZZB8B4LkEB9cwGGmFKHb01A1EU9JXzfdvDYZi1lwLwBcVAIwsNWPesIwls7gDtB2Z7N9ujVe+IX2LO2AgItB1OL9vJqsmILDrOoK02IkBAdYy4FsQJC5h+VQCHQDWTqYSgo8fuHuRxS4Ae3stQ7UGE5ttAHqCUgfxC7m4ryrowOyeO6CxqHwZxtYFqtYc5+kNan/gDTsAeueEIRj7n/rmRQMwueUAGF0VAAT3rQBTC0Y3DoDOGbm00icML4oWHYSTgo0MFqjlmPpDgqMcFCuQf4erBzjOwXjcriu9qHg0uutO2+es6fl67T9ptebvFRjBVgAAAABJRU5ErkJggg==</Image> + <Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&q={searchTerms}"/> + <Url type="text/html" method="GET" template="https://www.google.com/search";> + <Param name="q" value="{searchTerms}"/> + <Param name="ie" value="utf-8"/> + <Param name="oe" value="utf-8"/> + <Param name="aq" value="t"/> + <Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/> +-#if MOZ_UPDATE_CHANNEL == beta +- <MozParam name="client" condition="defaultEngine" trueValue="firefox-beta" falseValue="firefox"/> +-#elif MOZ_UPDATE_CHANNEL == aurora +- <MozParam name="client" condition="defaultEngine" trueValue="firefox-aurora" falseValue="firefox"/> +-#elif MOZ_UPDATE_CHANNEL == nightly +- <MozParam name="client" condition="defaultEngine" trueValue="firefox-nightly" falseValue="firefox"/> +-#else + <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/> +-#endif + <MozParam name="channel" condition="purpose" purpose="contextmenu" value="rcs"/> + <MozParam name="channel" condition="purpose" purpose="keyword" value="fflb"/> + <MozParam name="channel" condition="purpose" purpose="homepage" value="np"/> + <MozParam name="source" condition="purpose" purpose="homepage" value="hp"/> + </Url> + <SearchForm>https://www.google.com/</SearchForm> + </SearchPlugin> diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -108,16 +108,17 @@ +@@ -115,16 +115,17 @@ + locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) + #endif + % locale browser-region @AB_CD@ %locale/browser-region/ 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) locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) ++ locale/browser/searchplugins/list.txt (%searchplugins/list.txt) % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd -+ locale/browser/searchplugins/list.txt (%searchplugins/list.txt) % locale testpilot @AB_CD@ %locale/feedback/ locale/feedback/main.dtd (%feedback/main.dtd) locale/feedback/main.properties (%feedback/main.properties) % locale pdf.js @AB_CD@ %locale/pdfviewer/ locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) - locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties) - #ifdef MOZ_WEBAPP_RUNTIME - ../webapprt/chrome/@[email protected]: ++++++ l10n-20.0.tar.bz2 -> l10n-21.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-20.0.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-21.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-gstreamer-760140.patch ++++++ --- /var/tmp/diff_new_pack.2ROiWy/_old 2013-05-17 08:26:53.000000000 +0200 +++ /var/tmp/diff_new_pack.2ROiWy/_new 2013-05-17 08:26:53.000000000 +0200 @@ -1,7 +1,6 @@ # HG changeset patch -# Parent 9fe99f8a584f2369a88bfb5281fd6bc95eb2593c -Bug 760140 - Query the GstRegistry for the required demuxers/decoders from canPlayType - +# Parent 74ba8ebd0dc72be84280bd4806f84d9ec1f4e130 +Bug 760140 - Query the GstRegistry for the required demuxers/decoders from canPlayType (TM: 22) diff --git a/content/media/DecoderTraits.cpp b/content/media/DecoderTraits.cpp --- a/content/media/DecoderTraits.cpp @@ -25,7 +24,7 @@ namespace mozilla { -@@ -137,48 +139,35 @@ +@@ -137,48 +139,35 @@ DecoderTraits::IsWebMType(const nsACStri return false; } @@ -75,7 +74,7 @@ "audio/mp4", "video/mp4", "video/3gpp", -@@ -190,19 +179,17 @@ +@@ -190,19 +179,17 @@ bool DecoderTraits::IsOmxSupportedType(const nsACString& aType) { if (!MediaDecoder::IsOmxEnabled()) { @@ -95,7 +94,7 @@ "avc1.64001E", // H.264 High Profile Level 3.0 "avc1.64001F", // H.264 High Profile Level 3.1 "mp4v.20.3", // 3GPP -@@ -303,19 +290,19 @@ +@@ -303,19 +290,19 @@ DecoderTraits::CanHandleMediaType(const #ifdef MOZ_DASH if (IsDASHMPDType(nsDependentCString(aMIMEType))) { // DASH manifest uses WebM codecs only. @@ -118,7 +117,7 @@ result = CANPLAY_MAYBE; } #endif -@@ -324,17 +311,17 @@ +@@ -324,17 +311,17 @@ DecoderTraits::CanHandleMediaType(const result = CANPLAY_MAYBE; } #endif @@ -140,14 +139,14 @@ diff --git a/content/media/DecoderTraits.h b/content/media/DecoderTraits.h --- a/content/media/DecoderTraits.h +++ b/content/media/DecoderTraits.h -@@ -49,17 +49,16 @@ - #endif - +@@ -51,17 +51,16 @@ public: #ifdef MOZ_WEBM static bool IsWebMType(const nsACString& aType); #endif #ifdef MOZ_GSTREAMER + // When enabled, use GStreamer for H.264, but not for codecs handled by our + // bundled decoders, unless the "media.prefer-gstreamer" pref is set. static bool IsGStreamerSupportedType(const nsACString& aType); - static bool IsH264Type(const nsACString& aType); #endif @@ -447,7 +446,7 @@ diff --git a/content/media/gstreamer/Makefile.in b/content/media/gstreamer/Makefile.in --- a/content/media/gstreamer/Makefile.in +++ b/content/media/gstreamer/Makefile.in -@@ -13,21 +13,23 @@ +@@ -13,21 +13,23 @@ include $(DEPTH)/config/autoconf.mk MODULE = content LIBRARY_NAME = gkcongstreamer_s LIBXUL_LIBRARY = 1 @@ -474,7 +473,7 @@ diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in -@@ -316,16 +316,20 @@ +@@ -318,16 +318,20 @@ LOCAL_INCLUDES += -I$(srcdir)/../base \ -I$(topsrcdir)/js/xpconnect/loader \ -I$(topsrcdir)/caps/include \ -I$(topsrcdir)/netwerk/base/src \ @@ -498,7 +497,7 @@ diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp --- a/layout/build/nsLayoutStatics.cpp +++ b/layout/build/nsLayoutStatics.cpp -@@ -78,16 +78,20 @@ +@@ -79,16 +79,20 @@ #ifdef MOZ_MEDIA_PLUGINS #include "MediaPluginHost.h" #endif @@ -515,11 +514,11 @@ #include "AudioStream.h" #endif - #include "nsError.h" - - #include "nsCycleCollector.h" - #include "nsJSEnvironment.h" -@@ -336,16 +340,20 @@ + #ifdef MOZ_WIDGET_GONK + #include "nsVolumeService.h" + using namespace mozilla::system; + #endif +@@ -344,16 +348,20 @@ nsLayoutStatics::Shutdown() nsXBLService::Shutdown(); nsAutoCopyListener::Shutdown(); FrameLayerBuilder::Shutdown(); ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.2ROiWy/_old 2013-05-17 08:26:53.000000000 +0200 +++ /var/tmp/diff_new_pack.2ROiWy/_new 2013-05-17 08:26:53.000000000 +0200 @@ -44,7 +44,7 @@ #include "prefread.h" #include "prefapi_private_data.h" -@@ -946,16 +947,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -966,16 +967,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -79,7 +79,7 @@ return NS_OK; bool hasMore; -@@ -971,17 +990,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -991,17 +1010,17 @@ static nsresult pref_LoadPrefsInDirList( nsAutoCString leaf; path->GetNativeLeafName(leaf); @@ -98,7 +98,7 @@ { nsZipItemPtr<char> manifest(jarReader, name, true); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); -@@ -1075,28 +1094,40 @@ static nsresult pref_InitInitialObjects( +@@ -1095,28 +1114,40 @@ static nsresult pref_InitInitialObjects( /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ static const char* specialFiles[] = { #if defined(XP_MACOSX) @@ -139,6 +139,48 @@ // or jar:$gre/omni.jar!/defaults/preferences/*.js. nsRefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP); // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which +diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py +--- a/python/mozbuild/mozpack/chrome/flags.py ++++ b/python/mozbuild/mozpack/chrome/flags.py +@@ -208,16 +208,17 @@ class Flags(OrderedDict): + 'platformversion': VersionFlag, + 'contentaccessible': Flag, + 'os': StringFlag, + 'osversion': VersionFlag, + 'abi': StringFlag, + 'platform': Flag, + 'xpcnativewrappers': Flag, + 'tablet': Flag, ++ 'desktop': StringFlag, + } + RE = re.compile(r'([!<>=]+)') + + def __init__(self, *flags): + ''' + Initialize a set of flags given in string form. + flags = Flags('contentaccessible=yes', 'appversion>=3.5') + ''' +diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py +--- a/python/mozbuild/mozpack/chrome/manifest.py ++++ b/python/mozbuild/mozpack/chrome/manifest.py +@@ -30,16 +30,17 @@ class ManifestEntry(object): + allowed_flags = [ + 'application', + 'platformversion', + 'os', + 'osversion', + 'abi', + 'xpcnativewrappers', + 'tablet', ++ 'desktop', + ] + + def __init__(self, base, *flags): + ''' + Initialize a manifest entry with the given base path and flags. + ''' + self.base = base + self.flags = Flags(*flags) diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in @@ -158,7 +200,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp --- a/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp -@@ -41,16 +41,20 @@ +@@ -38,16 +38,20 @@ #ifdef XP_WIN #include <shlobj.h> @@ -179,7 +221,7 @@ #include "AndroidBridge.h" #endif -@@ -2739,16 +2743,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2590,16 +2594,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -205,7 +247,7 @@ int64_t goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2775,19 +2788,20 @@ nsDownload::SetState(DownloadState aStat +@@ -2626,19 +2639,20 @@ nsDownload::SetState(DownloadState aStat // retention policy, there's no reason to make the text clickable // because if it is, they'll click open the download manager and // the items they downloaded will have been removed. @@ -2162,7 +2204,7 @@ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -69,17 +69,18 @@ else +@@ -72,17 +72,18 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CMMSRCS = nsNativeAppSupportCocoa.mm EXPORTS += MacQuirks.h @@ -2582,7 +2624,7 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in -@@ -58,18 +58,19 @@ LOCAL_INCLUDES = -I$(srcdir) +@@ -59,18 +59,19 @@ LOCAL_INCLUDES = -I$(srcdir) LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ -I$(topsrcdir)/content/base/src \ ++++++ mozilla-repo.patch ++++++ --- /var/tmp/diff_new_pack.2ROiWy/_old 2013-05-17 08:26:53.000000000 +0200 +++ /var/tmp/diff_new_pack.2ROiWy/_new 2013-05-17 08:26:53.000000000 +0200 @@ -1,73 +1,30 @@ # HG changeset patch -# Parent 7820633b718ca1983da7b105d7868c455809cff1 +# Parent 8d013204e3f06811daf5156939452765fb3e10bb -diff --git a/build/Makefile.in b/build/Makefile.in ---- a/build/Makefile.in -+++ b/build/Makefile.in -@@ -62,17 +62,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ - APP_INI_DEPS += $(DEPTH)/config/autoconf.mk - - MOZ_SOURCE_STAMP := $(firstword $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg parent --template="{node|short}\n" 2>/dev/null)) - ifdef MOZ_SOURCE_STAMP - DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)" - endif - - _dollar=$$ --SOURCE_REPO := $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) -+SOURCE_REPO ?= $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) - ifdef SOURCE_REPO - DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)" - endif - - DEFINES += \ - -DMOZ_APP_BASENAME="$(MOZ_APP_BASENAME)" \ - -DMOZ_APP_VENDOR="$(MOZ_APP_VENDOR)" \ - -DMOZ_APP_ID="$(MOZ_APP_ID)" \ -diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in ---- a/toolkit/content/Makefile.in -+++ b/toolkit/content/Makefile.in -@@ -35,17 +35,17 @@ endif - ifeq (Android,$(OS_TARGET)) - DEFINES += -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) - endif - - # strip a trailing slash from the repo URL because it's not always present, - # and we want to construct a working URL in buildconfig.html - # make+shell+sed = awful - _dollar=$$ --SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) -+SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) - # extra sanity check for old versions of hg - # that don't support showconfig - ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) - DEFINES += -DSOURCE_REPO="$(SOURCE_REPO)" - endif - - BUILD_HOSTNAME = $(shell hostname -s || hostname) - DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)" 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 -@@ -131,22 +131,22 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME - TEST_PACKAGE = $(PKG_BASENAME).tests.zip - - ifneq (,$(wildcard $(DIST)/bin/application.ini)) - BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID) - else +@@ -138,23 +138,23 @@ else BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) endif + ifndef INCLUDED_RCS_MK + USE_RCS_MK := 1 + include $(topsrcdir)/config/makefiles/makeutils.mk + endif + -MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) +#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) - # strip a trailing slash from the repo URL because it's not always present, - # and we want to construct a working URL in the sourcestamp file. - # make+shell+sed = awful - _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_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) + ########################################################################### + # bug: 746277 - preserve existing functionality. + # MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists + ########################################################################### +-MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) ++#MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) - MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_SOURCESTAMP_FILE_BASENAME).txt + MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt + MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json # JavaScript Shell PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip @@ -76,28 +33,22 @@ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -218,20 +218,20 @@ endif +@@ -214,17 +214,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR + endif + endif MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) ifdef MOZ_SOURCE_STAMP INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) - # strip a trailing slash from the repo URL because it's not always present, - # and we want to construct a working URL in buildconfig.html -- SOURCE_REPO := $(firstword $(shell hg --repository $(topsrcdir) showconfig paths.default 2>/dev/null)) -- SOURCE_REPO := $(strip $(SOURCE_REPO)) -- SOURCE_REPO := $(patsubst ssh://%,http://%,$(SOURCE_REPO)) -- SOURCE_REPO := $(patsubst %/,%,$(SOURCE_REPO)) -+ SOURCE_REPO ?= $(firstword $(shell hg --repository $(topsrcdir) showconfig paths.default 2>/dev/null)) -+ SOURCE_REPO ?= $(strip $(SOURCE_REPO)) -+ SOURCE_REPO ?= $(patsubst ssh://%,http://%,$(SOURCE_REPO)) -+ SOURCE_REPO ?= $(patsubst %/,%,$(SOURCE_REPO)) - - # command set should change based on revision control use. - # warn for now in case (git, bzr, ...) is in use. - $(call warnIfEmpty,SOURCE_REPO) +- source_repo := $(call getSourceRepo) ++ source_repo ?= $(call getSourceRepo) # extra sanity check for old versions of hg, no showconfig support - ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) - INIARGS += --sourcerepo=$(SOURCE_REPO) + ifneq (,$(filter http%,$(source_repo))) + INIARGS += --sourcerepo=$(source_repo) + endif + + endif # MOZ_SOURCE_STAMP + ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.2ROiWy/_old 2013-05-17 08:26:53.000000000 +0200 +++ /var/tmp/diff_new_pack.2ROiWy/_new 2013-05-17 08:26:53.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8275,16 +8275,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8191,16 +8191,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -42,13 +42,13 @@ diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in -@@ -92,16 +92,19 @@ DEFINES += \ - $(NULL) +@@ -97,16 +97,19 @@ DEFINES += \ EXPORTS += \ CryptoTask.h \ nsNSSShutDown.h \ ScopedNSSTypes.h \ + nsRandomGenerator.h \ $(NULL) +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) @@ -89,7 +89,7 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" #include "nsDirectoryService.h" -@@ -1682,18 +1689,34 @@ nsNSSComponent::InitializeNSS(bool showW +@@ -1679,18 +1686,34 @@ nsNSSComponent::InitializeNSS(bool showW ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs @@ -129,7 +129,7 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -500,17 +500,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO +@@ -504,17 +504,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif endif ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.2ROiWy/_old 2013-05-17 08:26:53.000000000 +0200 +++ /var/tmp/diff_new_pack.2ROiWy/_new 2013-05-17 08:26:53.000000000 +0200 @@ -1,2 +1,2 @@ -REV=c90d44bfa96c +REV=916fdce8831c REPO=http://hg.mozilla.org/releases/mozilla-release -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
