# HG changeset patch # User Wolfgang Rosenauer # Date 1588425980 -7200 # Node ID 3fd9346c90a6f6d01822378af915c68ead0ee13e # Parent f890ebd6b62775fa15093563b53bea362031b503 Firefox 76.0 diff -r f890ebd6b627 -r 3fd9346c90a6 MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Mon Apr 20 14:12:08 2020 +0200 +++ b/MozillaFirefox/MozillaFirefox.changes Sat May 02 15:26:20 2020 +0200 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Fri May 1 11:59:58 UTC 2020 - Wolfgang Rosenauer + +- Mozilla Firefox 76.0 +- requires + * NSS >= 3.51.1 + * nasm >= 2.14 +- removed obsolete patch mozilla-bmo1622013.patch +- fix URI creation for KDE file selector integration (boo#1160331) + +------------------------------------------------------------------- Tue Apr 7 12:18:27 UTC 2020 - Wolfgang Rosenauer - Mozilla Firefox 75.0 diff -r f890ebd6b627 -r 3fd9346c90a6 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Mon Apr 20 14:12:08 2020 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Sat May 02 15:26:20 2020 +0200 @@ -18,9 +18,9 @@ # changed with every update -%define major 75 +%define major 76 %define mainver %major.0 -%define orig_version 75.0 +%define orig_version 76.0 %define orig_suffix %{nil} %define update_channel release %define branding 1 @@ -84,8 +84,8 @@ BuildRequires: libproxy-devel BuildRequires: makeinfo BuildRequires: mozilla-nspr-devel >= 4.25 -BuildRequires: mozilla-nss-devel >= 3.51 -BuildRequires: nasm >= 2.13 +BuildRequires: mozilla-nss-devel >= 3.51.1 +BuildRequires: nasm >= 2.14 BuildRequires: nodejs10 >= 10.19.0 BuildRequires: python-devel BuildRequires: python2-xml @@ -186,7 +186,6 @@ Patch20: mozilla-fix-top-level-asm.patch Patch21: mozilla-bmo1504834-part4.patch Patch22: mozilla-bmo849632.patch -Patch23: mozilla-bmo1622013.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -322,7 +321,6 @@ %patch20 -p1 %patch21 -p1 %patch22 -p1 -%patch23 -p1 # Firefox %patch101 -p1 %patch102 -p1 @@ -662,7 +660,6 @@ %{progdir}/browser/defaults %{progdir}/browser/features/ %{progdir}/browser/chrome/icons -%{progdir}/browser/blocklist.xml %{progdir}/browser/omni.ja %dir %{progdir}/distribution/ %{progdir}/distribution/extensions/ diff -r f890ebd6b627 -r 3fd9346c90a6 MozillaFirefox/mozilla-bmo1622013.patch --- a/MozillaFirefox/mozilla-bmo1622013.patch Mon Apr 20 14:12:08 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-bmo1622013.patch \ No newline at end of file diff -r f890ebd6b627 -r 3fd9346c90a6 MozillaFirefox/tar_stamps --- a/MozillaFirefox/tar_stamps Mon Apr 20 14:12:08 2020 +0200 +++ b/MozillaFirefox/tar_stamps Sat May 02 15:26:20 2020 +0200 @@ -1,11 +1,11 @@ PRODUCT="firefox" CHANNEL="release" -VERSION="75.0" +VERSION="76.0" VERSION_SUFFIX="" -PREV_VERSION="75.0" +PREV_VERSION="76.0" PREV_VERSION_SUFFIX="" #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release" -RELEASE_TAG="6200ca9b300670ec069cdbf6e4f05e6a0bca46f1" -RELEASE_TIMESTAMP="20200403170909" +RELEASE_TAG="cf326ad0bb298ee24b1abd9b1cb6513af4fa04ba" +RELEASE_TIMESTAMP="20200429185419" diff -r f890ebd6b627 -r 3fd9346c90a6 mozilla-bmo1463035.patch --- a/mozilla-bmo1463035.patch Mon Apr 20 14:12:08 2020 +0200 +++ b/mozilla-bmo1463035.patch Sat May 02 15:26:20 2020 +0200 @@ -3,7 +3,7 @@ # User Mike Hommey # Date 1526871862 -32400 # Node ID 94f21505ff13cd089f7129cd24927cf8b31a0f43 -# Parent 71b9d492b739602dbfe713fd4de3205e9d485f18 +# Parent 0b7e1398ca2e15e27da93144ba9fb30db38367b1 Bug 1463035 - Remove MOZ_SIGNAL_TRAMPOLINE. r?darchons For some reason, GNU as is not happy with the assembly generated after @@ -12,30 +12,6 @@ OTOH, as mentioned in bug 1238661 comment 4, we actually don't need this workaround anymore, so let's just kill it. -diff --git a/mfbt/moz.build b/mfbt/moz.build ---- a/mfbt/moz.build -+++ b/mfbt/moz.build -@@ -131,20 +131,16 @@ EXPORTS["double-conversion"] = [ - LOCAL_INCLUDES += [ - '/mfbt/double-conversion', - ] - - if CONFIG['OS_ARCH'] == 'WINNT': - EXPORTS.mozilla += [ - 'WindowsVersion.h', - ] --elif CONFIG['OS_ARCH'] == 'Linux': -- EXPORTS.mozilla += [ -- 'LinuxSignal.h', -- ] - - UNIFIED_SOURCES += [ - 'Assertions.cpp', - 'ChaosMode.cpp', - 'double-conversion/double-conversion/bignum-dtoa.cc', - 'double-conversion/double-conversion/bignum.cc', - 'double-conversion/double-conversion/cached-powers.cc', - 'double-conversion/double-conversion/double-to-string.cc', diff --git a/mozglue/baseprofiler/core/platform-linux-android.cpp b/mozglue/baseprofiler/core/platform-linux-android.cpp --- a/mozglue/baseprofiler/core/platform-linux-android.cpp +++ b/mozglue/baseprofiler/core/platform-linux-android.cpp @@ -79,25 +55,7 @@ diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp --- a/tools/profiler/core/platform-linux-android.cpp +++ b/tools/profiler/core/platform-linux-android.cpp -@@ -55,17 +55,16 @@ - #ifdef __GLIBC__ - # include // backtrace, backtrace_symbols - #endif // def __GLIBC__ - #include // index - #include - #include - - #include "prenv.h" --#include "mozilla/LinuxSignal.h" - #include "mozilla/PodOperations.h" - #include "mozilla/DebugOnly.h" - - #include - #include - - using namespace mozilla; - -@@ -257,17 +256,17 @@ Sampler::Sampler(PSLockRef aLock) +@@ -258,17 +258,17 @@ Sampler::Sampler(PSLockRef aLock) // NOTE: We don't initialize LUL here, instead initializing it in // SamplerThread's constructor. This is because with the diff -r f890ebd6b627 -r 3fd9346c90a6 mozilla-bmo1622013.patch --- a/mozilla-bmo1622013.patch Mon Apr 20 14:12:08 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -From be45ba20c33a8a247115e79fd4c1f3295d652ba3 Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Mon, 23 Mar 2020 08:20:22 +0000 -Subject: [PATCH] Bug 1622013 - Build *_mmx.c files with -mmmx in bundled libvpx. - -diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build -index f3845941fe4de..47853d43408b7 100644 ---- a/media/libvpx/moz.build -+++ b/media/libvpx/moz.build -@@ -97,16 +97,18 @@ if CONFIG['OS_TARGET'] == 'Android': - DEFINES['__linux__'] = True - - SOURCES += [ - '%%%s/sources/android/cpufeatures/cpu-features.c' % CONFIG['ANDROID_NDK'], - ] - - for f in SOURCES: - if f.endswith('.c'): -+ if 'mmx.c' in f: -+ SOURCES[f].flags += ['-mmmx'] - if 'sse2.c' in f: - SOURCES[f].flags += CONFIG['SSE2_FLAGS'] - if 'ssse3.c' in f: - SOURCES[f].flags += ['-mssse3'] - if 'sse4.c' in f: - SOURCES[f].flags += ['-msse4.1'] - if 'avx.c' in f: - SOURCES[f].flags += ['-mavx'] diff -r f890ebd6b627 -r 3fd9346c90a6 mozilla-kde.patch --- a/mozilla-kde.patch Mon Apr 20 14:12:08 2020 +0200 +++ b/mozilla-kde.patch Sat May 02 15:26:20 2020 +0200 @@ -3,7 +3,7 @@ # Date 1559294891 -7200 # Fri May 31 11:28:11 2019 +0200 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 -# Parent fbac8545cf6f461803505c2d1f57531798dee96a +# Parent 04c2cbd396b26a8e08980304a436e5e12fb6a205 Description: Add KDE integration to Firefox (toolkit parts) Author: Wolfgang Rosenauer Author: Lubos Lunak @@ -31,7 +31,7 @@ #ifdef MOZ_MEMORY # include "mozmemory.h" #endif -@@ -4535,25 +4536,37 @@ nsresult Preferences::InitInitialObjects +@@ -4539,25 +4540,37 @@ nsresult Preferences::InitInitialObjects // application pref files for backwards compatibility. static const char* specialFiles[] = { #if defined(XP_MACOSX) @@ -69,7 +69,7 @@ // Load jar:$app/omni.jar!/defaults/preferences/*.js // or jar:$gre/omni.jar!/defaults/preferences/*.js. -@@ -4599,17 +4612,17 @@ nsresult Preferences::InitInitialObjects +@@ -4603,17 +4616,17 @@ nsresult Preferences::InitInitialObjects } nsCOMPtr path = do_QueryInterface(elem); @@ -87,7 +87,7 @@ SetupTelemetryPref(); } - NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID, nullptr, + if (aIsStartup) { diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build --- a/modules/libpref/moz.build +++ b/modules/libpref/moz.build @@ -175,7 +175,7 @@ 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 -@@ -1209,36 +1209,66 @@ nsUnknownContentTypeDialog.prototype = { +@@ -1205,36 +1205,66 @@ nsUnknownContentTypeDialog.prototype = { params.handlerApp && params.handlerApp.executable && params.handlerApp.executable.isFile() @@ -1104,7 +1104,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -@@ -1,47 +1,50 @@ +@@ -1,46 +1,49 @@ /* -*- Mode: C++; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 2 -*- * * This Source Code Form is subject to the terms of the Mozilla Public @@ -1117,7 +1117,6 @@ #include "nsIGIOService.h" #include "nsNetCID.h" #include "nsIIOService.h" - #include "nsAutoPtr.h" #ifdef MOZ_ENABLE_DBUS # include "nsDBusHandlerApp.h" #endif @@ -1160,7 +1159,7 @@ if (*_retval) return NS_OK; return NS_OK; -@@ -51,16 +54,33 @@ nsresult nsMIMEInfoUnix::LaunchDefaultWi +@@ -50,16 +53,33 @@ nsresult nsMIMEInfoUnix::LaunchDefaultWi // if mDefaultApplication is set, it means the application has been set from // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to // give the GNOME answer. @@ -1216,7 +1215,7 @@ #include "nsIFileStreams.h" #include "nsILineInputStream.h" #include "nsIFile.h" -@@ -1024,17 +1024,17 @@ nsresult nsOSHelperAppService::GetHandle +@@ -1023,17 +1023,17 @@ nsresult nsOSHelperAppService::GetHandle nsresult nsOSHelperAppService::OSProtocolHandlerExists( const char* aProtocolScheme, bool* aHandlerExists) { @@ -1235,7 +1234,7 @@ nsCOMPtr handlerSvc = do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv) && handlerSvc) { -@@ -1044,17 +1044,17 @@ nsresult nsOSHelperAppService::OSProtoco +@@ -1043,17 +1043,17 @@ nsresult nsOSHelperAppService::OSProtoco } return rv; @@ -1254,7 +1253,7 @@ NS_IMETHODIMP nsOSHelperAppService::IsCurrentAppOSDefaultForProtocol( const nsACString& aScheme, bool* _retval) { -@@ -1141,17 +1141,17 @@ already_AddRefed nsOSHel +@@ -1140,17 +1140,17 @@ already_AddRefed nsOSHel nsresult rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, minorType, mime_types_description, true); @@ -1273,7 +1272,7 @@ rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, minorType, mime_types_description, false); -@@ -1253,17 +1253,17 @@ already_AddRefed nsOSHel +@@ -1252,17 +1252,17 @@ already_AddRefed nsOSHel // Now look up our extensions nsAutoString extensions, mime_types_description; @@ -1333,7 +1332,7 @@ #include "nsGtkUtils.h" #include "nsIFileURL.h" #include "nsIGIOService.h" -@@ -20,16 +21,17 @@ +@@ -20,16 +21,18 @@ #include "nsArrayEnumerator.h" #include "nsMemory.h" #include "nsEnumeratorUtils.h" @@ -1343,6 +1342,7 @@ #include "nsFilePicker.h" +#include "nsKDEUtils.h" ++#include "nsURLHelper.h" using namespace mozilla; @@ -1351,7 +1351,7 @@ #define MAX_PREVIEW_SOURCE_SIZE 4096 nsIFile* nsFilePicker::mPrevDisplayDirectory = nullptr; -@@ -227,17 +229,19 @@ nsFilePicker::AppendFilters(int32_t aFil +@@ -227,17 +230,19 @@ nsFilePicker::AppendFilters(int32_t aFil mAllowURLs = !!(aFilterMask & filterAllowURLs); return nsBaseFilePicker::AppendFilters(aFilterMask); } @@ -1372,7 +1372,7 @@ mFilters.AppendElement(filter); mFilterNames.AppendElement(name); -@@ -337,16 +341,39 @@ nsresult nsFilePicker::Show(int16_t* aRe +@@ -337,16 +342,39 @@ nsresult nsFilePicker::Show(int16_t* aRe return NS_OK; } @@ -1412,7 +1412,7 @@ GtkFileChooserAction action = GetGtkFileChooserAction(mMode); const gchar* accept_button; -@@ -571,16 +598,240 @@ void nsFilePicker::Done(void* file_choos +@@ -571,16 +599,244 @@ void nsFilePicker::Done(void* file_choos mCallback->Done(result); mCallback = nullptr; } else { @@ -1578,8 +1578,12 @@ + mFileURL = output[ 0 ]; + else // GetFile() actually requires it to be url even for local files :-/ + { -+ mFileURL = nsCString( "file://" ); -+ mFileURL.Append( output[ 0 ] ); ++ nsCOMPtr localfile; ++ nsresult rv = NS_NewNativeLocalFile( output[ 0 ], ++ PR_FALSE, ++ getter_AddRefs(localfile)); ++ if (NS_SUCCEEDED(rv)) ++ rv = net_GetURLSpecFromActualFile(localfile, mFileURL); + } + } + // Remember last used directory. diff -r f890ebd6b627 -r 3fd9346c90a6 series --- a/series Mon Apr 20 14:12:08 2020 +0200 +++ b/series Sat May 02 15:26:20 2020 +0200 @@ -21,7 +21,6 @@ mozilla-fix-top-level-asm.patch mozilla-bmo1504834-part4.patch mozilla-bmo849632.patch -mozilla-bmo1622013.patch # Firefox patches firefox-kde.patch