# HG changeset patch # User Wolfgang Rosenauer # Date 1489832983 -3600 # Node ID 8094e6bba2606773f30aa7ac7e4c2900d77a4223 # Parent f7a8fa97a57e00bf34034888956c6202361d03f4 rebased patches for 53.0b4 diff -r f7a8fa97a57e -r 8094e6bba260 firefox-branded-icons.patch --- a/firefox-branded-icons.patch Sat Mar 18 11:18:01 2017 +0100 +++ b/firefox-branded-icons.patch Sat Mar 18 11:29:43 2017 +0100 @@ -1,11 +1,11 @@ # HG changeset patch # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de -# Parent 2bffb52e07b587a6c755d67c6fc971fed6509783 +# Parent 6309c3625e39216f9cf5a7a35cbf6932adfabc1d diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild --- a/browser/branding/branding-common.mozbuild +++ b/browser/branding/branding-common.mozbuild -@@ -34,18 +34,24 @@ def FirefoxBranding(): +@@ -41,18 +41,24 @@ def FirefoxBranding(): 'disk.icns', 'document.icns', 'dsstore', @@ -33,8 +33,8 @@ 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 -@@ -650,18 +650,21 @@ - @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png +@@ -599,18 +599,21 @@ + @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @RESPATH@/chrome/toolkit@JAREXT@ @RESPATH@/chrome/toolkit.manifest diff -r f7a8fa97a57e -r 8094e6bba260 firefox-kde.patch --- a/firefox-kde.patch Sat Mar 18 11:18:01 2017 +0100 +++ b/firefox-kde.patch Sat Mar 18 11:29:43 2017 +0100 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 1c4e33861cfcffe5a189802cf97957b0701260db +# Parent 1ec12b7509b6dcb0d2c1b77a8f93f81c4381008b diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul new file mode 100644 @@ -1143,7 +1143,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: +@@ -60,16 +60,18 @@ browser.jar: content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) content/browser/aboutProviderDirectory.xhtml (content/aboutProviderDirectory.xhtml) content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) @@ -1159,7 +1159,7 @@ content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js) content/browser/browser-customization.js (content/browser-customization.js) content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js) - content/browser/browser-devedition.js (content/browser-devedition.js) + content/browser/browser-compacttheme.js (content/browser-compacttheme.js) content/browser/browser-feeds.js (content/browser-feeds.js) content/browser/browser-fullScreenAndPointerLock.js (content/browser-fullScreenAndPointerLock.js) diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp @@ -1225,8 +1225,7 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js --- a/browser/components/preferences/in-content/main.js +++ b/browser/components/preferences/in-content/main.js -@@ -33,16 +33,22 @@ var gMainPane = { - if (AppConstants.platform == "win") { +@@ -32,16 +32,22 @@ var gMainPane = { // In Windows 8 we launch the control panel since it's the only // way to get all file type association prefs. So we don't know // when the user will select the default. We refresh here periodically @@ -1234,21 +1233,22 @@ // be set while the prefs are open. window.setInterval(this.updateSetDefaultBrowser.bind(this), 1000); } -+ + } + var env = Components.classes["@mozilla.org/process/environment;1"] -+ .getService(Components.interfaces.nsIEnvironment); ++ .getService(Components.interfaces.nsIEnvironment); + var kde_session = 0; + if (env.get('KDE_FULL_SESSION') == "true") + kde_session = 1; - } ++ } // set up the "use current page" label-changing listener this._updateUseCurrentButton(); - window.addEventListener("focus", this._updateUseCurrentButton.bind(this), false); + window.addEventListener("focus", this._updateUseCurrentButton.bind(this)); this.updateBrowserStartupLastSession(); -@@ -704,16 +710,27 @@ var gMainPane = { + if (AppConstants.platform == "win") { +@@ -680,16 +686,27 @@ var gMainPane = { let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser"); alwaysCheckPref.value = true; @@ -1591,7 +1591,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 -@@ -652,16 +652,17 @@ +@@ -638,16 +638,17 @@ @RESPATH@/greprefs.js @RESPATH@/defaults/autoconfig/prefcalls.js @RESPATH@/browser/defaults/permissions diff -r f7a8fa97a57e -r 8094e6bba260 mozilla-kde.patch --- a/mozilla-kde.patch Sat Mar 18 11:18:01 2017 +0100 +++ b/mozilla-kde.patch Sat Mar 18 11:29:43 2017 +0100 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 5c8ae59424f5318bf7a387257771bf95d3893063 +# Parent 420c86af3acf187f3f0e4d2fd061eb6221bb654c Description: Add KDE integration to Firefox (toolkit parts) Author: Wolfgang Rosenauer Author: Lubos Lunak @@ -187,8 +187,8 @@ diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build --- a/toolkit/components/downloads/moz.build +++ b/toolkit/components/downloads/moz.build -@@ -57,16 +57,17 @@ if not CONFIG['MOZ_SUITE']: - 'nsDownloadManagerUI.manifest', +@@ -49,16 +49,17 @@ if CONFIG['OS_ARCH'] == 'WINNT': + 'nsDownloadScanner.cpp', ] FINAL_LIBRARY = 'xul' @@ -229,7 +229,7 @@ #include "FennecJNIWrappers.h" #endif -@@ -2723,16 +2727,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2724,16 +2728,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -255,7 +255,7 @@ int64_t goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2764,16 +2777,17 @@ nsDownload::SetState(DownloadState aStat +@@ -2765,16 +2778,17 @@ nsDownload::SetState(DownloadState aStat message, !removeWhenDone, mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"), @@ -276,10 +276,10 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -71,29 +71,33 @@ toolkit.jar: - content/global/bindings/button.xml (widgets/button.xml) - content/global/bindings/checkbox.xml (widgets/checkbox.xml) +@@ -74,29 +74,33 @@ toolkit.jar: content/global/bindings/colorpicker.xml (widgets/colorpicker.xml) + content/global/bindings/datekeeper.js (widgets/datekeeper.js) + content/global/bindings/datepicker.js (widgets/datepicker.js) content/global/bindings/datetimepicker.xml (widgets/datetimepicker.xml) content/global/bindings/datetimepopup.xml (widgets/datetimepopup.xml) content/global/bindings/datetimebox.xml (widgets/datetimebox.xml) @@ -310,14 +310,14 @@ content/global/bindings/scale.xml (widgets/scale.xml) content/global/bindings/scrollbar.xml (widgets/scrollbar.xml) content/global/bindings/scrollbox.xml (widgets/scrollbox.xml) -@@ -113,9 +117,9 @@ toolkit.jar: +@@ -114,9 +118,9 @@ toolkit.jar: + * content/global/bindings/tree.xml (widgets/tree.xml) + content/global/bindings/videocontrols.xml (widgets/videocontrols.xml) content/global/bindings/videocontrols.css (widgets/videocontrols.css) * content/global/bindings/wizard.xml (widgets/wizard.xml) #ifdef XP_MACOSX content/global/macWindowMenu.js #endif - content/global/svg/svgBindings.xml (/layout/svg/resources/content/svgBindings.xml) - content/global/gmp-sources/eme-adobe.json (gmp-sources/eme-adobe.json) content/global/gmp-sources/openh264.json (gmp-sources/openh264.json) - content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json) \ No newline at end of file @@ -2408,8 +2408,8 @@ diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build -@@ -40,17 +40,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co - 'updaterfileutils_osx.mm', +@@ -53,17 +53,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co + '../components/printingui/mac', ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit': UNIFIED_SOURCES += [ @@ -3790,7 +3790,7 @@ diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build --- a/xpcom/components/moz.build +++ b/xpcom/components/moz.build -@@ -44,12 +44,13 @@ FINAL_LIBRARY = 'xul' +@@ -43,12 +43,13 @@ FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '!..', '../base', @@ -3825,7 +3825,7 @@ #include "prmem.h" #include "plbase64.h" -@@ -1948,42 +1949,52 @@ nsLocalFile::SetPersistentDescriptor(con +@@ -1949,42 +1950,52 @@ nsLocalFile::SetPersistentDescriptor(con return InitWithNativePath(aPersistentDescriptor); #endif } @@ -3884,7 +3884,7 @@ return rv; } return NS_ERROR_FAILURE; -@@ -1991,16 +2002,22 @@ nsLocalFile::Reveal() +@@ -1992,16 +2003,22 @@ nsLocalFile::Reveal() return NS_ERROR_FAILURE; #endif }