summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Bidar2022-11-11 10:04:31 +0200
committerBjörn Bidar2022-11-12 09:46:48 +0200
commit588d8d8d4e0915fca4165ae0fe09624fd0ac353a (patch)
treea25682c0d098aa32f8c0fc618836d2e630690984
parent11b6c7d698214e08992fe5140f518b404f6ec224 (diff)
downloadaur-588d8d8d4e0915fca4165ae0fe09624fd0ac353a.tar.gz
Update to 106.0.5-1
- New upstream release - Update patches: - firefox-kde patches from openSUSE - Support screen cast on Wayland. MOZILLLA#1672944 - Bump zstandard whitelist to 0.19.0. Resolves #23 - Remove patches for: - Fix use of arc4random_buf when enabled against glibc 2.36. Resolves #24 MOZILLA#1782988, as it was merged upstream. Signed-off-by: Björn Bidar <bjorn.bidar@thaodan.de>
-rw-r--r--.SRCINFO32
-rw-r--r--0006-bmo-1559213-Support-system-av1.patch32
-rw-r--r--PKGBUILD30
-rw-r--r--bump-pypip-zstandard-0.18.diff2
-rw-r--r--mozilla-bmo-1782988-0001.patch64
-rw-r--r--mozilla-bmo-1782988-0002.patch37
6 files changed, 41 insertions, 156 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b08eb81bf970..448682b58415 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Sep 17 17:23:27 UTC 2022
+# Fri Nov 11 08:50:01 UTC 2022
pkgbase = firefox-kde-opensuse
pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE
- pkgver = 104.0.2
+ pkgver = 106.0.5
pkgrel = 1
url = https://github.com/openSUSE/firefox-maintenance
arch = i686
@@ -61,19 +61,19 @@ pkgbase = firefox-kde-opensuse
optdepends = pulseaudio: Audio support
optdepends = libnotify: Notification integration
optdepends = xdg-desktop-portal: Screensharing with Wayland
- provides = firefox=104.0.2
+ provides = firefox=106.0.5
conflicts = firefox
options = !emptydirs
options = !lto
- source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_104_0_2_RELEASE
+ source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_106_0_5_RELEASE
source = mozconfig
source = firefox.desktop
source = vendor.js
source = kde.js
- source = firefox-branded-icons-c9d5562cc0db38ebb7fadf11fcc504ca691c9285.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/c9d5562cc0db38ebb7fadf11fcc504ca691c9285/firefox/firefox-branded-icons.patch
- source = firefox-kde-c9d5562cc0db38ebb7fadf11fcc504ca691c9285.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/c9d5562cc0db38ebb7fadf11fcc504ca691c9285/firefox/firefox-kde.patch
- source = mozilla-kde-c9d5562cc0db38ebb7fadf11fcc504ca691c9285.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/c9d5562cc0db38ebb7fadf11fcc504ca691c9285/mozilla-kde.patch
- source = mozilla-nongnome-proxies-c9d5562cc0db38ebb7fadf11fcc504ca691c9285.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/c9d5562cc0db38ebb7fadf11fcc504ca691c9285/mozilla-nongnome-proxies.patch
+ source = firefox-branded-icons-22b224bf3e8c1431d2d9d961ca351cf3c50fdc15.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/22b224bf3e8c1431d2d9d961ca351cf3c50fdc15/firefox/firefox-branded-icons.patch
+ source = firefox-kde-22b224bf3e8c1431d2d9d961ca351cf3c50fdc15.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/22b224bf3e8c1431d2d9d961ca351cf3c50fdc15/firefox/firefox-kde.patch
+ source = mozilla-kde-22b224bf3e8c1431d2d9d961ca351cf3c50fdc15.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/22b224bf3e8c1431d2d9d961ca351cf3c50fdc15/mozilla-kde.patch
+ source = mozilla-nongnome-proxies-22b224bf3e8c1431d2d9d961ca351cf3c50fdc15.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/22b224bf3e8c1431d2d9d961ca351cf3c50fdc15/mozilla-nongnome-proxies.patch
source = unity-menubar.patch
source = add_missing_pgo_rule.patch
source = pgo_fix_missing_kdejs.patch
@@ -88,25 +88,23 @@ pkgbase = firefox-kde-opensuse
source = 0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
source = fix_csd_window_buttons.patch
source = fix-wayland-build.patch
- source = https://src.fedoraproject.org/rpms/firefox/raw/85f5f771e92b10b6b34cf8da8b2dbb0f9f6562c8/f/libwebrtc-screen-cast-sync-1.patch
+ source = https://src.fedoraproject.org/rpms/firefox/raw/f0029706cee042f03f836e10d51bb2245e9fa392/f/libwebrtc-screen-cast-sync.patch
source = bump-pypip-zstandard-0.18.diff
- source = mozilla-bmo-1782988-0001.patch
- source = mozilla-bmo-1782988-0002.patch
md5sums = SKIP
md5sums = 9530b0395a095c0b47ee42d0996ec163
md5sums = a26a061efb4def6572d5b319d657f1d6
md5sums = 4c23d9c0a691d70919beb1dafbbecbd3
md5sums = 05bb69d25fb3572c618e3adf1ee7b670
- md5sums = b386ac38ffb7e545b9473e516455a25f
+ md5sums = 800d337d558de8201c8828252c1cd199
md5sums = 2e2e0721f1c29b2ae786d8c6e34fa65f
- md5sums = b8266dc4cc56be5134c210c4c0457851
+ md5sums = 4819b01c44ce3f6bdc3fbc096d717ca0
md5sums = 0a5733b7a457a2786c2dd27626a1bf88
md5sums = 63ebf05aea29545081dab2cb023e2bba
md5sums = fe24f5ea463013bb7f1c12d12dce41b2
md5sums = 3c383d371d7f6ede5983a40310518715
md5sums = dc47b8b0582ca8e97d68e5636b72853c
md5sums = 9e518b30cf2ff9afd0423c79d12ae7b2
- md5sums = 0c292d03c77bc377c2cdc5aa2df248d9
+ md5sums = 0ba70a7a61493cb053f93d6560b8be32
md5sums = 548de130fc0f470bff0b6d994a0a91cd
md5sums = c7b492df4fbf42ffe8aea4c0afb89921
md5sums = 316d71d9cec400890db2ee8c362e672f
@@ -115,10 +113,8 @@ pkgbase = firefox-kde-opensuse
md5sums = 31f950a94966287bfa6ccf03030781cc
md5sums = f49ac3b9f5146e33ce587e6b23eb1a86
md5sums = 2cf74781f6b742d6b7e6f7251f49311a
- md5sums = c3e1629c8451ce7576f311a11030a1d1
- md5sums = 29ce7c26f14c9c4169d88d1b05552189
- md5sums = c6f48b28f327da1ba646517c1c4fe466
- md5sums = 3d0cca4f333d87fcb3a5faf4b1bc6770
+ md5sums = 015dbab57c0d9c65d7a94a29dd8bf8a4
+ md5sums = c36ef413ef998444d7d1dd543fd8f58b
pkgname = firefox-kde-opensuse
depends = libxt
diff --git a/0006-bmo-1559213-Support-system-av1.patch b/0006-bmo-1559213-Support-system-av1.patch
index 128c5c576a6d..19b0b8170e88 100644
--- a/0006-bmo-1559213-Support-system-av1.patch
+++ b/0006-bmo-1559213-Support-system-av1.patch
@@ -116,21 +116,23 @@ diff --git a/media/ffvpx/libavcodec/moz.build b/media/ffvpx/libavcodec/moz.build
index 0069865..e806fc8 100644
--- a/media/ffvpx/libavcodec/moz.build
+++ b/media/ffvpx/libavcodec/moz.build
-@@ -112,9 +112,15 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
- 'vaapi_vp8.c',
- 'vaapi_vp9.c',
- ]
-+ if CONFIG["MOZ_SYSTEM_AV1"]:
-+ CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS']
-+ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS']
-+ else:
-+ USE_LIBS += [
+@@ -108,10 +108,14 @@
+ 'vp9prob.c',
+ 'vp9recon.c'
+ ]
+- USE_LIBS += [
+- 'dav1d',
+- 'media_libdav1d_asm',
+- ]
++ if CONFIG["MOZ_SYSTEM_AV1"]:
++ CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS']
++ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS']
++ else:
++ USE_LIBS += [
+ 'dav1d',
+ 'media_libdav1d_asm',
-+ ]
- USE_LIBS += [
-- 'dav1d',
-- 'media_libdav1d_asm',
- 'mozva'
- ]
++ ]
+ if CONFIG['MOZ_WAYLAND']:
+ LOCAL_INCLUDES += ['/media/mozva']
+ SOURCES += [
diff --git a/PKGBUILD b/PKGBUILD
index 946304b4c5cb..2f150613460f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ _pgo=true
_pkgname=firefox
pkgname=$_pkgname-kde-opensuse
-pkgver=104.0.2
+pkgver=106.0.5
pkgrel=1
pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
arch=('i686' 'x86_64')
@@ -63,7 +63,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
'xdg-desktop-portal: Screensharing with Wayland')
provides=("firefox=${pkgver}")
conflicts=('firefox')
-_patchrev=c9d5562cc0db38ebb7fadf11fcc504ca691c9285
+_patchrev=22b224bf3e8c1431d2d9d961ca351cf3c50fdc15
options=('!emptydirs' !lto)
_patchurl=https://raw.githubusercontent.com/openSUSE/firefox-maintenance/$_patchrev
_repo=https://hg.mozilla.org/mozilla-unified
@@ -113,14 +113,9 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
fix-wayland-build.patch
# WebRTC - screen cast sync for Wayland
# MOZILLLA#1672944
- https://src.fedoraproject.org/rpms/firefox/raw/85f5f771e92b10b6b34cf8da8b2dbb0f9f6562c8/f/libwebrtc-screen-cast-sync-1.patch
+ https://src.fedoraproject.org/rpms/firefox/raw/f0029706cee042f03f836e10d51bb2245e9fa392/f/libwebrtc-screen-cast-sync.patch
# Unbreak build with python-zstandard 0.18.0 #23
bump-pypip-zstandard-0.18.diff
- # MOZILLA#1782988 #24
- # Avoid build bustage when building against glibc 2.36 or newer. r=RyanVM
- mozilla-bmo-1782988-0001.patch
- # Fix use of arc4random_buf use in ping.cpp. r=gsvelto
- mozilla-bmo-1782988-0002.patch
# end
)
@@ -183,16 +178,11 @@ prepare() {
patch -Np1 -i "$srcdir"/fix-wayland-build.patch
# WebRTC - screen cast sync for Wayland
- patch -Np1 -i "$srcdir"/libwebrtc-screen-cast-sync-1.patch
+ patch -Np1 -i "$srcdir"/libwebrtc-screen-cast-sync.patch
# Unbreak build with python-zstandard 0.18.0 #23
patch -Np1 -i "$srcdir"/bump-pypip-zstandard-0.18.diff
- # Avoid build bustage when building against glibc 2.36 or newer. r=RyanVM
- # #24 MOZILLA#1782988
- patch -Np1 -i "$srcdir"/mozilla-bmo-1782988-0001.patch
- # Fix use of arc4random_buf use in ping.cpp. r=gsvelto #24 MOZILLA#1782988
- patch -Np1 -i "$srcdir"/mozilla-bmo-1782988-0002.patch
if [ $_pgo ] ; then
# Fix MOZILLA#1516803
@@ -327,16 +317,16 @@ md5sums=('SKIP'
'a26a061efb4def6572d5b319d657f1d6'
'4c23d9c0a691d70919beb1dafbbecbd3'
'05bb69d25fb3572c618e3adf1ee7b670'
- 'b386ac38ffb7e545b9473e516455a25f'
+ '800d337d558de8201c8828252c1cd199'
'2e2e0721f1c29b2ae786d8c6e34fa65f'
- 'b8266dc4cc56be5134c210c4c0457851'
+ '4819b01c44ce3f6bdc3fbc096d717ca0'
'0a5733b7a457a2786c2dd27626a1bf88'
'63ebf05aea29545081dab2cb023e2bba'
'fe24f5ea463013bb7f1c12d12dce41b2'
'3c383d371d7f6ede5983a40310518715'
'dc47b8b0582ca8e97d68e5636b72853c'
'9e518b30cf2ff9afd0423c79d12ae7b2'
- '0c292d03c77bc377c2cdc5aa2df248d9'
+ '0ba70a7a61493cb053f93d6560b8be32'
'548de130fc0f470bff0b6d994a0a91cd'
'c7b492df4fbf42ffe8aea4c0afb89921'
'316d71d9cec400890db2ee8c362e672f'
@@ -345,7 +335,5 @@ md5sums=('SKIP'
'31f950a94966287bfa6ccf03030781cc'
'f49ac3b9f5146e33ce587e6b23eb1a86'
'2cf74781f6b742d6b7e6f7251f49311a'
- 'c3e1629c8451ce7576f311a11030a1d1'
- '29ce7c26f14c9c4169d88d1b05552189'
- 'c6f48b28f327da1ba646517c1c4fe466'
- '3d0cca4f333d87fcb3a5faf4b1bc6770')
+ '015dbab57c0d9c65d7a94a29dd8bf8a4'
+ 'c36ef413ef998444d7d1dd543fd8f58b')
diff --git a/bump-pypip-zstandard-0.18.diff b/bump-pypip-zstandard-0.18.diff
index 5dfa30557dcf..7bf4668cc77f 100644
--- a/bump-pypip-zstandard-0.18.diff
+++ b/bump-pypip-zstandard-0.18.diff
@@ -7,4 +7,4 @@ index 01f4f8c23da3b..85cfaf2b273ac 100644
# support down to the oldest locally-installed version (5.4.2).
pypi-optional:psutil>=5.4.2,<=5.8.0:telemetry will be missing some data
-pypi-optional:zstandard>=0.11.1,<=0.17.0:zstd archives will not be possible to extract
-+pypi-optional:zstandard>=0.11.1,<=0.18.0:zstd archives will not be possible to extract
++pypi-optional:zstandard>=0.11.1,<=0.19.0:zstd archives will not be possible to extract
diff --git a/mozilla-bmo-1782988-0001.patch b/mozilla-bmo-1782988-0001.patch
deleted file mode 100644
index 1df0c2dc97dd..000000000000
--- a/mozilla-bmo-1782988-0001.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-
-# HG changeset patch
-# User Mike Hommey <mh+mozilla@glandium.org>
-# Date 1660077764 0
-# Node ID 970ebbe54477a0e518bfee8aeddf487ad9bd4365
-# Parent caca601f2f5e87dd660434f3db2156e950151adb
-Bug 1782988 - Avoid build bustage when building against glibc 2.36 or newer. r=RyanVM
-
-Differential Revision: https://phabricator.services.mozilla.com/D153716
-
-diff --git a/ipc/chromium/src/third_party/libevent/README.mozilla b/ipc/chromium/src/third_party/libevent/README.mozilla
---- a/ipc/chromium/src/third_party/libevent/README.mozilla
-+++ b/ipc/chromium/src/third_party/libevent/README.mozilla
-@@ -17,11 +17,15 @@ evconfig-private.h can be found in the r
-
- You then need to modify the EVENT__SIZEOF_* constants in the generated Linux,
- Android, and BSD headers to be appropriate for both 32-bit and 64-bit platforms.
- Mac doesn't need this since only 64-bit is supported. Use __LP64__ to
- distinguish the two cases. If you get something wrong, the CHECK_EVENT_SIZEOF
- static assertions in message_pump_libevent.cc will fail. If a new constant is
- added, also add a static assertion for it to message_pump_libevent.cc.
-
-+You also need to modify the EVENT__HAVE_ARC4RANDOM and EVENT__HAVE_ARC4RANDOM_BUF
-+constants in the generated Linux header to account for the results of the arc4random
-+and arc4random_buf configure checks.
-+
- 2. No additional patches are needed at this time, but be careful to avoid
- clobbering changes to the various event-config.h files which have been customized
- over time to avoid various build bustages.
-diff --git a/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h b/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h
---- a/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h
-+++ b/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h
-@@ -24,24 +24,28 @@
- /* #undef EVENT__DISABLE_THREAD_SUPPORT */
-
- /* Define to 1 if you have the `accept4' function. */
- #define EVENT__HAVE_ACCEPT4 1
-
- /* Define to 1 if you have the <afunix.h> header file. */
- /* #undef EVENT__HAVE_AFUNIX_H 1 */
-
-+#ifdef HAVE_ARC4RANDOM
- /* Define to 1 if you have the `arc4random' function. */
--/* #undef EVENT__HAVE_ARC4RANDOM */
-+#define EVENT__HAVE_ARC4RANDOM 1
-+#endif
-
- /* Define to 1 if you have the `arc4random_addrandom' function. */
- /* #undef EVENT__HAVE_ARC4RANDOM_ADDRANDOM */
-
-+#ifdef HAVE_ARC4RANDOM_BUF
- /* Define to 1 if you have the `arc4random_buf' function. */
--/* #undef EVENT__HAVE_ARC4RANDOM_BUF */
-+#define EVENT__HAVE_ARC4RANDOM_BUF 1
-+#endif
-
- /* Define to 1 if you have the <arpa/inet.h> header file. */
- #define EVENT__HAVE_ARPA_INET_H 1
-
- /* Define to 1 if you have the `clock_gettime' function. */
- #define EVENT__HAVE_CLOCK_GETTIME 1
-
- /* Define to 1 if you have the declaration of `CTL_KERN', and to 0 if you
-
diff --git a/mozilla-bmo-1782988-0002.patch b/mozilla-bmo-1782988-0002.patch
deleted file mode 100644
index d087539894f9..000000000000
--- a/mozilla-bmo-1782988-0002.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-
-# HG changeset patch
-# User Mike Hommey <mh+mozilla@glandium.org>
-# Date 1660077764 0
-# Node ID a61813bd9f0a0048b84a2c56a77a06eb5e269ab2
-# Parent 970ebbe54477a0e518bfee8aeddf487ad9bd4365
-Bug 1782988 - Fix use of arc4random_buf use in ping.cpp. r=gsvelto
-
-The code was probably never built before glibc 2.36, because before
-that, only Android and some BSDs had arc4random_buf, but none of those
-actually built this code.
-
-Differential Revision: https://phabricator.services.mozilla.com/D154024
-
-diff --git a/toolkit/crashreporter/client/ping.cpp b/toolkit/crashreporter/client/ping.cpp
---- a/toolkit/crashreporter/client/ping.cpp
-+++ b/toolkit/crashreporter/client/ping.cpp
-@@ -48,17 +48,17 @@ static string GenerateUUID() {
- return "";
- }
-
- CFUUIDBytes bytes = CFUUIDGetUUIDBytes(uuid);
- memcpy(&id, &bytes, sizeof(UUID));
-
- CFRelease(uuid);
- #elif defined(HAVE_ARC4RANDOM_BUF) // Android, BSD, ...
-- arc4random_buf(id, sizeof(UUID));
-+ arc4random_buf(&id, sizeof(UUID));
- #else // Linux
- int fd = open("/dev/urandom", O_RDONLY);
-
- if (fd == -1) {
- return "";
- }
-
- if (read(fd, &id, sizeof(UUID)) != sizeof(UUID)) {
-