diff --git a/.abf.yml b/.abf.yml
index 3a3ad3d..0e03a46 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,4 @@
sources:
- cbindgen-vendor.tar.xz: 5ed5e4744f281d217e56035036af4cef24a29935
- firefox-68.0.2.source.tar.xz: 1e532075b573148a88296aa56ab149ddbd786882
+ cbindgen-vendor.tar.xz: f661af3f8e6a52af8f0bc206987134e66b449fe0
+ firefox-69.0.source.tar.xz: e6c150543f35aaa68d979838ed12d42bbd929e7e
firefox-dictionary-61.0.2.tar.bz2: 25929c585dc8568a32d5be49aacc672f0ed2202f
diff --git a/firefox-kde.patch b/firefox-kde.patch
index c85652e..5a19dd6 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,1401 +11,15 @@ 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
-@@ -0,0 +1,1375 @@
-+#filter substitution
-+
-+# -*- Mode: HTML -*-
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+# All DTD information is stored in a separate file so that it can be shared by
-+# hiddenWindow.xul.
-+
-+
-+
-+
-+# All JS files which are needed by browser.xul and other top level windows to
-+# support MacOS specific features *must* go into the global-scripts.inc file so
-+# that they can be shared with macWindow.inc.xul.
-+#include global-scripts.inc
-+
-+
-+
-+# All sets except for popupsets (commands, keys, and stringbundles)
-+# *must* go into the browser-sets.inc file so that they can be shared with other
-+# top level windows in macWindow.inc.xul.
-+#include browser-sets.inc
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+#include ../../components/places/content/editBookmarkPanel.inc.xul
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+#include ../../components/places/content/placesContextMenu.inc.xul
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+#include ../../components/places/content/bookmarksHistoryTooltip.inc.xul
-+
-+
-+
-+
-+
-+#ifdef XP_MACOSX
-+
-+#else
-+
-+#endif
-+
-+
-+
-+
-+#ifdef XP_MACOSX
-+
-+#else
-+
-+#endif
-+
-+
-+#include popup-notifications.inc
-+
-+#include ../../components/customizableui/content/panelUI.inc.xul
-+#include ../../components/controlcenter/content/identityPanel.inc.xul
-+#include ../../components/controlcenter/content/protectionsPanel.inc.xul
-+#include ../../components/downloads/content/downloadsPanel.inc.xul
-+#include browser-allTabsMenu.inc.xul
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+#ifndef XP_MACOSX
-+
-+
-+#endif
-+
-+#include titlebar-items.inc.xul
-+
-+#ifdef XP_MACOSX
-+
-+
-+
-+
-+
-+
-+#endif
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ &fullscreenWarning.beforeDomain.label;
-+
-+ &fullscreenWarning.afterDomain.label;
-+
-+
-+ &fullscreenWarning.generic.label;
-+
-+
-+#ifdef XP_MACOSX
-+ &exitDOMFullscreenMac.button;
-+#else
-+ &exitDOMFullscreen.button;
-+#endif
-+
-+
-+
-+
-+
-+ &pointerlockWarning.beforeDomain.label;
-+
-+ &pointerlockWarning.afterDomain.label;
-+
-+
-+ &pointerlockWarning.generic.label;
-+
-+
-+
-+
-+
-+
-+
-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 @@
- #else
- * content/browser/browser.xul (content/browser.xul)
- #endif
-+* 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-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 @@
+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 +33,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 +61,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 +83,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 +243,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 +280,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 +307,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 +327,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 +344,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/firefox.spec b/firefox.spec
index 3f493a1..ede7efc 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -10,7 +10,7 @@
# This also means only STABLE upstream releases, NO betas.
# This is a discussed topic. Please, do not flame it again.
-%define major 68.0.2
+%define major 69.0
%define ff_epoch 0
# (tpg) set version HERE !!!
%define realver %{major}
@@ -37,7 +37,7 @@ Summary: Next generation web browser
Name: firefox
Version: %{major}
Epoch: %{ff_epoch}
-Release: 3
+Release: 1
License: MPLv1+
Group: Networking/WWW
Url: http://www.mozilla.com/firefox/
@@ -64,9 +64,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
@@ -216,7 +213,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/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..4d87053 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 85e4798b74da9c377f84cf8f5dd59a7f952d92eb
Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer
Author: Lubos Lunak
@@ -13,8 +13,7 @@ Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
-@@ -81,16 +81,17 @@
- #include "nsXPCOMCID.h"
+@@ -83,16 +83,17 @@
#include "nsXPCOM.h"
#include "nsXULAppAPI.h"
#include "nsZipArchive.h"
@@ -22,16 +21,17 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
#include "PLDHashTable.h"
#include "plstr.h"
#include "prlink.h"
+ #include "xpcpublic.h"
+#include "nsKDEUtils.h"
+ #ifdef DEBUG
+ # include