# HG changeset patch # User Wolfgang Rosenauer # Date 1404910582 -7200 # Node ID 72ba5129e5fd34f6e6e9d2836d4f4bd3f1aedbb2 # Parent b441942b2a3f676db880785abefd6784488fe159 full rebase to Aurora 32 diff -r b441942b2a3f -r 72ba5129e5fd MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Thu Jun 12 22:59:33 2014 +0200 +++ b/MozillaFirefox/MozillaFirefox.changes Wed Jul 09 14:56:22 2014 +0200 @@ -1,18 +1,20 @@ ------------------------------------------------------------------- -Thu Jun 12 20:58:31 UTC 2014 - wr@rosenauer.org - -- update to Aurora 32 (20140611) +Wed Jul 9 05:13:39 UTC 2014 - wr@rosenauer.org + +- update to Aurora 32 (20140707) +- rebased patches +- requires NSS 3.16.3 +- removed upstreamed patch + * mozilla-aarch64-bmo-810631.patch + +------------------------------------------------------------------- +Sat Jul 5 12:28:20 UTC 2014 - wr@rosenauer.org + +- update to Firefox 31beta7 - rebased patches - requires NSS 3.16.2 ------------------------------------------------------------------- -Thu Jun 12 15:41:45 UTC 2014 - wr@rosenauer.org - -- update to Firefox 31beta1 -- rebased patches -- requires NSS 3.16.1 - -------------------------------------------------------------------- Mon Jun 9 08:28:17 UTC 2014 - wr@rosenauer.org - update to Firefox 30.0 (bnc#881874) diff -r b441942b2a3f -r 72ba5129e5fd MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Thu Jun 12 22:59:33 2014 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Wed Jul 09 14:56:22 2014 +0200 @@ -55,7 +55,7 @@ BuildRequires: wireless-tools %endif BuildRequires: mozilla-nspr-devel >= 4.10.6 -BuildRequires: mozilla-nss-devel >= 3.16.2 +BuildRequires: mozilla-nss-devel >= 3.16.3 BuildRequires: nss-shared-helper-devel BuildRequires: pkgconfig(libpulse) %if %suse_version > 1210 @@ -117,8 +117,6 @@ Patch12: mozilla-arm-disable-edsp.patch Patch13: mozilla-ppc.patch Patch14: mozilla-libproxy-compat.patch -# Gecko/Toolkit AArch64 Porting -Patch30: mozilla-aarch64-bmo-810631.patch # Firefox/browser Patch101: firefox-kde.patch @@ -259,7 +257,6 @@ %patch12 -p1 %patch13 -p1 %patch14 -p1 -%patch30 -p1 # Firefox %patch101 -p1 diff -r b441942b2a3f -r 72ba5129e5fd MozillaFirefox/mozilla-aarch64-bmo-810631.patch --- a/MozillaFirefox/mozilla-aarch64-bmo-810631.patch Thu Jun 12 22:59:33 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-aarch64-bmo-810631.patch \ No newline at end of file diff -r b441942b2a3f -r 72ba5129e5fd firefox-branded-icons.patch --- a/firefox-branded-icons.patch Thu Jun 12 22:59:33 2014 +0200 +++ b/firefox-branded-icons.patch Wed Jul 09 14:56:22 2014 +0200 @@ -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/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 @@ +@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 -r b441942b2a3f -r 72ba5129e5fd firefox-kde.patch --- a/firefox-kde.patch Thu Jun 12 22:59:33 2014 +0200 +++ b/firefox-kde.patch Wed Jul 09 14:56:22 2014 +0200 @@ -2,7 +2,7 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1197 @@ +@@ -0,0 +1,1205 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -106,6 +106,12 @@ + accesskey="&moveToNewWindow.accesskey;" + tbattr="tabbrowser-multiple" + oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> ++#ifdef E10S_TESTING_ONLY ++