diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 88687d4..0f8c23e 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 10 05:25:39 UTC 2013 - wr@rosenauer.org + +- update to Firefox 21.0 (bnc#819204) + * removed upstreamed patch firefox-712763.patch + * removed disabled mozilla-disable-neon-option.patch + ------------------------------------------------------------------- Tue Apr 9 06:41:31 UTC 2013 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index cf8c50e..15fd836 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -17,7 +17,7 @@ # -%define major 20 +%define major 21 %define mainver %major.0 %define update_channel release @@ -50,7 +50,7 @@ BuildRequires: libproxy-devel %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 @@ BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver) %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 @@ Patch7: mozilla-language.patch 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 @@ Patch32: firefox-kde-114.patch 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 @@ -234,7 +231,6 @@ cd $RPM_BUILD_DIR/mozilla %if %suse_version < 1120 %patch10 -p1 %endif -#%patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 @@ -250,7 +246,6 @@ cd $RPM_BUILD_DIR/mozilla %patch33 -p1 %patch34 -p1 %patch35 -p1 -%patch36 -p1 %build # no need to add build time to binaries @@ -267,6 +262,7 @@ fi 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_STAMP=$REV 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 @@ for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales); 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/langpack-$locale@firefox.mozilla.org + $RPM_BUILD_ROOT%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org # remove prefs, profile defaults, and hyphenation from langpack - rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org/defaults - rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org/hyphenation + rm -rf $RPM_BUILD_ROOT%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/defaults + rm -rf $RPM_BUILD_ROOT%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/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/langpack-$locale@firefox.mozilla.org \ + echo %{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org \ >> %{_tmppath}/translations.$_l10ntarget esac done @@ -437,15 +433,15 @@ cp %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man1/%{progname}.1 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 @@ exit 0 %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 @@ exit 0 %{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 @@ exit 0 %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 diff --git a/_constraints b/_constraints index ed2eb3c..10b0e57 100644 --- a/_constraints +++ b/_constraints @@ -5,7 +5,7 @@ 9 - 2900 + 3000 diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2 index c85f481..8ba15d3 100644 --- a/compare-locales.tar.bz2 +++ b/compare-locales.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0e042a5181e3c8f2b2be7ca1673dbe4365f2d82af05598be6ece0af018cc3c2 -size 29925 +oid sha256:a6b38994b271f8498932fff247fca46f9c629d2dd571027fdf5091153c88e13a +size 29950 diff --git a/create-tar.sh b/create-tar.sh index d7b115b..2ea5cda 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -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 diff --git a/firefox-20.0-source.tar.bz2 b/firefox-20.0-source.tar.bz2 deleted file mode 100644 index 1d1d2f0..0000000 --- a/firefox-20.0-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:26d3c849859242fda66e6946daca119e6942eb7b5ce0ef96e4bd878cb5057d47 -size 101075320 diff --git a/firefox-21.0-source.tar.bz2 b/firefox-21.0-source.tar.bz2 new file mode 100644 index 0000000..7bad723 --- /dev/null +++ b/firefox-21.0-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a8d8467808cb7a80eeef50492fe4c7e707cdfd3e5d268d71edddfea1924fbbe +size 106610208 diff --git a/firefox-712763.patch b/firefox-712763.patch deleted file mode 100644 index 3ae1156..0000000 --- a/firefox-712763.patch +++ /dev/null @@ -1,95 +0,0 @@ -# HG changeset patch -# User Tim Taubert -# Date 1358185823 -3600 -# Node ID f7a2af238d06c17d10c49c94ef860434d5b76758 -Bug 712763 - Backout changes from bug 669272 to keep original window order when restoring a session - -diff --git a/browser/components/sessionstore/src/SessionStore.jsm b/browser/components/sessionstore/src/SessionStore.jsm ---- a/browser/components/sessionstore/src/SessionStore.jsm -+++ b/browser/components/sessionstore/src/SessionStore.jsm -@@ -1757,23 +1757,16 @@ let SessionStoreInternal = { - - // We want to re-use the last opened window instead of opening a new one in - // the case where it's "empty" and not associated with a window in the session. - // We will do more processing via _prepWindowToRestoreInto if we need to use - // the lastWindow. - let lastWindow = this._getMostRecentBrowserWindow(); - let canUseLastWindow = lastWindow && - !lastWindow.__SS_lastSessionWindowID; -- let lastSessionFocusedWindow = null; -- this.windowToFocus = lastWindow; -- -- // move the last focused window to the start of the array so that we -- // minimize window movement (see bug 669272) -- lastSessionState.windows.unshift( -- lastSessionState.windows.splice(lastSessionState.selectedWindow - 1, 1)[0]); - - // Restore into windows or open new ones as needed. - for (let i = 0; i < lastSessionState.windows.length; i++) { - let winState = lastSessionState.windows[i]; - let lastSessionWindowID = winState.__lastSessionWindowID; - // delete lastSessionWindowID so we don't add that to the window again - delete winState.__lastSessionWindowID; - -@@ -1801,28 +1794,19 @@ let SessionStoreInternal = { - // Restore into that window - pretend it's a followup since we'll already - // have a focused window. - //XXXzpao This is going to merge extData together (taking what was in - // winState over what is in the window already. The hack we have - // in _preWindowToRestoreInto will prevent most (all?) Panorama - // weirdness but we will still merge other extData. - // Bug 588217 should make this go away by merging the group data. - this.restoreWindow(windowToUse, { windows: [winState] }, canOverwriteTabs, true); -- if (i == 0) -- lastSessionFocusedWindow = windowToUse; -- -- // if we overwrote the tabs for our last focused window, we should -- // give focus to the window that had it in the previous session -- if (canOverwriteTabs && windowToUse == lastWindow) -- this.windowToFocus = lastSessionFocusedWindow; - } - else { -- let win = this._openWindowWithState({ windows: [winState] }); -- if (i == 0) -- lastSessionFocusedWindow = win; -+ this._openWindowWithState({ windows: [winState] }); - } - } - - // Merge closed windows from this session with ones from last session - if (lastSessionState._closedWindows) { - this._closedWindows = this._closedWindows.concat(lastSessionState._closedWindows); - this._capClosedWindows(); - } -@@ -2735,27 +2719,27 @@ let SessionStoreInternal = { - this._setWindowStateBusy(aWindow); - - if (root._closedWindows) - this._closedWindows = root._closedWindows; - - var winData; - if (!root.selectedWindow || root.selectedWindow > root.windows.length) { - root.selectedWindow = 0; -- } else { -- // put the selected window at the beginning of the array to ensure that -- // it gets restored first -- root.windows.unshift(root.windows.splice(root.selectedWindow - 1, 1)[0]); - } -+ - // open new windows for all further window entries of a multi-window session - // (unless they don't contain any tab data) - for (var w = 1; w < root.windows.length; w++) { - winData = root.windows[w]; - if (winData && winData.tabs && winData.tabs[0]) { - var window = this._openWindowWithState({ windows: [winData] }); -+ if (w == root.selectedWindow - 1) { -+ this.windowToFocus = window; -+ } - } - } - winData = root.windows[0]; - if (!winData.tabs) { - winData.tabs = []; - } - // don't restore a single blank tab when we've had an external - // URL passed in for loading at startup (cf. bug 357419) diff --git a/firefox-branded-icons.patch b/firefox-branded-icons.patch index 12c275a..18929d7 100644 --- a/firefox-branded-icons.patch +++ b/firefox-branded-icons.patch @@ -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/app/Makefile.in b/browser/app/Makefile.in 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 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/M + 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/testpilot@labs.mozilla.com.xpi + @BINPATH@/browser/distribution/extensions/testpilot@labs.mozilla.com.xpi #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 diff --git a/firefox-kde.patch b/firefox-kde.patch index de496d1..cddce15 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1221 @@ +@@ -0,0 +1,1216 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -189,7 +189,7 @@ new file mode 100644 + align="start" + role="alert"> + -+ ++ + + + @@ -270,7 +270,6 @@ new file mode 100644 + class="social-panel" + type="arrow" + hidden="true" -+ consumeoutsideclicks="true" + noautofocus="true"/> + + -+ -+ + + + @@ -476,11 +454,23 @@ new file mode 100644 +