diff options
| -rw-r--r-- | .SRCINFO | 30 | ||||
| -rw-r--r-- | 5022efe33088.patch | 358 | ||||
| -rw-r--r-- | PKGBUILD | 33 | ||||
| -rw-r--r-- | revert_dav1d_changes.patch.xz | bin | 199816 -> 728 bytes | |||
| -rw-r--r-- | unity-menubar.patch | 8 |
5 files changed, 172 insertions, 257 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sun Jan 2 15:57:46 UTC 2022 +# Sun Mar 6 19:23:10 UTC 2022 pkgbase = firefox-kde-opensuse pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE - pkgver = 95.0.2 + pkgver = 97.0.1 pkgrel = 1 url = https://github.com/openSUSE/firefox-maintenance arch = i686 @@ -59,18 +59,18 @@ pkgbase = firefox-kde-opensuse optdepends = networkmanager: Location detection via available WiFi networks optdepends = speech-dispatcher: Text-to-Speech optdepends = pulseaudio: Audio support - provides = firefox=95.0.2 + provides = firefox=97.0.1 conflicts = firefox options = !emptydirs - source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_95_0_2_RELEASE + source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_97_0_1_RELEASE source = mozconfig source = firefox.desktop source = vendor.js source = kde.js - source = firefox-branded-icons-7c17f3c4df7423951b09c407183c30ba47c60cd5.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/7c17f3c4df7423951b09c407183c30ba47c60cd5/firefox/firefox-branded-icons.patch - source = firefox-kde-7c17f3c4df7423951b09c407183c30ba47c60cd5.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/7c17f3c4df7423951b09c407183c30ba47c60cd5/firefox/firefox-kde.patch - source = mozilla-kde-7c17f3c4df7423951b09c407183c30ba47c60cd5.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/7c17f3c4df7423951b09c407183c30ba47c60cd5/mozilla-kde.patch - source = mozilla-nongnome-proxies-7c17f3c4df7423951b09c407183c30ba47c60cd5.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/7c17f3c4df7423951b09c407183c30ba47c60cd5/mozilla-nongnome-proxies.patch + source = firefox-branded-icons-536158d6ee8110971fc9fc861432ae26c0d9c6a3.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/536158d6ee8110971fc9fc861432ae26c0d9c6a3/firefox/firefox-branded-icons.patch + source = firefox-kde-536158d6ee8110971fc9fc861432ae26c0d9c6a3.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/536158d6ee8110971fc9fc861432ae26c0d9c6a3/firefox/firefox-kde.patch + source = mozilla-kde-536158d6ee8110971fc9fc861432ae26c0d9c6a3.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/536158d6ee8110971fc9fc861432ae26c0d9c6a3/mozilla-kde.patch + source = mozilla-nongnome-proxies-536158d6ee8110971fc9fc861432ae26c0d9c6a3.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/536158d6ee8110971fc9fc861432ae26c0d9c6a3/mozilla-nongnome-proxies.patch source = unity-menubar.patch source = add_missing_pgo_rule.patch source = pgo_fix_missing_kdejs.patch @@ -84,12 +84,9 @@ pkgbase = firefox-kde-opensuse source = 0022-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch source = 0024-Fix-building-with-PGO-when-using-GCC.patch source = 0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch - source = 0028-Make-elfhack-use-toolchain.patch source = fix_csd_window_buttons.patch source = fix-wayland-build.patch source = revert_dav1d_changes.patch.xz - source = mozilla-bmo1744896.patch - source = mozilla-bmo1745560.patch md5sums = SKIP md5sums = 9530b0395a095c0b47ee42d0996ec163 md5sums = a26a061efb4def6572d5b319d657f1d6 @@ -97,27 +94,24 @@ pkgbase = firefox-kde-opensuse md5sums = 05bb69d25fb3572c618e3adf1ee7b670 md5sums = b386ac38ffb7e545b9473e516455a25f md5sums = 1d5e9215530ef6778299b67dc6dba65e - md5sums = 01329185574709cb420f2c4531597d37 + md5sums = 0eeb274bd4f1783075cfac3a5a852e3c md5sums = 0a5733b7a457a2786c2dd27626a1bf88 - md5sums = 512c6c55c637fd2fee7a5e71f38dd54c + md5sums = 5c1d49167ee43fb952075867605dd5f7 md5sums = fe24f5ea463013bb7f1c12d12dce41b2 md5sums = 3c383d371d7f6ede5983a40310518715 md5sums = 350c258cdaeef99b4638c5181fda3ad2 md5sums = 9e518b30cf2ff9afd0423c79d12ae7b2 md5sums = 4fa2216039664edad586b230b05fbd0a md5sums = e7994b3b78b780ebe610ba3d87247e40 - md5sums = 00abc3976f028f8fe07111b9e687b574 + md5sums = 548de130fc0f470bff0b6d994a0a91cd md5sums = c7b492df4fbf42ffe8aea4c0afb89921 md5sums = 316d71d9cec400890db2ee8c362e672f md5sums = c6c0e47c9b517e5146a8925f442b811b md5sums = 943b9fe2ba474f7809a41622744f97f9 md5sums = 31f950a94966287bfa6ccf03030781cc - md5sums = a59f137deca1da83de10a122984457d7 md5sums = f49ac3b9f5146e33ce587e6b23eb1a86 md5sums = 2cf74781f6b742d6b7e6f7251f49311a - md5sums = d633782c58cd8b8b165e32940ec7cb46 - md5sums = c8593df8bc18e8cacfa4f36cdc31649f - md5sums = e9ce01b511ca4e5f37278d7748b8b723 + md5sums = 3467677cadefe358473555340f681ae6 pkgname = firefox-kde-opensuse diff --git a/5022efe33088.patch b/5022efe33088.patch index d3bf3c4e55af..9c12394f9472 100644 --- a/5022efe33088.patch +++ b/5022efe33088.patch @@ -1,278 +1,220 @@ - -# HG changeset patch -# User Marco Bonardo <mbonardo@mozilla.com> -# Date 1582236963 0 -# Node ID 5022efe33088676d18253c3c2f86ada5ba7a9cbe -# Parent b22c07ea7c728cc962094c94d18aeed414c4936a -Bug 1611386 - Drop support for --enable-system-sqlite. r=asuth,glandium - -Differential Revision: https://phabricator.services.mozilla.com/D63177 - -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 -@@ -138,11 +138,9 @@ +diff -r 8753b16d88a2 browser/installer/package-manifest.in +--- a/browser/installer/package-manifest.in Sat Mar 05 00:24:48 2022 +0000 ++++ b/browser/installer/package-manifest.in Sun Mar 06 15:04:56 2022 +0200 +@@ -139,9 +139,11 @@ @RESPATH@/update-settings.ini #endif @RESPATH@/platform.ini --#ifndef MOZ_SYSTEM_SQLITE ++#ifndef MOZ_SYSTEM_SQLITE #ifndef MOZ_FOLD_LIBS @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@ #endif --#endif ++#endif @BINPATH@/@DLL_PREFIX@lgpllibs@DLL_SUFFIX@ #ifdef MOZ_FFVPX @BINPATH@/@DLL_PREFIX@mozavutil@DLL_SUFFIX@ - -diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure ---- a/build/moz.configure/old.configure -+++ b/build/moz.configure/old.configure -@@ -103,7 +103,6 @@ - "--enable-system-cairo", - "--enable-system-extension-dirs", - "--enable-system-pixman", -- "--enable-system-sqlite", - "--enable-universalchardet", - "--enable-updater", - "--enable-xul", -diff --git a/config/external/sqlite/moz.build b/config/external/sqlite/moz.build ---- a/config/external/sqlite/moz.build -+++ b/config/external/sqlite/moz.build -@@ -4,19 +4,15 @@ +diff -r 8753b16d88a2 config/external/sqlite/moz.build +--- a/config/external/sqlite/moz.build Sat Mar 05 00:24:48 2022 +0000 ++++ b/config/external/sqlite/moz.build Sun Mar 06 15:04:56 2022 +0200 +@@ -4,15 +4,18 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. --if CONFIG['MOZ_SYSTEM_SQLITE']: -- Library('sqlite') -- OS_LIBS += CONFIG['SQLITE_LIBS'] -+DIRS += ["../../../third_party/sqlite3/src"] -+if CONFIG["MOZ_FOLD_LIBS"]: -+ Library("sqlite") -+ # When folding libraries, sqlite is actually in the nss library. -+ USE_LIBS += [ -+ "nss", -+ ] +-DIRS += ["../../../third_party/sqlite3/src"] +-if CONFIG["MOZ_FOLD_LIBS"]: +- Library("sqlite") +- # When folding libraries, sqlite is actually in the nss library. +- USE_LIBS += [ +- "nss", +- ] ++if CONFIG['MOZ_SYSTEM_SQLITE']: ++ Library('sqlite') ++ OS_LIBS += CONFIG['SQLITE_LIBS'] else: -- DIRS += ['../../../third_party/sqlite3/src'] -- if CONFIG['MOZ_FOLD_LIBS']: -- Library('sqlite') -- # When folding libraries, sqlite is actually in the nss library. -- USE_LIBS += [ -- 'nss', -- ] -- else: -- SharedLibrary('sqlite') -- SHARED_LIBRARY_NAME = 'mozsqlite3' -+ SharedLibrary("sqlite") -+ SHARED_LIBRARY_NAME = "mozsqlite3" - -- SYMBOLS_FILE = '/third_party/sqlite3/src/sqlite.symbols' -+ SYMBOLS_FILE = "/third_party/sqlite3/src/sqlite.symbols" -diff --git a/old-configure.in b/old-configure.in ---- a/old-configure.in -+++ b/old-configure.in -@@ -58,7 +58,6 @@ - GDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_14 - W32API_VERSION=3.14 - DBUS_VERSION=0.60 --SQLITE_VERSION=3.31.1 - - dnl Set various checks - dnl ======================================================== -@@ -2038,35 +2037,11 @@ - dnl ======================================================== - MOZ_ARG_HEADER(Individual module options) - --dnl ======================================================== --dnl Check for sqlite --dnl ======================================================== +- SharedLibrary("sqlite") +- SHARED_LIBRARY_NAME = "mozsqlite3" - --MOZ_SYSTEM_SQLITE= --MOZ_ARG_ENABLE_BOOL(system-sqlite, --[ --enable-system-sqlite Use system sqlite (located with pkgconfig)], --MOZ_SYSTEM_SQLITE=1, --MOZ_SYSTEM_SQLITE= ) -- --if test -n "$MOZ_SYSTEM_SQLITE" --then -- dnl ============================ -- dnl === SQLite Version check === -- dnl ============================ -- dnl Check to see if the system SQLite package is new enough. -- PKG_CHECK_MODULES(SQLITE, sqlite3 >= $SQLITE_VERSION) --else -- dnl ============================== -- dnl === SQLite fdatasync check === -- dnl ============================== -- dnl Check to see if fdatasync is available -- AC_CHECK_FUNC(fdatasync) --fi -- --if test -n "$MOZ_SYSTEM_SQLITE"; then -- AC_DEFINE(MOZ_SYSTEM_SQLITE) --fi --AC_SUBST(MOZ_SYSTEM_SQLITE) -+dnl ============================== -+dnl === SQLite fdatasync check === -+dnl ============================== -+dnl Check to see if fdatasync is available and make use of it -+AC_CHECK_FUNC(fdatasync) - - dnl ======================================================== - dnl = Disable zipwriter -diff --git a/storage/SQLiteMutex.h b/storage/SQLiteMutex.h ---- a/storage/SQLiteMutex.h -+++ b/storage/SQLiteMutex.h -@@ -51,35 +51,35 @@ class SQLiteMutex : private BlockingReso - */ - void destroy() { mMutex = NULL; } - - /** - * Acquires the mutex. +- SYMBOLS_FILE = "/third_party/sqlite3/src/sqlite.symbols" ++ if CONFIG['MOZ_FOLD_LIBS']: ++ Library('sqlite') ++ # When folding libraries, sqlite is actually in the nss library. ++ USE_LIBS += [ ++ 'nss', ++ ] ++ else: ++ SharedLibrary('sqlite') ++ SHARED_LIBRARY_NAME = 'mozsqlite3' ++ SYMBOLS_FILE = '/third_party/sqlite3/src/sqlite.symbols' ++ + +diff -r 0f0ba6e8029d toolkit/moz.configure +--- a/toolkit/moz.configure Sat Feb 05 20:57:50 2022 +0000 ++++ b/toolkit/moz.configure Sun Mar 06 17:23:39 2022 +0200 +@@ -237,6 +237,21 @@ + set_config("MOZ_AUDIOUNIT_RUST", True, when=enable_audiounit_rust) + set_define("MOZ_AUDIOUNIT_RUST", True, when=enable_audiounit_rust) + ++ ++# SQLite ++# ============================================================== ++option('--with-system-sqlite', help="Use system sqlite (located with pkgconfig") ++ ++@depends('--with-system-sqlite') ++def check_for_sqlite(value): ++ return bool(value) ++ ++system_sqlite = pkg_check_modules('SQLITE', 'sqlite3', ++ when=check_for_sqlite) ++ ++set_config('MOZ_SYSTEM_SQLITE', depends_if(system_sqlite)(lambda _: True)) ++set_define('MOZ_SYSTEM_SQLITE', depends_if(system_sqlite)(lambda _: True)) ++ + # Javascript engine + # ============================================================== + include("../js/moz.configure") +diff -r 8753b16d88a2 storage/SQLiteMutex.h +--- a/storage/SQLiteMutex.h Sat Mar 05 00:24:48 2022 +0000 ++++ b/storage/SQLiteMutex.h Sun Mar 06 15:04:56 2022 +0200 +@@ -56,7 +56,7 @@ */ void lock() { MOZ_ASSERT(mMutex, "No mutex associated with this wrapper!"); --#if defined(DEBUG) && !defined(MOZ_SYSTEM_SQLITE) -+#if defined(DEBUG) +-#if defined(DEBUG) ++#if defined(DEBUG) && !defined(MOZ_SYSTEM_SQLITE) // While SQLite Mutexes may be recursive, in our own code we do not want to // treat them as such. CheckAcquire(); - #endif +@@ -64,7 +64,7 @@ ::sqlite3_mutex_enter(mMutex); --#if defined(DEBUG) && !defined(MOZ_SYSTEM_SQLITE) -+#if defined(DEBUG) +-#if defined(DEBUG) ++#if defined(DEBUG) && !defined(MOZ_SYSTEM_SQLITE) Acquire(); // Call is protected by us holding the mutex. #endif } - - /** - * Releases the mutex. +@@ -74,7 +74,7 @@ */ void unlock() { MOZ_ASSERT(mMutex, "No mutex associated with this wrapper!"); --#if defined(DEBUG) && !defined(MOZ_SYSTEM_SQLITE) -+#if defined(DEBUG) +-#if defined(DEBUG) ++#if defined(DEBUG) && !defined(MOZ_SYSTEM_SQLITE) // While SQLite Mutexes may be recursive, in our own code we do not want to // treat them as such. Release(); // Call is protected by us holding the mutex. - #endif - - ::sqlite3_mutex_leave(mMutex); - } - -diff --git a/storage/moz.build b/storage/moz.build ---- a/storage/moz.build -+++ b/storage/moz.build -@@ -98,12 +98,6 @@ +diff -r 8753b16d88a2 storage/moz.build +--- a/storage/moz.build Sat Mar 05 00:24:48 2022 +0000 ++++ b/storage/moz.build Sun Mar 06 15:04:56 2022 +0200 +@@ -99,6 +99,12 @@ # will need to change it here as well. DEFINES["SQLITE_MAX_LIKE_PATTERN_LENGTH"] = 50000 --# See Sqlite moz.build for reasoning about TEMP_STORE. --# For system sqlite we cannot use the compile time option, so we use a pragma. --if CONFIG['MOZ_SYSTEM_SQLITE'] and (CONFIG['OS_TARGET'] == 'Android' -- or CONFIG['HAVE_64BIT_BUILD']): -- DEFINES['MOZ_MEMORY_TEMP_STORE_PRAGMA'] = True -- ++# See Sqlite moz.build for reasoning about TEMP_STORE. ++# For system sqlite we cannot use the compile time option, so we use a pragma. ++if CONFIG['MOZ_SYSTEM_SQLITE'] and (CONFIG['OS_TARGET'] == 'Android' ++ or CONFIG['HAVE_64BIT_BUILD']): ++ DEFINES['MOZ_MEMORY_TEMP_STORE_PRAGMA'] = True ++ LOCAL_INCLUDES += [ "/dom/base", "/third_party/sqlite3/src", -diff --git a/storage/mozStorageConnection.cpp b/storage/mozStorageConnection.cpp -@@ -750,10 +749,6 @@ nsresult Connection::initializeInternal( +diff -r 8753b16d88a2 storage/mozStorageConnection.cpp +--- a/storage/mozStorageConnection.cpp Sat Mar 05 00:24:48 2022 +0000 ++++ b/storage/mozStorageConnection.cpp Sun Mar 06 15:04:56 2022 +0200 +@@ -877,6 +877,10 @@ return convertResultCode(srv); } --#if defined(MOZ_MEMORY_TEMP_STORE_PRAGMA) -- (void)ExecuteSimpleSQL(nsAutoCString("PRAGMA temp_store = 2;")); --#endif -- ++#if defined(MOZ_MEMORY_TEMP_STORE_PRAGMA) ++ (void)ExecuteSimpleSQL("PRAGMA temp_store = 2;"_ns); ++#endif ++ // Register our built-in SQL functions. srv = registerFunctions(mDBConn); if (srv != SQLITE_OK) { -diff --git a/storage/mozStorageService.cpp b/storage/mozStorageService.cpp ---- a/storage/mozStorageService.cpp -+++ b/storage/mozStorageService.cpp -@@ -30,8 +30,6 @@ - # undef CompareString - #endif - --#include "nsIPromptService.h" -- +diff -r 8753b16d88a2 storage/mozStorageService.cpp +--- a/storage/mozStorageService.cpp Sat Mar 05 00:24:48 2022 +0000 ++++ b/storage/mozStorageService.cpp Sun Mar 06 15:04:56 2022 +0200 +@@ -35,6 +35,20 @@ + + using mozilla::intl::Collator; + ++#include "nsIPromptService.h" ++ ++//////////////////////////////////////////////////////////////////////////////// ++//// Defines ++ ++#define PREF_TS_SYNCHRONOUS "toolkit.storage.synchronous" ++#define PREF_TS_SYNCHRONOUS_DEFAULT 1 ++ ++#define PREF_TS_PAGESIZE "toolkit.storage.pageSize" ++ ++// This value must be kept in sync with the value of SQLITE_DEFAULT_PAGE_SIZE in ++// third_party/sqlite3/src/Makefile.in. ++#define PREF_TS_PAGESIZE_DEFAULT 32768 ++ namespace mozilla { namespace storage { -@@ -164,31 +162,6 @@ +@@ -167,6 +181,31 @@ return do_AddRef(gService); } -- // Ensure that we are using the same version of SQLite that we compiled with -- // or newer. Our configure check ensures we are using a new enough version -- // at compile time. -- if (SQLITE_VERSION_NUMBER > ::sqlite3_libversion_number() || -- !::sqlite3_compileoption_used("SQLITE_SECURE_DELETE") || -- !::sqlite3_compileoption_used("SQLITE_THREADSAFE=1") || -- !::sqlite3_compileoption_used("SQLITE_ENABLE_FTS3") || -- !::sqlite3_compileoption_used("SQLITE_ENABLE_UNLOCK_NOTIFY") || -- !::sqlite3_compileoption_used("SQLITE_ENABLE_DBSTAT_VTAB")) { -- nsCOMPtr<nsIPromptService> ps(do_GetService(NS_PROMPTSERVICE_CONTRACTID)); -- if (ps) { -- nsAutoString title, message; -- title.AppendLiteral("SQLite Version Error"); -- message.AppendLiteral( -- "The application has been updated, but the SQLite " -- "library wasn't updated properly and the application " -- "cannot run. Please try to launch the application again. " -- "If that should still fail, please try reinstalling " -- "it, or contact the support of where you got the " -- "application from."); -- (void)ps->Alert(nullptr, title.get(), message.get()); -- } -- MOZ_CRASH("SQLite Version Error"); -- } -- ++ // Ensure that we are using the same version of SQLite that we compiled with ++ // or newer. Our configure check ensures we are using a new enough version ++ // at compile time. ++ if (SQLITE_VERSION_NUMBER > ::sqlite3_libversion_number() || ++ !::sqlite3_compileoption_used("SQLITE_SECURE_DELETE") || ++ !::sqlite3_compileoption_used("SQLITE_THREADSAFE=1") || ++ !::sqlite3_compileoption_used("SQLITE_ENABLE_FTS3") || ++ !::sqlite3_compileoption_used("SQLITE_ENABLE_UNLOCK_NOTIFY") || ++ !::sqlite3_compileoption_used("SQLITE_ENABLE_DBSTAT_VTAB")) { ++ nsCOMPtr<nsIPromptService> ps(do_GetService(NS_PROMPTSERVICE_CONTRACTID)); ++ if (ps) { ++ nsAutoString title, message; ++ title.AppendLiteral("SQLite Version Error"); ++ message.AppendLiteral( ++ "The application has been updated, but the SQLite " ++ "library wasn't updated properly and the application " ++ "cannot run. Please try to launch the application again. " ++ "If that should still fail, please try reinstalling " ++ "it, or contact the support of where you got the " ++ "application from."); ++ (void)ps->Alert(nullptr, title.get(), message.get()); ++ } ++ MOZ_CRASH("SQLite Version Error"); ++ } ++ // The first reference to the storage service must be obtained on the // main thread. NS_ENSURE_TRUE(NS_IsMainThread(), nullptr); -diff --git a/third_party/sqlite3/src/moz.build b/third_party/sqlite3/src/moz.build ---- a/third_party/sqlite3/src/moz.build -+++ b/third_party/sqlite3/src/moz.build -@@ -80,7 +80,6 @@ +diff -r 8753b16d88a2 third_party/sqlite3/src/moz.build +--- a/third_party/sqlite3/src/moz.build Sat Mar 05 00:24:48 2022 +0000 ++++ b/third_party/sqlite3/src/moz.build Sun Mar 06 15:04:56 2022 +0200 +@@ -79,6 +79,7 @@ # Try to use a MEMORY temp store when possible. That allows for better # performance and doesn't suffer from a full separate tmp partition. # Exclude 32bit platforms due to address space fragmentation issues. --# System Sqlite is managed through a PRAGMA instead. ++# System Sqlite is managed through a PRAGMA instead. if CONFIG['OS_TARGET'] == 'Android': # On Android there's no tmp partition, so always use a MEMORY temp store. DEFINES['SQLITE_TEMP_STORE'] = 3 -@@ -90,7 +89,6 @@ +@@ -88,6 +89,7 @@ # Change the default temp files prefix, to easily distinguish files we created # vs files created by other Sqlite instances in the system. --# This has obviously no effect in case of System Sqlite. ++# This has obviously no effect in case of System Sqlite. DEFINES['SQLITE_TEMP_FILE_PREFIX'] = '"mz_etilqs_"' - # Suppress warnings in third-party code. - -diff --git a/third_party/sqlite3/src/sqlite.symbols b/third_party/sqlite3/src/sqlite.symbols ---- a/third_party/sqlite3/src/sqlite.symbols -+++ b/third_party/sqlite3/src/sqlite.symbols -@@ -31,17 +31,16 @@ sqlite3_column_int - sqlite3_column_int64 - sqlite3_column_name - sqlite3_column_name16 - sqlite3_column_text - sqlite3_column_text16 + # Enabling sqlite math functions +diff -r 8753b16d88a2 third_party/sqlite3/src/sqlite.symbols +--- a/third_party/sqlite3/src/sqlite.symbols Sat Mar 05 00:24:48 2022 +0000 ++++ b/third_party/sqlite3/src/sqlite.symbols Sun Mar 06 15:04:56 2022 +0200 +@@ -38,6 +38,7 @@ sqlite3_column_type sqlite3_column_value sqlite3_commit_hook --sqlite3_compileoption_used ++sqlite3_compileoption_used sqlite3_complete sqlite3_complete16 sqlite3_config - sqlite3_create_collation - sqlite3_create_collation16 - sqlite3_create_function - sqlite3_create_function16 - sqlite3_create_module - @@ -13,7 +13,7 @@ _pgo=true _pkgname=firefox pkgname=$_pkgname-kde-opensuse -pkgver=95.0.2 +pkgver=97.0.1 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE" arch=('i686' 'x86_64') @@ -52,7 +52,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'pulseaudio: Audio support') provides=("firefox=${pkgver}") conflicts=('firefox') -_patchrev=7c17f3c4df7423951b09c407183c30ba47c60cd5 +_patchrev=536158d6ee8110971fc9fc861432ae26c0d9c6a3 options=('!emptydirs') _patchurl=https://raw.githubusercontent.com/openSUSE/firefox-maintenance/$_patchrev _repo=https://hg.mozilla.org/mozilla-unified @@ -97,7 +97,6 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" # PGO/LTO GCC patches 0024-Fix-building-with-PGO-when-using-GCC.patch 0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch - 0028-Make-elfhack-use-toolchain.patch # end # Fix CSD when globalmenu is active #8 fix_csd_window_buttons.patch @@ -105,13 +104,6 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" fix-wayland-build.patch # Fix build against current Dav1D tagged version #18 revert_dav1d_changes.patch.xz - # WR/Gnome+KDE Wayland/AMD: Firefox 95 locked to 120 fps, - # unsmooth scrolling - # https://bugzilla.mozilla.org/show_bug.cgi?id=1744896 - mozilla-bmo1744896.patch - # Firefox 91.4 fails to build against wayland 1.20 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1745560 - mozilla-bmo1745560.patch ) # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -164,7 +156,7 @@ prepare() { patch -Np1 -i "$srcdir"/0001-Use-remoting-name-for-GDK-application-names.patch # reenable system sqlite - patch -R -p1 -i "$srcdir"/5022efe33088.patch + patch -p1 -i "$srcdir"/5022efe33088.patch # Force disable elfhack to fix build errors patch -Np1 -i "$srcdir"/build-disable-elfhack.patch @@ -178,13 +170,6 @@ prepare() { # Fix build against current Dav1D tagged version xzcat "$srcdir"/revert_dav1d_changes.patch.xz | patch -Np1 - # WR/Gnome+KDE Wayland/AMD: Firefox 95 locked to 120 fps, - # unsmooth scrolling - patch -Np1 -i "$srcdir"/mozilla-bmo1744896.patch - - # Firefox 91.4 fails to build against wayland 1.20 - patch -Np1 -i "$srcdir"/mozilla-bmo1745560.patch - if [ $_pgo ] ; then # Fix MOZILLA#1516803 # sandbox needs to be built with --param lto-partitions=1 when @@ -195,7 +180,6 @@ prepare() { patch -Np1 -i "$srcdir"/0020-Make-PGO-use-toolchain.patch patch -Np1 -i "$srcdir"/0024-Fix-building-with-PGO-when-using-GCC.patch patch -Np1 -i "$srcdir"/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch - patch -Np1 -i "$srcdir"/0028-Make-elfhack-use-toolchain.patch # add missing rule for pgo builds patch -Np1 -i "$srcdir"/add_missing_pgo_rule.patch @@ -300,24 +284,21 @@ md5sums=('SKIP' '05bb69d25fb3572c618e3adf1ee7b670' 'b386ac38ffb7e545b9473e516455a25f' '1d5e9215530ef6778299b67dc6dba65e' - '01329185574709cb420f2c4531597d37' + '0eeb274bd4f1783075cfac3a5a852e3c' '0a5733b7a457a2786c2dd27626a1bf88' - '512c6c55c637fd2fee7a5e71f38dd54c' + '5c1d49167ee43fb952075867605dd5f7' 'fe24f5ea463013bb7f1c12d12dce41b2' '3c383d371d7f6ede5983a40310518715' '350c258cdaeef99b4638c5181fda3ad2' '9e518b30cf2ff9afd0423c79d12ae7b2' '4fa2216039664edad586b230b05fbd0a' 'e7994b3b78b780ebe610ba3d87247e40' - '00abc3976f028f8fe07111b9e687b574' + '548de130fc0f470bff0b6d994a0a91cd' 'c7b492df4fbf42ffe8aea4c0afb89921' '316d71d9cec400890db2ee8c362e672f' 'c6c0e47c9b517e5146a8925f442b811b' '943b9fe2ba474f7809a41622744f97f9' '31f950a94966287bfa6ccf03030781cc' - 'a59f137deca1da83de10a122984457d7' 'f49ac3b9f5146e33ce587e6b23eb1a86' '2cf74781f6b742d6b7e6f7251f49311a' - 'd633782c58cd8b8b165e32940ec7cb46' - 'c8593df8bc18e8cacfa4f36cdc31649f' - 'e9ce01b511ca4e5f37278d7748b8b723') + '3467677cadefe358473555340f681ae6') diff --git a/revert_dav1d_changes.patch.xz b/revert_dav1d_changes.patch.xz Binary files differindex e638f331d9c0..cb1aa510018b 100644 --- a/revert_dav1d_changes.patch.xz +++ b/revert_dav1d_changes.patch.xz diff --git a/unity-menubar.patch b/unity-menubar.patch index d747a5db506c..dc9ffd1c3662 100644 --- a/unity-menubar.patch +++ b/unity-menubar.patch @@ -72,7 +72,7 @@ nsINode* XULPopupElement::GetTriggerNode() const { --- a/dom/xul/moz.build +++ b/dom/xul/moz.build -@@ -83,6 +83,11 @@ LOCAL_INCLUDES += [ +@@ -83,4 +83,9 @@ LOCAL_INCLUDES += [ include("/ipc/chromium/chromium-config.mozbuild") @@ -82,8 +82,6 @@ + ] + FINAL_LIBRARY = "xul" - - if CONFIG["CC_TYPE"] in ("clang", "gcc"): --- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -68,6 +68,10 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "an @@ -5085,8 +5083,8 @@ # include "mozilla/a11y/LocalAccessible.h" #endif @@ -168,6 +170,8 @@ class nsWindow final : public nsBaseWidg - nsIScreen* aTargetScreen = nullptr) override; - virtual void HideWindowChrome(bool aShouldHide) override; + nsIScreen* aTargetScreen = nullptr) override; + void HideWindowChrome(bool aShouldHide) override; + void SetMenuBar(mozilla::UniquePtr<nsMenuBar> aMenuBar); + |