$ git diff --patch-with-stat --summary 514693415da0bc839c5b273fa07d6d2bea495d39..9f95e4c9147997d026d724ccc1cc7fcd6205a6bf
.abf.yml | 140 +++++++++++------------
firefox-69.0-kde.patch => firefox-71.0-kde.patch | 79 +------------
firefox.spec | 15 +--
mozilla-69.0-kde.patch => mozilla-71.0-kde.patch | 42 +++----
4 files changed, 104 insertions(+), 172 deletions(-)
rename firefox-69.0-kde.patch => firefox-71.0-kde.patch (77%)
rename mozilla-69.0-kde.patch => mozilla-71.0-kde.patch (98%)
diff --git a/.abf.yml b/.abf.yml
index 3b548ae..4a87721 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,74 +1,74 @@
sources:
- af.xpi: 2c1ba8d6a5ffe3ed1be32617cff332730c7b5c0b
- ar.xpi: 56e8a4bd0621e56cc45dc1d93a6863587601a007
- ast.xpi: 425e040124be807ffb1c124fe493f14254d4adfe
+ af.xpi: 3161429d341c266a40e0070d5294ca2c6842f679
+ ar.xpi: 4f14f162c008d03c52477dab2354bc04932e2c9c
+ ast.xpi: 5f372444950c164e4042e315bfd7670eb6903f6f
autoconf-2.13.tar.gz: e4826c8bd85325067818f19b2b2ad2b625da66fc
- bg.xpi: 4515975d145a16df5fbc65f11cc4669a06942921
- bn.xpi: 4388ed2d37757acdb441351f7a663e0c725345bf
- br.xpi: c4bbf1545279643a306870bf65ed011543d57a8d
- bs.xpi: 40432e4ce1aae1c5ee1bbf64cb6dffdc7ea372ad
- ca.xpi: c6f1801a84467d7a6306e2614734a3231d2970d9
+ bg.xpi: 960adac9c9525baa3ec21ce2ec20852dd69bf893
+ bn.xpi: 311b169677e2472241cd4c0e16bd242e0f00571e
+ br.xpi: 96ca24419da918acbedf8734f20eaf3dc230d784
+ bs.xpi: 4b3621ff972dfa92f4fcbcbe3c79cf716b392310
+ ca.xpi: 2f00b8d8e1eca4239fd6281db0df4e9f56827705
cbindgen-vendor.tar.xz: f661af3f8e6a52af8f0bc206987134e66b449fe0
- cs.xpi: 1279ad0cf7ca1230460e808709dee2c44533ba14
- cy.xpi: 927173c72f40ddeadb2c2faf211bcef4b18c6153
- da.xpi: e8af171b6db84dd1f138ff5e43d759876dd1871e
- de.xpi: a04735c40a2416260d923a89d91ae9ce095bcc47
- el.xpi: 0bcc8133dc261285f3b4dba2056358ab61d59cd3
- en-GB.xpi: f1d341fd9dfa7c1d057870e9d75c4e5b6915e5d9
- eo.xpi: 668d7cad374ff88d6e555f26622200464de15982
- es-AR.xpi: 894f3330941e5d39cedda9dd98cb67b55ecc6b15
- es-CL.xpi: 9a4f6c319bb5b64141cff1b176edb7e492bbbc40
- es-ES.xpi: 35ead562bf99e3c07de05624ddafdf27e455bd2b
- es-MX.xpi: a10b54fde91e9ece04a32c990c286937709b6511
- et.xpi: 45263cbc19c0edea66c2576934f1c64670d21eff
- eu.xpi: 12201941707cfa71991d62a446ca545e8e9f84ab
- fa.xpi: 2afe4eae282039194fde48506deb141f626a22a6
- fi.xpi: 7c87ec6ae8cad29bff471b38c69adb58fac6948e
- firefox-69.0.1.source.tar.xz: 3c693918d85e789944e6fe59fe76c34115cae906
- fr.xpi: 3db09d68b12d29fa43fe655dc5320ba848b1646a
- fy-NL.xpi: 46a044371ad3982f1b05b68b1fa8d920b1ac1ed9
- ga-IE.xpi: 651c344a39185faf229a957f192ec492fe7cd8b6
- gd.xpi: 9e41e37484e2490128895a5ceac356d8652c06e3
- gl.xpi: 86efaf65fc0acf3fa839b08a748b112a67ba79cf
- gu-IN.xpi: dd63026ebb52c5daaf40321abeac62a88a25aff1
- he.xpi: 459edced013ab3654a3ff7a09277b99e3b9881c6
- hi-IN.xpi: 8fbd14b5ec32f76788c7a002c0d9fdc06cf8e3fd
- hr.xpi: 67d9c6c4b7bd3a52aea15e3b0d2432c259dff339
- hu.xpi: af4354f03b239323eeffdc296d495738f8fc7005
- hy-AM.xpi: 6376d7d8952385090fedbd2884f2e23df8e48c41
- id.xpi: 8869c9035ba66e148f3bb0464ff37df165f75363
- is.xpi: 4fb8061be51c134dbcf8d0a6eeda687628358b99
- it.xpi: 005311b9b90fbe29b2831debedfc5f672e587d3e
- ja.xpi: 5596945e0ef1e0b20a397c4cfeebc2aa186ae8ea
- kk.xpi: ed6460210ab8aa645028945c6f1aafd28e18ae8a
- km.xpi: 73de5e4fe797174a823148346bbc5a8f9f85eabf
- kn.xpi: ba911b7810f772322652be374e46cb4e937d7188
- ko.xpi: 9ccf07117ecf442faa01f455442b3cddc4c0ac22
- lt.xpi: f0104a1d7c5915e4cad33bd64d131e3435ac32af
- lv.xpi: 721a3f5f859244fdfa76bde92cbb9a7f52b87ede
- mk.xpi: 2ea6368ee5c59be50411dc273176c8989a1f4b1d
- mr.xpi: 42fd85a2b78bccaea0e538831775cacc095c1d32
- nb-NO.xpi: c03ff672348c72849ac3cc1ce33a1fc5efcc943d
- nl.xpi: adb72a42ec622b25943b4afa89cd6befd5461ab0
- nn-NO.xpi: 95909f0c5c049ffb15bf7d1ff11c79a6be76ee64
+ cs.xpi: f8b4a71db6b250bb277aff1cb47a1529a79e690a
+ cy.xpi: 8f7744fd62f28d0870801895f555beecb77ffd96
+ da.xpi: c0e46e1b2d1f2df5adfb28d25e5d9cbdb0564254
+ de.xpi: f24bac5cceb3cdded65aee2fbac09cce5fd25ebb
+ el.xpi: 615ab9b1bd75a479aa1c9f1eafa065e7855aa866
+ en-GB.xpi: 04f2bd4e473d27b0290d2029e72d6ca16987929c
+ eo.xpi: f2a57614bfc7ca9129497b826f5ce166857038ec
+ es-AR.xpi: 9a514eeb31f63fb4702742f2c7b22cc98c413879
+ es-CL.xpi: 05dd0865a11e0c6047778ed45660e5ad37e5d966
+ es-ES.xpi: b3d5a9d15c77ef9a94fd01dcda5af30777765f18
+ es-MX.xpi: 32b2ce19db203ec8f4386cb1fae3949d99b1a1c3
+ et.xpi: ee207a44506dfb967f753dd53d7178f37659d29e
+ eu.xpi: 59871cfdf90d2a9075756acd8c859a2df9d8e57f
+ fa.xpi: 6999447ed2d3c21b8262714d3630eec1c5c5a678
+ fi.xpi: 7c5a51b0fa37a8dc497e747f84f7cb39d1c8077a
+ firefox-71.0.source.tar.xz: 8cb0b0ba8473412e8e25cdcb0cfa225d15a15640
+ fr.xpi: 4ab992dc5e690a535028ac175b0a87f04cae7e92
+ fy-NL.xpi: d26d8b6ec399f3ff2306a7eede06da5d5494149a
+ ga-IE.xpi: 19fbb445b3a4f97bd13f1228ce5bfab5de8981a7
+ gd.xpi: 1964d4a9b8c935eb9550f673cf0f4913751403b4
+ gl.xpi: 61c81d6bf34485dc99d49f2ae8921f72d312c910
+ gu-IN.xpi: 27aa9daaf68cd06f7909d8ff6f8ae2438e4135aa
+ he.xpi: 52aaaa9f428db4d6cd97e5266f7c8424e45628c8
+ hi-IN.xpi: 4eb9548437c79e25132a07fa50b12f5affa2faa2
+ hr.xpi: 0cb43277cfe5a52116b3107b8bc442b6c1a2e3ff
+ hu.xpi: 5cf8ade8a6a9980b40456d531aa8bd8ddd991d9b
+ hy-AM.xpi: 6ffee34249413e5c582b51989c3b4657b98c72f9
+ id.xpi: c03697b06d3bef8931c8e654866d0960d4ae18d7
+ is.xpi: 2cddb95d1838f56fa59ba83b3cb87944331025c6
+ it.xpi: 4cf48402e2921dedb1cd35c26dec040cab7b2ac0
+ ja.xpi: 954f102935026160f6507e2b3e7ed4987587e6fe
+ kk.xpi: 6f34f3d7ea4fa686223bceb4e41cbd426bc5077c
+ km.xpi: 642138d7eda5b38faae88d2bb2419c81a3cb8971
+ kn.xpi: 52f022913bfa76732c417761c3361fad1a78ea3c
+ ko.xpi: f34c795c97c41d80a67752146b3da62ee75c9cb0
+ lt.xpi: 523550b7e93e10b9d60827cd833a364d373171b5
+ lv.xpi: 3f8e08f1bcead3e912a616cd3afeb22f1c92e211
+ mk.xpi: 7a9f3adbfa8c97b91608895cc34261f080493bf7
+ mr.xpi: c6bf5d419eaac6901d2b3135a056651e91105c8c
+ nb-NO.xpi: 28db2a4645c71472ec588444e39bebbad6d43fda
+ nl.xpi: d1fa5909531b7cbfd26e99b530bee67f337c7194
+ nn-NO.xpi: 5e0fe5a1e2a642874e7f2efa1e6f3bd2eb1a8d30
or.xpi: 39e99b91bb2d0b10a7561ddcca86015d2ac7f624
- pa-IN.xpi: a19f652651266b0cffca820519520c10399c6708
- pl.xpi: 6aefa2bc96563a42b8e3f50f734da40bbba6ed1a
- pt-BR.xpi: 76ebde522546dc378f1e115731fb3a9544eefc3e
- pt-PT.xpi: 424a7b824863084752b20e47f2aa6a5deacb8697
- ro.xpi: 689283b5904e1b42e848f96c95110f290021a34d
- ru.xpi: 9c6cba917e83ab143fce61ad9c82f99c36781ff9
- si.xpi: daed18523ba8d70a5f682eb86410bc5f638eb29c
- sk.xpi: b05de2cdad058271ce6063c5da860b2ccf0837fa
- sl.xpi: ba76176ec1a97251590869f5a5d7ee2635003105
- sq.xpi: 6e3f4bceda68befdedf1f99b55756004db1e63d8
- sr.xpi: 2b09b1a87ee084ea243455815101d1c3eef3b533
- sv-SE.xpi: 8d11ee93857b28d68d8523f8b345ee15e182dc8b
- ta.xpi: 0d01096861f321078a31c4f5cc6b2508e9add371
- te.xpi: 674a3e8dc4e55f2abd845cf1bbc0b49ab79f64f6
- th.xpi: 55dcccfa74e6f4534196ed8e71ca3537f96de895
- tr.xpi: e978a9e9e251d127dba4bf1185fe14ba73291982
- uk.xpi: 326fbfb8ffd7b6bc9950b6ade1dfbaf6b5e75efd
- vi.xpi: 5495e1bb520abb84d9b7b3086ad3f479f4f55fca
- zh-CN.xpi: 78f5a321cbf5ba38e4b7a8ea8a6e1311eb5b5860
- zh-TW.xpi: e5659cd8cfe3295b143ba79013b3f7b02c924fc4
+ pa-IN.xpi: a8ecc4a527cf3317fe74a9a0b6b45a04455a8bc7
+ pl.xpi: 122b52a8e707e725b4a22e5edbce178ba7c48cce
+ pt-BR.xpi: ab5288d3ba26a4f14980d4a1eb61c8295527d0f8
+ pt-PT.xpi: 92f88503a9183ad4d6f3e5f3b342e515c791dbb5
+ ro.xpi: 9fd15b98ee5aee9f44010b57789f7e4bd8b0e970
+ ru.xpi: beac4c84e01bd363b3319d10a2c155f8aafba987
+ si.xpi: 3a5bd9116376c03e0c7e96589822034845586067
+ sk.xpi: 430fd493daa6e7b3c31e069c77c6f542017769c6
+ sl.xpi: 6c5bed4f148e622e01c2b80d1d65c913e42e279b
+ sq.xpi: 0e0624e5797cc066307ef11c4f9674aefcf1c8b8
+ sr.xpi: 9e4e8b28e9f15f7bfe632630f549d06a527dab51
+ sv-SE.xpi: d1cffb7c6e7c6de56fcf2af4ddbbfee12f5b7019
+ ta.xpi: 7ebdd8839538e7bdf9dafa0235d6ac2ff7d8512e
+ te.xpi: 1b518a1ce29f5a407adddd3a0ebe7126ef100c79
+ th.xpi: 0b5cc6ebb3f07a37647a80bce2698aaa0f9e948c
+ tr.xpi: cdb505c585efefbb520d8ca8284bfe9c35ffe9a2
+ uk.xpi: 8001f69c7e3cbb03b28d15f78e86274badac8a17
+ vi.xpi: 252aa8280a8a29a54e132e7f9f694a482d496b8c
+ zh-CN.xpi: 58d8dcc7bf85e257fe0dfd67208add827c6eb635
+ zh-TW.xpi: 75112452340e063858efd78a63ecf2561df0899f
diff --git a/firefox-69.0-kde.patch b/firefox-71.0-kde.patch
similarity index 77%
rename from firefox-69.0-kde.patch
rename to firefox-71.0-kde.patch
index 5a19dd6..2b9697d 100644
--- a/firefox-69.0-kde.patch
+++ b/firefox-71.0-kde.patch
@@ -3,7 +3,7 @@
# Date 1559300151 -7200
# Fri May 31 12:55:51 2019 +0200
# Node ID 54d41b0033b8d649d842a1f862c6fed8b9874dec
-# Parent 28bde69150771a1530f784903bf68214dd5790ea
+# Parent 4faaad3619f286bd6077754d8e59d339a5142b80
How to apply this patch:
1. Import and apply it
2. cp browser/base/content/browser.xul browser/base/content/browser-kde.xul
@@ -14,7 +14,7 @@ How to apply this patch:
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 = {
+@@ -341,16 +341,23 @@ var gMainPane = {
}, backoffTimes[this._backoffIndex + 1 < backoffTimes.length ? this._backoffIndex++ : backoffTimes.length - 1]);
};
@@ -38,7 +38,7 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
);
let performanceSettingsUrl =
Services.urlFormatter.formatURLPref("app.support.baseURL") +
-@@ -1146,16 +1153,27 @@ var gMainPane = {
+@@ -1199,16 +1206,27 @@ var gMainPane = {
this._backoffIndex = 0;
let shellSvc = getShellService();
@@ -71,7 +71,7 @@ diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.b
+++ b/browser/components/shell/moz.build
@@ -28,16 +28,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
]
- elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
XPIDL_SOURCES += [
'nsIGNOMEShellService.idl',
]
@@ -92,7 +92,7 @@ diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components
new file mode 100644
--- /dev/null
+++ b/browser/components/shell/nsKDEShellService.cpp
-@@ -0,0 +1,150 @@
+@@ -0,0 +1,103 @@
+/* -*- 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
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -196,53 +196,6 @@ new file mode 100644
+ return NS_ERROR_NOT_IMPLEMENTED;
+}
+
-+NS_IMETHODIMP
-+nsKDEShellService::OpenApplication(PRInt32 aApplication)
-+{
-+ nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
-+ if (!command)
-+ return NS_ERROR_FAILURE;
-+
-+ nsCOMPtr<nsISupportsCString> str = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
-+ if (!str)
-+ return NS_ERROR_FAILURE;
-+
-+ if( aApplication == APPLICATION_MAIL )
-+ str->SetData( NS_LITERAL_CSTRING( "OPENMAIL" ));
-+ else if( aApplication == APPLICATION_NEWS )
-+ str->SetData( NS_LITERAL_CSTRING( "OPENNEWS" ));
-+ else
-+ return NS_ERROR_NOT_IMPLEMENTED;
-+
-+ command->AppendElement( str );
-+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
-+}
-+
-+NS_IMETHODIMP
-+nsKDEShellService::OpenApplicationWithURI(nsIFile* aApplication, const nsACString& aURI)
-+{
-+ nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
-+ if (!command)
-+ return NS_ERROR_FAILURE;
-+
-+ nsCOMPtr<nsISupportsCString> cmdstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
-+ nsCOMPtr<nsISupportsCString> appstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
-+ nsCOMPtr<nsISupportsCString> uristr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
-+ if (!cmdstr || !appstr || !uristr)
-+ return NS_ERROR_FAILURE;
-+
-+ cmdstr->SetData( NS_LITERAL_CSTRING( "RUN" ));
-+ command->AppendElement( cmdstr );
-+ nsAutoCString app;
-+ nsresult rv = aApplication->GetNativePath( app );
-+ NS_ENSURE_SUCCESS( rv, rv );
-+ appstr->SetData( app );
-+ command->AppendElement( appstr );
-+ uristr->SetData( aURI );
-+ command->AppendElement( uristr );
-+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
-+}
-+
diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h
new file mode 100644
--- /dev/null
@@ -327,25 +280,3 @@ new file mode 100644
+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+#endif // nsunixshellservice_h____
-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
-
-+@RESPATH@/defaults/pref/kde.js
-+
- ; 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 22212db..a81b966 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -224,7 +224,7 @@ Name: firefox
Epoch: 0
# IMPORTANT: When updating, you MUST also update the l10n files by running
# download.sh after editing the version number
-Version: 69.0.1
+Version: 71.0
Release: 1
License: MPLv1+
Group: Networking/WWW
@@ -259,8 +259,8 @@ Source100: firefox.rpmlintrc
Patch0: firefox-67.0-webrtc-compile.patch
# Patches for kde integration of FF from http://www.rosenauer.org/hg/mozilla/
-Patch11: firefox-69.0-kde.patch
-Patch12: mozilla-69.0-kde.patch
+Patch11: firefox-71.0-kde.patch
+Patch12: mozilla-71.0-kde.patch
# from fedora - fix for app chooser
#Patch43: rhbz-1291190-appchooser-crash.patch
@@ -319,7 +319,7 @@ BuildRequires: pkgconfig(libproxy-1.0)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libstartup-notification-1.0)
BuildRequires: pkgconfig(nspr) >= 4.21.0
-BuildRequires: pkgconfig(nss) >= 3.45.0
+BuildRequires: pkgconfig(nss) >= 3.47.1
BuildRequires: pkgconfig(ogg)
BuildRequires: pkgconfig(opus)
BuildRequires: pkgconfig(libpulse)
@@ -414,17 +414,18 @@ cd ..
mkdir -p my_rust_vendor
cd my_rust_vendor
tar xf %{SOURCE22}
-cd -
mkdir -p .cargo
cat > .cargo/config <<EOL
[source.crates-io]
replace-with = "vendored-sources"
[source.vendored-sources]
-directory = "$(pwd)/my_rust_vendor"
+directory = "$(pwd)"
EOL
env CARGO_HOME=.cargo cargo install cbindgen
+cd -
+
# needed to regenerate certdata.c
pushd security/nss/lib/ckfw/builtins
perl ./certdata.perl /etc/pki/tls/mozilla/certdata.txt
@@ -434,7 +435,7 @@ popd
%global optflags %{optflags} -g0 -fno-exceptions
export AUTOCONF=$(pwd)/ac213bin/bin/autoconf
-export PATH=$(pwd)/.cargo/bin:$PATH
+export PATH=$(pwd)/my_rust_vendor/.cargo/bin:$PATH
%ifarch %ix86
%global optflags %{optflags} -g0 -fno-exceptions -Wno-format-security
diff --git a/mozilla-69.0-kde.patch b/mozilla-71.0-kde.patch
similarity index 98%
rename from mozilla-69.0-kde.patch
rename to mozilla-71.0-kde.patch
index 4d87053..4b36d3e 100644
--- a/mozilla-69.0-kde.patch
+++ b/mozilla-71.0-kde.patch
@@ -3,7 +3,7 @@
# Date 1559294891 -7200
# Fri May 31 11:28:11 2019 +0200
# Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
-# Parent 85e4798b74da9c377f84cf8f5dd59a7f952d92eb
+# Parent 86d7ace0b36abf542e56fbb702a5f9b308b9bf77
Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com>
@@ -13,7 +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
-@@ -83,16 +83,17 @@
+@@ -88,16 +88,17 @@
#include "nsXPCOM.h"
#include "nsXULAppAPI.h"
#include "nsZipArchive.h"
@@ -31,7 +31,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
#ifdef MOZ_MEMORY
# include "mozmemory.h"
#endif
-@@ -4623,25 +4624,37 @@ Result<Ok, const char*> Preferences::Ini
+@@ -4542,25 +4543,37 @@ nsresult Preferences::InitInitialObjects
// application pref files for backwards compatibility.
static const char* specialFiles[] = {
#if defined(XP_MACOSX)
@@ -69,7 +69,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
// Load jar:$app/omni.jar!/defaults/preferences/*.js
// or jar:$gre/omni.jar!/defaults/preferences/*.js.
-@@ -4688,17 +4701,17 @@ Result<Ok, const char*> Preferences::Ini
+@@ -4606,17 +4619,17 @@ nsresult Preferences::InitInitialObjects
}
nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
@@ -91,9 +91,9 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
--- a/modules/libpref/moz.build
+++ b/modules/libpref/moz.build
-@@ -31,16 +31,20 @@ EXPORTS.mozilla += [
- 'StaticPrefs.h',
+@@ -110,16 +110,20 @@ EXPORTS.mozilla += [
]
+ EXPORTS.mozilla += sorted(['!' + g for g in gen_h])
UNIFIED_SOURCES += [
'Preferences.cpp',
@@ -104,13 +104,13 @@ diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
+ '/toolkit/xre'
+]
+
- XPCOM_MANIFESTS += [
- 'components.conf',
- ]
+ gen_all_tuple = tuple(gen_h + gen_cpp + gen_rs)
- include('/ipc/chromium/chromium-config.mozbuild')
+ GENERATED_FILES += [gen_all_tuple]
- FINAL_LIBRARY = 'xul'
+ static_pref_list = GENERATED_FILES[gen_all_tuple]
+ static_pref_list.script = 'init/generate_static_pref_list.py:emit_code'
+ static_pref_list.inputs = ['init/StaticPrefList.yaml']
diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py
--- a/python/mozbuild/mozpack/chrome/flags.py
@@ -175,7 +175,7 @@ diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloa
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
-@@ -1204,36 +1204,66 @@ nsUnknownContentTypeDialog.prototype = {
+@@ -1199,36 +1199,66 @@ nsUnknownContentTypeDialog.prototype = {
params.handlerApp &&
params.handlerApp.executable &&
params.handlerApp.executable.isFile()
@@ -302,7 +302,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {
// dbus prevents us from being threadsafe, but this routine should not block
// anyhow
-@@ -382,21 +385,50 @@ nsresult nsUnixSystemProxySettings::GetP
+@@ -381,21 +384,50 @@ nsresult nsUnixSystemProxySettings::GetP
return NS_OK;
}
@@ -356,7 +356,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
-@@ -83,17 +83,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
+@@ -85,17 +85,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
'../components/printingui',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
@@ -364,7 +364,7 @@ diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
'nsNativeAppSupportDefault.cpp',
'UIKitDirProvider.mm',
]
- elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
+ EXPORTS += ['nsKDEUtils.h']
UNIFIED_SOURCES += [
+ 'nsKDEUtils.cpp',
@@ -781,7 +781,7 @@ new file mode 100644
diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandler/HandlerServiceParent.cpp
--- a/uriloader/exthandler/HandlerServiceParent.cpp
+++ b/uriloader/exthandler/HandlerServiceParent.cpp
-@@ -1,17 +1,17 @@
+@@ -7,17 +7,17 @@
#include "mozilla/ipc/ProtocolUtils.h"
#include "mozilla/Logging.h"
#include "HandlerServiceParent.h"
@@ -800,7 +800,7 @@ diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandle
using mozilla::dom::RemoteHandlerApp;
namespace {
-@@ -282,17 +282,17 @@ mozilla::ipc::IPCResult HandlerServicePa
+@@ -288,17 +288,17 @@ mozilla::ipc::IPCResult HandlerServicePa
mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocolOS(
const nsCString& aProtocolScheme, bool* aHandlerExists) {
if (aProtocolScheme.Length() > MAX_SCHEME_LENGTH) {
@@ -819,7 +819,7 @@ diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandle
/*
* Check if a handler exists for the provided protocol. Check the datastore
-@@ -311,17 +311,17 @@ mozilla::ipc::IPCResult HandlerServicePa
+@@ -317,17 +317,17 @@ mozilla::ipc::IPCResult HandlerServicePa
nsCOMPtr<nsIExternalProtocolService> protoSvc =
do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID, &rv);
if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -848,7 +848,7 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
CXXFLAGS += ['-Wno-error=shadow']
- if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
UNIFIED_SOURCES += [
+ 'unix/nsCommonRegistry.cpp',
'unix/nsGNOMERegistry.cpp',
@@ -877,7 +877,7 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
CXXFLAGS += CONFIG['TK_CFLAGS']
CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
CXXFLAGS += CONFIG['TK_CFLAGS']
diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp
new file mode 100644
@@ -1826,7 +1826,7 @@ diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
+ '/toolkit/xre',
]
- if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
CXXFLAGS += CONFIG['TK_CFLAGS']
if CONFIG['MOZ_LAYOUT_DEBUGGER']: