diff --git a/.abf.yml b/.abf.yml index 02a450a..1d4a2e3 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,4 @@ sources: cbindgen-vendor.tar.xz: 5ed5e4744f281d217e56035036af4cef24a29935 - firefox-68.0.2esr.source.tar.xz: 0f171f861342c8d954edcd5a797dd2746ef15050 + firefox-68.1.0esr.source.tar.xz: c24f8036294edba40fd36f52a9dbe2cfe30cd229 firefox-dictionary-61.0.2.tar.bz2: 25929c585dc8568a32d5be49aacc672f0ed2202f diff --git a/firefox-esr68.spec b/firefox-esr68.spec index 1ac3806..8feaa34 100644 --- a/firefox-esr68.spec +++ b/firefox-esr68.spec @@ -11,7 +11,7 @@ # This is a discussed topic. Please, do not flame it again. %define oname firefox -%define major 68.0.2 +%define major 68.1.0 %define ff_epoch 0 # (tpg) set version HERE !!! %define realver %{major} @@ -38,7 +38,7 @@ Summary: Next generation web browser Name: firefox-esr68 Version: %{major} Epoch: %{ff_epoch} -Release: 3 +Release: 1 License: MPLv1+ Group: Networking/WWW Url: http://www.mozilla.com/firefox/ @@ -65,9 +65,6 @@ Patch13: mozilla-kde-background.patch Patch215: firefox-enable-addons.patch Patch219: mozilla-ntlm-full-path.patch -# add patch mozilla-1005640-accept-lang to try to fix mga#24875 -# https://bugs.mageia.org/show_bug.cgi?id=24875 -Patch225: mozilla-1005640-accept-lang.patch Patch300: firefox-56.0-build-error.patch @@ -219,7 +216,6 @@ Files and macros mainly for building Firefox extensions. %patch215 -p1 -b .addons %patch219 -p1 -b .ntlm -%patch225 -p1 -b .1005640-accept-lang %patch300 -p1 %patch302 -p1 diff --git a/firefox-kde.patch b/firefox-kde.patch index c85652e..b194e56 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -3,7 +3,7 @@ # Date 1559300151 -7200 # Fri May 31 12:55:51 2019 +0200 # Node ID 54d41b0033b8d649d842a1f862c6fed8b9874dec -# Parent 428161c3b9599083e1b8710eda1760f1f707ab11 +# Parent 28bde69150771a1530f784903bf68214dd5790ea How to apply this patch: 1. Import and apply it 2. cp browser/base/content/browser.xul browser/base/content/browser-kde.xul @@ -11,9 +11,10 @@ How to apply this patch: 4. Replace #ifndef with #ifdef in the line above (this hanges the button order from Gnome-style to KDE-style) 5. hg qrefresh -diff -r 428161c3b959 -r 54d41b0033b8 browser/base/content/browser-kde.xul ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/browser/base/content/browser-kde.xul Fri May 31 12:55:51 2019 +0200 +diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul +new file mode 100644 +--- /dev/null ++++ b/browser/base/content/browser-kde.xul @@ -0,0 +1,1375 @@ +#filter substitution + @@ -1390,10 +1391,15 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/base/content/browser-kde.xul + + + -diff -r 428161c3b959 -r 54d41b0033b8 browser/base/jar.mn ---- a/browser/base/jar.mn Mon Jun 17 09:02:06 2019 +0200 -+++ b/browser/base/jar.mn Fri May 31 12:55:51 2019 +0200 -@@ -33,6 +33,8 @@ +diff --git a/browser/base/jar.mn b/browser/base/jar.mn +--- a/browser/base/jar.mn ++++ b/browser/base/jar.mn +@@ -28,16 +28,18 @@ browser.jar: + content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) + * content/browser/browser.css (content/browser.css) + content/browser/browser.js (content/browser.js) + #ifdef MOZ_BROWSER_XHTML + * content/browser/browser.xhtml (content/browser.xhtml) #else * content/browser/browser.xul (content/browser.xul) #endif @@ -1402,10 +1408,20 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/base/jar.mn content/browser/browser-addons.js (content/browser-addons.js) content/browser/browser-allTabsMenu.js (content/browser-allTabsMenu.js) content/browser/browser-captivePortal.js (content/browser-captivePortal.js) -diff -r 428161c3b959 -r 54d41b0033b8 browser/components/preferences/in-content/main.js ---- a/browser/components/preferences/in-content/main.js Mon Jun 17 09:02:06 2019 +0200 -+++ b/browser/components/preferences/in-content/main.js Fri May 31 12:55:51 2019 +0200 -@@ -294,6 +294,13 @@ + 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-contentblocking.js (content/browser-contentblocking.js) + #ifndef MOZILLA_OFFICIAL +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 +@@ -339,16 +339,23 @@ var gMainPane = { + }, backoffTimes[this._backoffIndex + 1 < backoffTimes.length ? this._backoffIndex++ : backoffTimes.length - 1]); + }; + + window.setTimeout(() => { + window.requestIdleCallback(pollForDefaultBrowser); }, backoffTimes[this._backoffIndex]); } @@ -1419,8 +1435,18 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/components/preferences/in-content/m this.initBrowserContainers(); this.buildContentProcessCountMenuList(); -@@ -983,6 +990,17 @@ + let performanceSettingsLink = document.getElementById( + "performanceSettingsLearnMore" + ); + let performanceSettingsUrl = + Services.urlFormatter.formatURLPref("app.support.baseURL") + +@@ -1146,16 +1153,27 @@ var gMainPane = { + this._backoffIndex = 0; + + let shellSvc = getShellService(); + if (!shellSvc) { return; + } try { shellSvc.setDefaultBrowser(true, false); + if (kde_session == 1) { @@ -1437,10 +1463,20 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/components/preferences/in-content/m } catch (ex) { Cu.reportError(ex); return; -diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/moz.build ---- a/browser/components/shell/moz.build Mon Jun 17 09:02:06 2019 +0200 -+++ b/browser/components/shell/moz.build Fri May 31 12:55:51 2019 +0200 -@@ -33,6 +33,8 @@ + } + + let selectedIndex = shellSvc.isDefaultBrowser(false, true) ? 1 : 0; + document.getElementById("setDefaultPane").selectedIndex = selectedIndex; + } +diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build +--- a/browser/components/shell/moz.build ++++ b/browser/components/shell/moz.build +@@ -28,16 +28,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco + ] + elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: + XPIDL_SOURCES += [ + 'nsIGNOMEShellService.idl', + ] SOURCES += [ 'nsGNOMEShellService.cpp', @@ -1449,9 +1485,15 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/moz.build ] elif CONFIG['OS_ARCH'] == 'WINNT': SOURCES += [ -diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsKDEShellService.cpp ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/browser/components/shell/nsKDEShellService.cpp Fri May 31 12:55:51 2019 +0200 + 'nsWindowsShellService.cpp', + ] + LOCAL_INCLUDES += [ + '../../../other-licenses/nsis/Contrib/CityHash/cityhash', + ] +diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp +new file mode 100644 +--- /dev/null ++++ b/browser/components/shell/nsKDEShellService.cpp @@ -0,0 +1,150 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public @@ -1603,9 +1645,10 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsKDEShellService. + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; +} + -diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsKDEShellService.h ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/browser/components/shell/nsKDEShellService.h Fri May 31 12:55:51 2019 +0200 +diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h +new file mode 100644 +--- /dev/null ++++ b/browser/components/shell/nsKDEShellService.h @@ -0,0 +1,32 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public @@ -1639,9 +1682,10 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsKDEShellService. +}; + +#endif // nskdeshellservice_h____ -diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsUnixShellService.cpp ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/browser/components/shell/nsUnixShellService.cpp Fri May 31 12:55:51 2019 +0200 +diff --git a/browser/components/shell/nsUnixShellService.cpp b/browser/components/shell/nsUnixShellService.cpp +new file mode 100644 +--- /dev/null ++++ b/browser/components/shell/nsUnixShellService.cpp @@ -0,0 +1,22 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public @@ -1665,9 +1709,10 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsUnixShellService + return nsKDEShellServiceConstructor( aOuter, aIID, aResult ); + return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult ); +} -diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsUnixShellService.h ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/browser/components/shell/nsUnixShellService.h Fri May 31 12:55:51 2019 +0200 +diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h +new file mode 100644 +--- /dev/null ++++ b/browser/components/shell/nsUnixShellService.h @@ -0,0 +1,15 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public @@ -1684,10 +1729,15 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsUnixShellService +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult); + +#endif // nsunixshellservice_h____ -diff -r 428161c3b959 -r 54d41b0033b8 browser/installer/package-manifest.in ---- a/browser/installer/package-manifest.in Mon Jun 17 09:02:06 2019 +0200 -+++ b/browser/installer/package-manifest.in Fri May 31 12:55:51 2019 +0200 -@@ -299,6 +299,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 +@@ -295,16 +295,18 @@ + @RESPATH@/browser/defaults/settings/main + @RESPATH@/browser/defaults/settings/security-state + + ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) + ; Technically this is an app pref file, but we are keeping it in the original ; gre location for now. @RESPATH@/defaults/pref/channel-prefs.js @@ -1696,3 +1746,8 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/installer/package-manifest.in ; Services (gre) prefs @RESPATH@/defaults/pref/services-sync.js + ; [Layout Engine Resources] + ; Style Sheets, Graphics and other Resources used by the layout engine. + @RESPATH@/res/EditorOverride.css + @RESPATH@/res/contenteditable.css + @RESPATH@/res/designmode.css diff --git a/mozilla-1005640-accept-lang.patch b/mozilla-1005640-accept-lang.patch deleted file mode 100644 index a8120b9..0000000 --- a/mozilla-1005640-accept-lang.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up firefox-67.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm.1005640-accept-lang firefox-67.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm ---- firefox-67.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm.1005640-accept-lang 2017-01-16 17:16:52.000000000 +0100 -+++ firefox-67.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2017-01-18 12:35:29.380394216 +0100 -@@ -2255,6 +2255,11 @@ this.XPIProvider = { - logger.error("private browsing migration failed", e); - } - -+ // Save locale settings to compare it later to check whenever some addon -+ // changed it. -+ var previousLocale = Cc["@mozilla.org/chrome/chrome-registry;1"] -+ .getService(Ci.nsIXULChromeRegistry).getSelectedLocale("global"); -+ - try { - AddonManagerPrivate.recordTimestamp("XPI_bootstrap_addons_begin"); - -@@ -2284,6 +2289,14 @@ var XPIProvider = { - AddonManagerPrivate.recordException("XPI-BOOTSTRAP", "startup failed", e); - } - -+ var currentLocale = Cc["@mozilla.org/chrome/chrome-registry;1"] -+ .getService(Ci.nsIXULChromeRegistry).getSelectedLocale("global"); -+ if (currentLocale != previousLocale) { -+ // We have to flush string cache if the locale was changed during loading -+ // of addons -+ Services.obs.notifyObservers(null, "chrome-flush-caches", null); -+ } -+ - // Let these shutdown a little earlier when they still have access to most - // of XPCOM - AsyncShutdown.quitApplicationGranted.addBlocker( diff --git a/mozilla-kde.patch b/mozilla-kde.patch index 85dd1c3..9c629e4 100644 --- a/mozilla-kde.patch +++ b/mozilla-kde.patch @@ -3,7 +3,7 @@ # Date 1559294891 -7200 # Fri May 31 11:28:11 2019 +0200 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 -# Parent f11c2d7239c0caa4dc74272716d9e30ced1a1ca3 +# Parent 93495ad6fa0fe292eadcbfef14e0e27273528497 Description: Add KDE integration to Firefox (toolkit parts) Author: Wolfgang Rosenauer Author: Lubos Lunak @@ -701,23 +701,29 @@ new file mode 100644 diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm -@@ -1042,30 +1042,60 @@ nsUnknownContentTypeDialog.prototype = { - - if (params.handlerApp && - params.handlerApp.executable && - params.handlerApp.executable.isFile()) { +@@ -1204,36 +1204,66 @@ nsUnknownContentTypeDialog.prototype = { + params.handlerApp && + params.handlerApp.executable && + params.handlerApp.executable.isFile() + ) { // Remember the file they chose to run. this.chosenApp = params.handlerApp; } } else if ("@mozilla.org/applicationchooser;1" in Cc) { - var nsIApplicationChooser = Ci.nsIApplicationChooser; -- var appChooser = Cc["@mozilla.org/applicationchooser;1"] -- .createInstance(nsIApplicationChooser); -- appChooser.init(this.mDialog, this.dialogElement("strings").getString("chooseAppFilePickerTitle")); +- var appChooser = Cc["@mozilla.org/applicationchooser;1"].createInstance( +- nsIApplicationChooser +- ); +- appChooser.init( +- this.mDialog, +- this.dialogElement("strings").getString("chooseAppFilePickerTitle") +- ); - var contentTypeDialogObj = this; - let appChooserCallback = function appChooserCallback_done(aResult) { - if (aResult) { -- contentTypeDialogObj.chosenApp = aResult.QueryInterface(Ci.nsILocalHandlerApp); +- contentTypeDialogObj.chosenApp = aResult.QueryInterface( +- Ci.nsILocalHandlerApp +- ); - } - contentTypeDialogObj.finishChooseApp(); - }; @@ -754,13 +760,19 @@ diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downlo + }); + } else { + var nsIApplicationChooser = Ci.nsIApplicationChooser; -+ var appChooser = Cc["@mozilla.org/applicationchooser;1"] -+ .createInstance(nsIApplicationChooser); -+ appChooser.init(this.mDialog, this.dialogElement("strings").getString("chooseAppFilePickerTitle")); ++ var appChooser = Cc["@mozilla.org/applicationchooser;1"].createInstance( ++ nsIApplicationChooser ++ ); ++ appChooser.init( ++ this.mDialog, ++ this.dialogElement("strings").getString("chooseAppFilePickerTitle") ++ ); + var contentTypeDialogObj = this; + let appChooserCallback = function appChooserCallback_done(aResult) { + if (aResult) { -+ contentTypeDialogObj.chosenApp = aResult.QueryInterface(Ci.nsILocalHandlerApp); ++ contentTypeDialogObj.chosenApp = aResult.QueryInterface( ++ Ci.nsILocalHandlerApp ++ ); + } + contentTypeDialogObj.finishChooseApp(); + }; @@ -770,12 +782,12 @@ diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downlo + } } else { var nsIFilePicker = Ci.nsIFilePicker; - var fp = Cc["@mozilla.org/filepicker;1"] - .createInstance(nsIFilePicker); - fp.init(this.mDialog, - this.dialogElement("strings").getString("chooseAppFilePickerTitle"), - nsIFilePicker.modeOpen); - + var fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker); + fp.init( + this.mDialog, + this.dialogElement("strings").getString("chooseAppFilePickerTitle"), + nsIFilePicker.modeOpen + ); diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp