# HG changeset patch # User Wolfgang Rosenauer # Date 1401308223 -7200 # Node ID f118b88b7d7f35b09190e0dffd52d1992f438f59 # Parent b2202fea7983a2d58003e55889ff62affbad03b0 Aurora 31 update diff -r b2202fea7983 -r f118b88b7d7f MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Sat May 03 10:14:44 2014 +0200 +++ b/MozillaFirefox/MozillaFirefox.changes Wed May 28 22:17:03 2014 +0200 @@ -1,7 +1,14 @@ ------------------------------------------------------------------- -Thu May 1 15:35:25 UTC 2014 - wr@rosenauer.org - -- update to Firefox 30.0b1 +Wed May 28 20:15:32 UTC 2014 - wr@rosenauer.org + +- update to Aurora 31 (20140527) +- rebased patches +- requires NSPR 4.10.5 and NSS 3.16.1 + +------------------------------------------------------------------- +Thu May 15 07:27:58 UTC 2014 - wr@rosenauer.org + +- update to Firefox 30.0b4 - rebased patches - removed obsolete patches * firefox-browser-css.patch @@ -19,8 +26,13 @@ - enabled GStreamer 1.0 usage for 13.2 and above ------------------------------------------------------------------- -Thu May 1 15:29:04 UTC 2014 - wr@rosenauer.org - +Sat May 10 06:09:37 UTC 2014 - wr@rosenauer.org + +- update to Firefox 29.0.1 + * Seer disabled by default (bmo#1005958) + * Session Restore failed with a corrupted sessionstore.js file + (bmo#1001167) + * pdf.js printing white page (bmo#1003707, bnc#876833) - general.useragent.locale gets overwritten with en-US while it should be using the active langpack's setting diff -r b2202fea7983 -r f118b88b7d7f MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Sat May 03 10:14:44 2014 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Wed May 28 22:17:03 2014 +0200 @@ -74,7 +74,7 @@ %endif Version: %{mainver} Release: 0 -%define releasedate 2014050300 +%define releasedate 2014052700 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser diff -r b2202fea7983 -r f118b88b7d7f firefox-branded-icons.patch --- a/firefox-branded-icons.patch Sat May 03 10:14:44 2014 +0200 +++ b/firefox-branded-icons.patch Wed May 28 22:17:03 2014 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent ab6659ccbfbbfed31bce1bcd696a820069b9d7c0 +# Parent 9745e5d5cdc7e91dbfc5582b49881668cb6725f7 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in @@ -29,13 +29,13 @@ 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 -@@ -36,18 +36,21 @@ BRANDING_FILES := \ +@@ -35,18 +35,21 @@ BRANDING_FILES := \ document.icns \ dsstore \ $(NULL) endif - ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) + ifdef MOZ_WIDGET_GTK BRANDING_FILES := \ default16.png \ + default22.png \ @@ -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 -@@ -611,18 +611,21 @@ +@@ -613,18 +613,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@ diff -r b2202fea7983 -r f118b88b7d7f firefox-kde.patch --- a/firefox-kde.patch Sat May 03 10:14:44 2014 +0200 +++ b/firefox-kde.patch Wed May 28 22:17:03 2014 +0200 @@ -2,7 +2,7 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1213 @@ +@@ -0,0 +1,1197 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -554,7 +554,7 @@ + iconsize="small" + aria-label="&tabsToolbar.label;" + context="toolbar-context-menu" -+ defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton" ++ defaultset="tabbrowser-tabs,new-tab-button,alltabs-button" + collapsed="true"> + +#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT) @@ -605,13 +605,6 @@ + + + -+ -+ +#if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT) + +#endif @@ -651,7 +644,7 @@ + + + + -+ -+ -+ ++ ++ + + + ++ ++ + + ++ + + + @@ -1064,7 +1057,7 @@ + + + @@ -1191,22 +1184,13 @@ + + +#include tab-shape.inc.svg -+ ++ +#ifndef XP_MACOSX -+ -+ -+ -+ -+ ++ ++#else ++ ++#endif + -+#else -+ -+ -+ -+ -+ -+ -+#endif + + + @@ -1219,7 +1203,7 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -66,16 +66,18 @@ browser.jar: +@@ -65,16 +65,18 @@ browser.jar: content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) @@ -1233,11 +1217,11 @@ * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) * content/browser/chatWindow.xul (content/chatWindow.xul) content/browser/content.js (content/content.js) + content/browser/fonts/ClearSans-Regular.woff (content/fonts/ClearSans-Regular.woff) + content/browser/fonts/FiraSans-Regular.woff (content/fonts/FiraSans-Regular.woff) + content/browser/fonts/FiraSans-Light.woff (content/fonts/FiraSans-Light.woff) 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/newtab/preloaderContent.js (content/newtab/preloaderContent.js) - * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) 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 @@ -1301,7 +1285,7 @@ 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 -@@ -24,16 +24,22 @@ var gAdvancedPane = { +@@ -25,16 +25,22 @@ var gAdvancedPane = { if (extraArgs && extraArgs["advancedTab"]){ advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]); } else { @@ -1324,7 +1308,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. -@@ -903,14 +909,25 @@ var gAdvancedPane = { +@@ -884,14 +890,25 @@ var gAdvancedPane = { * Set browser as the operating system default browser. */ setDefaultBrowser: function() @@ -1801,7 +1785,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 -@@ -641,19 +641,21 @@ +@@ -643,19 +643,21 @@ @BINPATH@/defaults/autoconfig/prefcalls.js @BINPATH@/browser/defaults/profile/prefs.js diff -r b2202fea7983 -r f118b88b7d7f firefox-multilocale-chrome.patch --- a/firefox-multilocale-chrome.patch Sat May 03 10:14:44 2014 +0200 +++ b/firefox-multilocale-chrome.patch Wed May 28 22:17:03 2014 +0200 @@ -1,12 +1,12 @@ # HG changeset patch -# Parent 4b6055d24a2bbc4a37490214df4acf08269f14ff +# Parent 8e7e4170601428db00564f738c8223c8d5122274 # User Wolfgang Rosenauer 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 -@@ -368,16 +368,20 @@ pref("browser.helperApps.deleteTempFileO +@@ -375,16 +375,20 @@ pref("browser.helperApps.deleteTempFileO #endif // search engines URL @@ -121,14 +121,14 @@ + - https://www.google.com/ - + diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -123,14 +123,15 @@ +@@ -130,14 +130,15 @@ locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) #endif % locale browser-region @AB_CD@ %locale/browser-region/ diff -r b2202fea7983 -r f118b88b7d7f mozilla-kde.patch --- a/mozilla-kde.patch Sat May 03 10:14:44 2014 +0200 +++ b/mozilla-kde.patch Wed May 28 22:17:03 2014 +0200 @@ -44,7 +44,7 @@ #include "prefread.h" #include "prefapi_private_data.h" -@@ -1119,16 +1120,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -1134,16 +1135,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -79,7 +79,7 @@ return NS_OK; bool hasMore; -@@ -1144,17 +1163,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -1159,17 +1178,17 @@ static nsresult pref_LoadPrefsInDirList( nsAutoCString leaf; path->GetNativeLeafName(leaf); @@ -98,7 +98,7 @@ { nsZipItemPtr manifest(jarReader, name, true); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); -@@ -1248,26 +1267,38 @@ static nsresult pref_InitInitialObjects( +@@ -1263,26 +1282,38 @@ 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) @@ -196,7 +196,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 -@@ -42,16 +42,20 @@ +@@ -43,16 +43,20 @@ #ifdef XP_WIN #include #include "nsWindowsHelpers.h" @@ -217,7 +217,7 @@ #include "AndroidBridge.h" using namespace mozilla::widget::android; #endif -@@ -2695,16 +2699,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2722,16 +2726,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -243,7 +243,7 @@ int64_t goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2732,19 +2745,20 @@ nsDownload::SetState(DownloadState aStat +@@ -2759,19 +2772,20 @@ nsDownload::SetState(DownloadState aStat // because if it is, they'll click open the download manager and // the items they downloaded will have been removed. alerts->ShowAlertNotification( @@ -268,7 +268,7 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -56,29 +56,33 @@ toolkit.jar: +@@ -58,29 +58,33 @@ toolkit.jar: content/global/viewZoomOverlay.js (viewZoomOverlay.js) *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) content/global/bindings/browser.xml (widgets/browser.xml) @@ -290,7 +290,7 @@ content/global/bindings/menulist.xml (widgets/menulist.xml) content/global/bindings/notification.xml (widgets/notification.xml) content/global/bindings/numberbox.xml (widgets/numberbox.xml) - content/global/bindings/popup.xml (widgets/popup.xml) + * content/global/bindings/popup.xml (widgets/popup.xml) *+ content/global/bindings/preferences.xml (widgets/preferences.xml) +*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml) +% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde @@ -760,7 +760,7 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/preferences-kde.xml -@@ -0,0 +1,1334 @@ +@@ -0,0 +1,1333 @@ + + + + + -+ +#ifdef XP_UNIX_GNOME -+ > +