diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 1529219..24c5bbd 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,8 +1,29 @@ ------------------------------------------------------------------- -Fri Aug 29 16:39:43 UTC 2014 - wr@rosenauer.org +Sat Sep 20 13:33:51 UTC 2014 - wr@rosenauer.org -- update to Firefox 31.1.0esr (bnc#894370) - * MFSA 2014-67/CVE-2014-1553/CVE-2014-1562 +- update to Firefox 32.0.2 + * just a version bump for our builds + * fixed the in application update process for certain environments + (in application update is not enabled in openSUSE and Linux + is unaffected in any case) +- build with --disable-optimize for 13.1 and above for i586 to + workaround miscompilations (bnc#896624) + +------------------------------------------------------------------- +Sat Sep 13 16:58:16 UTC 2014 - wr@rosenauer.org + +- update to Firefox 32.0.1 + * fixed stability issues for computers with multiple graphics cards + * mixed content icon may be incorrectly displayed instead of lock + icon for SSL sites in 32.0 ( + * WebRTC: setRemoteDescription() silently fails if no success + callback is specified (bmo#1063971) + +------------------------------------------------------------------- +Sun Aug 31 07:44:54 UTC 2014 - wr@rosenauer.org + +- update to Firefox 32.0 (bnc#894370) + * MFSA 2014-67/CVE-2014-1553/CVE-2014-1554/CVE-2014-1562 Miscellaneous memory safety hazards * MFSA 2014-68/CVE-2014-1563 (bmo#1018524) Use-after-free during DOM interactions with SVG @@ -12,10 +33,10 @@ Fri Aug 29 16:39:43 UTC 2014 - wr@rosenauer.org Out-of-bounds read in Web Audio audio timeline * MFSA 2014-72/CVE-2014-1567 (bmo#1037641) Use-after-free setting text directionality -- changes to support compilation on 11.4 - * explicit xz BuildRequires - * mozilla-nullptr-gcc45.patch - * remove unresolved makeinfo BuildRequires +- rebased patches +- requires NSS 3.16.4 +- removed upstreamed patch + * mozilla-aarch64-bmo-810631.patch ------------------------------------------------------------------- Wed Aug 20 13:50:58 CEST 2014 - behlert@suse.de diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index fd5db24..1555370 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -17,9 +17,9 @@ # -%define major 31 -%define mainver %major.1.0 -%define update_channel esr31 +%define major 32 +%define mainver %major.0.2 +%define update_channel release %if %suse_version > 1210 %if %suse_version > 1310 @@ -40,15 +40,12 @@ BuildRequires: libcurl-devel BuildRequires: libgnomeui-devel BuildRequires: libidl-devel BuildRequires: libnotify-devel -%if %suse_version > 1140 BuildRequires: makeinfo -%endif BuildRequires: python-devel BuildRequires: startup-notification-devel BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: xorg-x11-libXt-devel -BuildRequires: xz BuildRequires: yasm BuildRequires: zip %if %suse_version > 1110 @@ -58,7 +55,7 @@ BuildRequires: libproxy-devel BuildRequires: wireless-tools %endif BuildRequires: mozilla-nspr-devel >= 4.10.6 -BuildRequires: mozilla-nss-devel >= 3.16.2 +BuildRequires: mozilla-nss-devel >= 3.16.4 BuildRequires: nss-shared-helper-devel BuildRequires: pkgconfig(libpulse) %if %suse_version > 1210 @@ -77,7 +74,7 @@ Recommends: gstreamer-0_10-plugins-ffmpeg %endif Version: %{mainver} Release: 0 -%define releasedate 2014082900 +%define releasedate 2014091200 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -120,9 +117,6 @@ Patch11: mozilla-icu-strncat.patch Patch12: mozilla-arm-disable-edsp.patch Patch13: mozilla-ppc.patch Patch14: mozilla-libproxy-compat.patch -Patch15: mozilla-nullptr-gcc45.patch -# Gecko/Toolkit AArch64 Porting -Patch30: mozilla-aarch64-bmo-810631.patch # Firefox/browser Patch101: firefox-kde.patch @@ -263,8 +257,6 @@ cd $RPM_BUILD_DIR/mozilla %patch12 -p1 %patch13 -p1 %patch14 -p1 -%patch15 -p1 -%patch30 -p1 # Firefox %patch101 -p1 @@ -317,6 +309,14 @@ ac_add_options --libdir=%{_libdir} ac_add_options --sysconfdir=%{_sysconfdir} ac_add_options --mandir=%{_mandir} ac_add_options --includedir=%{_includedir} +ac_add_options --enable-release +ac_add_options --enable-stdcxx-compat +%ifarch %ix86 +%if %suse_version > 1230 +ac_add_options --disable-optimize +%endif +%endif +ac_add_options --enable-elf-hack ac_add_options --with-system-nspr ac_add_options --with-system-nss %if %{localize} diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz index a321c5e..ee6916c 100644 --- a/compare-locales.tar.xz +++ b/compare-locales.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:328677ca3556b96d5ef845ebb60766e4c786b272baae7ef890a7bb86b0962fa7 -size 28428 +oid sha256:4f2b695fb8fdc9ab44ec1187eb30726c0689b4fffbddafb49f2edcb706a6a0b3 +size 28432 diff --git a/create-tar.sh b/create-tar.sh index b5283fe..2ccfac5 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -1,9 +1,9 @@ #!/bin/bash -CHANNEL="esr31" +CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_31_1_0esr_RELEASE" -VERSION="31.1.0" +RELEASE_TAG="FIREFOX_32_0_2_RELEASE" +VERSION="32.0.2" # mozilla if [ -d mozilla ]; then @@ -47,7 +47,7 @@ for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do ;; *) echo "fetching $locale ..." - hg clone http://hg.mozilla.org/releases/l10n/mozilla-release/$locale l10n/$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 diff --git a/firefox-31.1.0-source.tar.xz b/firefox-31.1.0-source.tar.xz deleted file mode 100644 index 7dae33e..0000000 --- a/firefox-31.1.0-source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:625cef5c1d416a19050fe897afee340f1635cfd52c956b5016a2f5424f7cad5d -size 125750996 diff --git a/firefox-32.0.2-source.tar.xz b/firefox-32.0.2-source.tar.xz new file mode 100644 index 0000000..dd645e2 --- /dev/null +++ b/firefox-32.0.2-source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42a568ca3517cfc1bb934a2acc9fcf8d087941f44b580708ace46348aead6256 +size 127358108 diff --git a/firefox-branded-icons.patch b/firefox-branded-icons.patch index 7cbbdbd..589be61 100644 --- a/firefox-branded-icons.patch +++ b/firefox-branded-icons.patch @@ -1,10 +1,10 @@ # HG changeset patch -# Parent 9745e5d5cdc7e91dbfc5582b49881668cb6725f7 +# Parent 17ccae9100af86bc65f924b87545184af2f4ada9 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -76,16 +76,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d +@@ -75,16 +75,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d endif ifdef MOZ_WIDGET_GTK @@ -54,7 +54,7 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/M 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 -@@ -613,18 +613,21 @@ +@@ -629,18 +629,21 @@ @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png @BINPATH@/chrome/toolkit@JAREXT@ @@ -70,9 +70,9 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m +@BINPATH@/browser/chrome/icons/default/default256.png #endif - ; shell icons - #ifdef XP_UNIX - #ifndef XP_MACOSX - ; shell icons - @BINPATH@/browser/icons/*.png - #ifdef MOZ_UPDATER + ; [Webide Files] + #ifdef MOZ_DEVTOOLS_WEBIDE + @BINPATH@/browser/chrome/webide@JAREXT@ + @BINPATH@/browser/chrome/webide.manifest + @BINPATH@/browser/@PREF_DIR@/webide-prefs.js + #endif diff --git a/firefox-kde.patch b/firefox-kde.patch index 7427308..82ad85e 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,1197 @@ +@@ -0,0 +1,1206 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -106,6 +106,12 @@ new file mode 100644 + accesskey="&moveToNewWindow.accesskey;" + tbattr="tabbrowser-multiple" + oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> ++#ifdef E10S_TESTING_ONLY ++