From 90168896e31334eebe9edfa11ea1f72ac4efa147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Thu, 31 Oct 2019 20:04:33 +0300 Subject: [PATCH] Updated to 70.0 --- .abf.yml | 2 +- firefox-56.0-build-error.patch | 2 +- firefox-kde.patch | 79 +++------------------------------- firefox.spec | 17 +++----- mozilla-kde-background.patch | 3 +- mozilla-kde.patch | 42 +++++++++--------- 6 files changed, 36 insertions(+), 109 deletions(-) diff --git a/.abf.yml b/.abf.yml index 9a56425..debde9a 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,4 @@ sources: cbindgen-vendor.tar.xz: f661af3f8e6a52af8f0bc206987134e66b449fe0 - firefox-69.0.3.source.tar.xz: a1ae50dd7a7cf17f28a4e7a88d87e25050b977b3 + firefox-70.0.source.tar.xz: 7eccef97655ad8b127213923bfd97401d6a17836 firefox-dictionary-61.0.2.tar.bz2: 25929c585dc8568a32d5be49aacc672f0ed2202f diff --git a/firefox-56.0-build-error.patch b/firefox-56.0-build-error.patch index ab373cd..63c2ef4 100644 --- a/firefox-56.0-build-error.patch +++ b/firefox-56.0-build-error.patch @@ -32,9 +32,9 @@ --- firefox-61.0/layout/base/nsPresContext.h.orig 2018-06-26 23:51:02.000000000 +0300 +++ firefox-61.0/layout/base/nsPresContext.h 2018-06-27 00:03:52.872210766 +0300 @@ -39,11 +39,11 @@ - #include "mozilla/MemoryReporting.h" #include "mozilla/TimeStamp.h" #include "mozilla/AppUnits.h" + #include "mozilla/MediaEmulationData.h" -#include "prclist.h" +#include "nspr4/prclist.h" #include "nsThreadUtils.h" diff --git a/firefox-kde.patch b/firefox-kde.patch index 5a19dd6..2b9697d 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 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 command = do_CreateInstance( NS_ARRAY_CONTRACTID ); -+ if (!command) -+ return NS_ERROR_FAILURE; -+ -+ nsCOMPtr 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 command = do_CreateInstance( NS_ARRAY_CONTRACTID ); -+ if (!command) -+ return NS_ERROR_FAILURE; -+ -+ nsCOMPtr cmdstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID ); -+ nsCOMPtr appstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID ); -+ nsCOMPtr 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 e9d669f..da32f52 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 69.0.3 +%define major 70.0 %define ff_epoch 0 # (tpg) set version HERE !!! %define realver %{major} @@ -227,27 +227,24 @@ pushd security/nss/lib/ckfw/builtins perl ./certdata.perl /etc/pki/tls/mozilla/certdata.txt popd +%build %if 0%{?use_bundled_cbindgen} mkdir -p my_rust_vendor cd my_rust_vendor -tar xf %{SOURCE12} -cd - +%{__tar} xf %{SOURCE12} mkdir -p .cargo cat > .cargo/config < Author: Lubos Lunak @@ -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 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 Preferences::Ini +@@ -4606,17 +4619,17 @@ nsresult Preferences::InitInitialObjects } nsCOMPtr 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 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']: