From ab3f6bf856b253c6bd05ae8e6bbecc000e1ea6a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Wed, 8 Jan 2020 21:45:31 +0300 Subject: [PATCH] Updated to 72.0.1 --- .abf.yml | 2 +- firefox-56.0-build-error.patch | 2 +- firefox.spec | 2 +- mozilla-kde.patch | 26 +++++++++++++------------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.abf.yml b/.abf.yml index f1e2009..99479a6 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,4 @@ sources: cbindgen-vendor.tar.xz: f661af3f8e6a52af8f0bc206987134e66b449fe0 - firefox-71.0.source.tar.xz: 8cb0b0ba8473412e8e25cdcb0cfa225d15a15640 + firefox-72.0.1.source.tar.xz: bfe2a6c57cc9c192681388c9e4af9c0c44f315a6 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 63c2ef4..46aad66 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/TimeStamp.h" #include "mozilla/AppUnits.h" #include "mozilla/MediaEmulationData.h" + #include "mozilla/PresShellForwards.h" -#include "prclist.h" +#include "nspr4/prclist.h" #include "nsThreadUtils.h" diff --git a/firefox.spec b/firefox.spec index 5ddaf07..91fe622 100644 --- a/firefox.spec +++ b/firefox.spec @@ -14,7 +14,7 @@ %define _host i686-unknown-linux-gnu %endif -%define major 71.0 +%define major 72.0.1 %define ff_epoch 0 # (tpg) set version HERE !!! %define realver %{major} diff --git a/mozilla-kde.patch b/mozilla-kde.patch index 4b36d3e..1c68c56 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 86d7ace0b36abf542e56fbb702a5f9b308b9bf77 +# Parent 52a515e07938d75f7c33e7b724845ce6dc315c0c Description: Add KDE integration to Firefox (toolkit parts) Author: Wolfgang Rosenauer Author: Lubos Lunak @@ -31,7 +31,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp #ifdef MOZ_MEMORY # include "mozmemory.h" #endif -@@ -4542,25 +4543,37 @@ nsresult Preferences::InitInitialObjects +@@ -4543,25 +4544,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. -@@ -4606,17 +4619,17 @@ nsresult Preferences::InitInitialObjects +@@ -4607,17 +4620,17 @@ nsresult Preferences::InitInitialObjects } nsCOMPtr path = do_QueryInterface(elem); @@ -91,7 +91,7 @@ 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 -@@ -110,16 +110,20 @@ EXPORTS.mozilla += [ +@@ -113,16 +113,20 @@ EXPORTS.mozilla += [ ] EXPORTS.mozilla += sorted(['!' + g for g in gen_h]) @@ -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 -@@ -85,17 +85,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co +@@ -87,17 +87,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co '../components/printingui', ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit': @@ -841,7 +841,7 @@ diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandle diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build --- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build -@@ -83,17 +83,19 @@ else: +@@ -85,17 +85,19 @@ else: SOURCES += [ osdir + '/nsOSHelperAppService.cpp', ] @@ -861,7 +861,7 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build 'android/nsExternalURLHandlerService.cpp', 'android/nsMIMEInfoAndroid.cpp', ] -@@ -133,16 +135,17 @@ include('/ipc/chromium/chromium-config.m +@@ -135,16 +137,17 @@ include('/ipc/chromium/chromium-config.m FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ @@ -1252,9 +1252,9 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth #endif } - nsresult nsOSHelperAppService::GetFileTokenForPath( - const char16_t* platformAppPath, nsIFile** aFile) { -@@ -1136,17 +1136,17 @@ already_AddRefed nsOSHel + NS_IMETHODIMP nsOSHelperAppService::IsCurrentAppOSDefaultForProtocol( + const nsACString& aScheme, bool* _retval) { +@@ -1142,17 +1142,17 @@ already_AddRefed nsOSHel nsresult rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, minorType, mime_types_description, true); @@ -1273,7 +1273,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, minorType, mime_types_description, false); -@@ -1248,17 +1248,17 @@ already_AddRefed nsOSHel +@@ -1254,17 +1254,17 @@ already_AddRefed nsOSHel // Now look up our extensions nsAutoString extensions, mime_types_description; @@ -1295,7 +1295,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build -@@ -126,16 +126,17 @@ include('/ipc/chromium/chromium-config.m +@@ -127,16 +127,17 @@ include('/ipc/chromium/chromium-config.m FINAL_LIBRARY = 'xul' @@ -1814,7 +1814,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build --- a/xpcom/components/moz.build +++ b/xpcom/components/moz.build -@@ -66,16 +66,17 @@ LOCAL_INCLUDES += [ +@@ -62,16 +62,17 @@ LOCAL_INCLUDES += [ '!..', '../base', '../build',