diff options
| -rw-r--r-- | firefox-mozconfig | 1 | ||||
| -rw-r--r-- | firefox-nss-version.patch | 12 | ||||
| -rw-r--r-- | firefox.spec | 2 | ||||
| -rw-r--r-- | mozilla-gnome-shell-search-fixes.patch | 33 |
4 files changed, 28 insertions, 20 deletions
diff --git a/firefox-mozconfig b/firefox-mozconfig index bc70421..d022604 100644 --- a/firefox-mozconfig +++ b/firefox-mozconfig @@ -12,7 +12,6 @@ ac_add_options --enable-pulseaudio ac_add_options --without-system-icu ac_add_options --enable-release ac_add_options --update-channel=release -ac_add_options --disable-system-sqlite # Workaround for mozbz#1341234 ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)" ac_add_options --enable-av1 diff --git a/firefox-nss-version.patch b/firefox-nss-version.patch index 26d635c..d154968 100644 --- a/firefox-nss-version.patch +++ b/firefox-nss-version.patch @@ -1,12 +1,12 @@ -diff -up firefox-71.0/old-configure.in.nss-version firefox-71.0/old-configure.in ---- firefox-71.0/old-configure.in.nss-version 2019-11-25 15:15:15.767572575 +0100 -+++ firefox-71.0/old-configure.in 2019-11-25 15:16:47.363498527 +0100 -@@ -1512,7 +1512,7 @@ MOZ_ARG_WITH_BOOL(system-nss, +diff -up firefox-75.0/old-configure.in.nss-version firefox-75.0/old-configure.in +--- firefox-75.0/old-configure.in.nss-version 2020-04-07 07:59:28.091106813 +0200 ++++ firefox-75.0/old-configure.in 2020-04-07 08:00:30.272678298 +0200 +@@ -1504,7 +1504,7 @@ MOZ_ARG_WITH_BOOL(system-nss, _USE_SYSTEM_NSS=1 ) if test -n "$_USE_SYSTEM_NSS"; then -- AM_PATH_NSS(3.47.1, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) -+ AM_PATH_NSS(3.47.0, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) +- AM_PATH_NSS(3.51, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) ++ AM_PATH_NSS(3.50, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) fi NSS_CFLAGS="$NSS_CFLAGS -I${DIST}/include/nss" diff --git a/firefox.spec b/firefox.spec index ea640a5..8975a0f 100644 --- a/firefox.spec +++ b/firefox.spec @@ -363,7 +363,7 @@ This package contains results of tests executed during build. %if 0%{?big_endian} %patch26 -p1 -b .icu %endif -#%patch46 -p1 -b .nss-version +%patch46 -p1 -b .nss-version %patch47 -p1 -b .fedora-shebang %patch48 -p1 -b .build-arm-wasm %patch49 -p1 -b .build-arm-libaom diff --git a/mozilla-gnome-shell-search-fixes.patch b/mozilla-gnome-shell-search-fixes.patch index b7bf256..41a11e8 100644 --- a/mozilla-gnome-shell-search-fixes.patch +++ b/mozilla-gnome-shell-search-fixes.patch @@ -1,7 +1,16 @@ -diff -up firefox-74.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp.gnome-shell-search-fixes firefox-74.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp ---- firefox-74.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp.gnome-shell-search-fixes 2020-04-01 12:45:40.567097335 +0200 -+++ firefox-74.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp 2020-04-01 13:01:05.014591437 +0200 -@@ -289,20 +289,12 @@ AsyncFaviconDataReady::OnComplete(nsIURI +diff -up firefox-75.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp.gnome-shell-search-fixes firefox-75.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp +--- firefox-75.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp.gnome-shell-search-fixes 2020-04-07 08:01:50.587124776 +0200 ++++ firefox-75.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp 2020-04-07 10:14:02.530380225 +0200 +@@ -26,6 +26,8 @@ + #include "nsIStringBundle.h" + #include "imgIContainer.h" + #include "imgITools.h" ++#include "nsNetCID.h" ++#include "nsIIOService.h" + + #include "mozilla/gfx/DataSurfaceHelpers.h" + +@@ -289,20 +291,12 @@ AsyncFaviconDataReady::OnComplete(nsIURI } void nsGNOMEShellSearchProvider::ComposeSearchResultReply( @@ -26,7 +35,7 @@ diff -up firefox-74.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp.gn } DBusMessageIter iter; -@@ -310,30 +302,41 @@ void nsGNOMEShellSearchProvider::Compose +@@ -310,30 +304,41 @@ void nsGNOMEShellSearchProvider::Compose DBusMessageIter iterArray; dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &iterArray); @@ -87,7 +96,7 @@ diff -up firefox-74.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp.gn } nsPrintfCString searchString("%s:%s", KEYWORD_SEARCH_STRING, aSearchTerm); -@@ -346,7 +349,7 @@ void nsGNOMEShellSearchProvider::Compose +@@ -346,7 +351,7 @@ void nsGNOMEShellSearchProvider::Compose DBusHandlerResult nsGNOMEShellSearchProvider::GetInitialResultSet( DBusMessage* aMsg) { DBusMessage* reply; @@ -96,7 +105,7 @@ diff -up firefox-74.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp.gn int elements; if (!dbus_message_get_args(aMsg, nullptr, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, -@@ -356,9 +359,10 @@ DBusHandlerResult nsGNOMEShellSearchProv +@@ -356,9 +361,10 @@ DBusHandlerResult nsGNOMEShellSearchProv } else { reply = dbus_message_new_method_return(aMsg); nsresult rv = NewHistorySearch(stringArray[0]); @@ -110,7 +119,7 @@ diff -up firefox-74.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp.gn dbus_free_string_array(stringArray); } -@@ -384,9 +388,8 @@ DBusHandlerResult nsGNOMEShellSearchProv +@@ -384,9 +390,8 @@ DBusHandlerResult nsGNOMEShellSearchProv } else { reply = dbus_message_new_method_return(aMsg); nsresult rv = NewHistorySearch(stringArray[0]); @@ -122,7 +131,7 @@ diff -up firefox-74.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp.gn } if (unusedArray) { -@@ -556,6 +559,10 @@ void nsGNOMEShellSearchProvider::LaunchW +@@ -556,6 +561,10 @@ void nsGNOMEShellSearchProvider::LaunchW nsCOMPtr<nsINavHistoryResultNode> child; mHistResultContainer->GetChild(keyIndex, getter_AddRefs(child)); @@ -133,9 +142,9 @@ diff -up firefox-74.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp.gn nsAutoCString uri; nsresult rv = child->GetUri(uri); if (NS_FAILED(rv)) { -diff -up firefox-74.0/browser/components/shell/nsGNOMEShellSearchProvider.h.gnome-shell-search-fixes firefox-74.0/browser/components/shell/nsGNOMEShellSearchProvider.h ---- firefox-74.0/browser/components/shell/nsGNOMEShellSearchProvider.h.gnome-shell-search-fixes 2020-04-01 12:45:40.569097323 +0200 -+++ firefox-74.0/browser/components/shell/nsGNOMEShellSearchProvider.h 2020-04-01 12:52:51.368536263 +0200 +diff -up firefox-75.0/browser/components/shell/nsGNOMEShellSearchProvider.h.gnome-shell-search-fixes firefox-75.0/browser/components/shell/nsGNOMEShellSearchProvider.h +--- firefox-75.0/browser/components/shell/nsGNOMEShellSearchProvider.h.gnome-shell-search-fixes 2020-04-07 08:01:50.587124776 +0200 ++++ firefox-75.0/browser/components/shell/nsGNOMEShellSearchProvider.h 2020-04-07 09:56:30.857553820 +0200 @@ -70,7 +70,8 @@ class nsGNOMEShellSearchProvider : publi bool IsHistoryResultNodeURI(nsINavHistoryResultNode* aHistoryNode); void AppendResultID(DBusMessageIter* aIter, const char* aID); |