# HG changeset patch # User Wolfgang Rosenauer # Date 1492434669 -7200 # Node ID 4665fe34fbceaef00a766dee86d24298432ef71a # Parent 42e50afb963821efb0bff673f0fd3bf2ed9b87b0 revert manually previously wrong rebases diff -r 42e50afb9638 -r 4665fe34fbce firefox-branded-icons.patch --- a/firefox-branded-icons.patch Mon Apr 17 14:57:22 2017 +0200 +++ b/firefox-branded-icons.patch Mon Apr 17 15:11:09 2017 +0200 @@ -1,6 +1,6 @@ # HG changeset patch # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de -# Parent ac405a22c9f500ecae974248eb2356429fed872b +# Parent 6309c3625e39216f9cf5a7a35cbf6932adfabc1d diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild --- a/browser/branding/branding-common.mozbuild @@ -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 -@@ -613,18 +613,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 42e50afb9638 -r 4665fe34fbce firefox-kde.patch --- a/firefox-kde.patch Mon Apr 17 14:57:22 2017 +0200 +++ b/firefox-kde.patch Mon Apr 17 15:11:09 2017 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent cd2e751044703d5b7130db1cbabc726370f4156e +# Parent 9488ac970162c2224614d544b9bab7b984b38c90 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul new file mode 100644 @@ -1142,6 +1142,28 @@ + + + +diff --git a/browser/base/jar.mn b/browser/base/jar.mn +--- a/browser/base/jar.mn ++++ b/browser/base/jar.mn +@@ -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) + content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) + content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) + * content/browser/browser.css (content/browser.css) + content/browser/browser.js (content/browser.js) + * content/browser/browser.xul (content/browser.xul) ++* content/browser/browser-kde.xul (content/browser-kde.xul) ++% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde + content/browser/browser-addons.js (content/browser-addons.js) + content/browser/browser-captivePortal.js (content/browser-captivePortal.js) + 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-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 --- a/browser/components/build/nsModule.cpp +++ b/browser/components/build/nsModule.cpp @@ -1205,7 +1227,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 -@@ -34,16 +34,22 @@ var gMainPane = { +@@ -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 @@ -1215,20 +1237,20 @@ } } + 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; ++ 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(); if (AppConstants.platform == "win") { -@@ -704,16 +710,27 @@ var gMainPane = { +@@ -680,16 +686,27 @@ var gMainPane = { let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser"); alwaysCheckPref.value = true; @@ -1571,7 +1593,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 42e50afb9638 -r 4665fe34fbce firefox-no-default-ualocale.patch --- a/firefox-no-default-ualocale.patch Mon Apr 17 14:57:22 2017 +0200 +++ b/firefox-no-default-ualocale.patch Mon Apr 17 15:11:09 2017 +0200 @@ -1,13 +1,13 @@ # HG changeset patch # User Wolfgang Rosenauer # Parent 099312626f5f7c9cb5573a61d0230574ee12a660 -# Parent c58b02a3d184251a28f3d78262a4f8bdf16b0413 +# Parent b692fb539e9d0641ff557cb4b984b5e211aec572 Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value 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 -@@ -190,17 +190,17 @@ pref("browser.uitour.readerViewTrigger", +@@ -240,17 +240,17 @@ pref("browser.uitour.readerViewTrigger", pref("browser.uitour.surveyDuration", 7200); pref("browser.customizemode.tip0.shown", false); diff -r 42e50afb9638 -r 4665fe34fbce mozilla-kde.patch --- a/mozilla-kde.patch Mon Apr 17 14:57:22 2017 +0200 +++ b/mozilla-kde.patch Mon Apr 17 15:11:09 2017 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 165988e6140a05143193f8828701e7888d6f9770 +# Parent 2b1505c8ca6fc80da9cf517b029a93c452cb9876 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) +@@ -73,29 +73,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,18 +310,6 @@ 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: - 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 -+ content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json) diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml new file mode 100644 --- /dev/null @@ -2386,8 +2374,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 += [ @@ -3768,7 +3756,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', @@ -3803,7 +3791,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 } @@ -3862,7 +3850,7 @@ return rv; } return NS_ERROR_FAILURE; -@@ -1991,16 +2002,22 @@ nsLocalFile::Reveal() +@@ -1992,16 +2003,22 @@ nsLocalFile::Reveal() return NS_ERROR_FAILURE; #endif }