20 files changed, 197 insertions, 359 deletions
diff --git a/extra/archboot/PKGBUILD b/extra/archboot/PKGBUILD
deleted file mode 100644
index e79290b4..00000000
--- a/extra/archboot/PKGBUILD
+++ /dev/null
@@ -1,14 +0,0 @@
-# original package source has sigining issues, alternative package
-# has a different directory..
-source=(https://gitlab.archlinux.org/tpowa/${pkgname}/-/archive/${pkgver}-${pkgrel}/${pkgname}-${pkgver}-${pkgrel}.tar.gz)
-eval "$(
-  declare -f package | \
-    sed '
-      s/cd.*archboot.*/cd "\$srcdir\/archboot-\${pkgver}-\${pkgrel}"/
-    '
-)"
-
-# broadcom-wl doesn't build on i486
-if [ "${CARCH}" = 'i486' ]; then
-  depends=(${depends[@]/broadcom-wl/})
-fi
diff --git a/extra/archinstall/PKGBUILD b/extra/archinstall/PKGBUILD
index 09bfc555..e41a3bf5 100644
--- a/extra/archinstall/PKGBUILD
+++ b/extra/archinstall/PKGBUILD
@@ -1,11 +1,11 @@
-_pkgver=v2.4.2-6-g3801bee
+_pkgver=v2.4.3rc1-33-gfaf925de
 
 source=(
   "https://sources.archlinux32.org/sources/archinstall32-${_pkgver}.tar.gz"{,.sig}
 )
-sha512sums=('233237fd24ce1e3fa4ef68c1a7744618ba06fb7637b5a2b793b439ed325f6c91290936254b98cdbe153c0ce52fe93702c25aac0357d7729c9c45184b04a1d145'
+sha512sums=('5cb18ca2b608d2c240ce4a988acaa366c23e3a8bdb3acf6d3aaf45adf37f28e42ef721af274daf3ce0a3ad623045b10855689db6fda9ab05dc9c04a7f556e03a'
             'SKIP')
-b2sums=('7289a55cc28d884a32bdd9a45ff712e4ad7d2e9c4aea12923b705b7996247917a4563a4b0dec6810c1e0b055ad53f2f1c242d26861a6acd057bff32c04f45ea1'
+b2sums=('2ead39d7ea225d84e1a96f2a83be1fedaa9c2480c5339f778ff0da0da58c2ebe138e0af856c3099163b8c05692520a9735d0b95aabb18017ff41770d47ef81a6'
         'SKIP')
 validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A' '38ACA6A026D25CDD227D24832F6399DCD2212195' '16194A82231E9EF823562181C8E8F5A0AF9BA7E7')
 
diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD
new file mode 100644
index 00000000..9f6d1a0e
--- /dev/null
+++ b/extra/clutter/PKGBUILD
@@ -0,0 +1,10 @@
+# we built cogl without waylang on i486, so disable it here too
+if [ "${CARCH}" = 'i486' ]; then
+  eval "$(
+    declare -f build | \
+      sed '
+        s/--enable-wayland-compositor/--disable-wayland-compositor/
+        s/--enable-wayland-backend/--disable-wayland-backend/
+      '
+  )"
+fi
diff --git a/extra/gtk4/PKGBUILD b/extra/gtk4/PKGBUILD
index aec4705a..38ac8537 100644
--- a/extra/gtk4/PKGBUILD
+++ b/extra/gtk4/PKGBUILD
@@ -21,3 +21,9 @@ eval "$(
       /^\s*mv /d
     '
 )"
+
+# temporarily we depend on old sparql versions, which require older
+# versions of icu
+if [ "${CARCH}" = 'i486' ]; then
+	makedepends+=(icu70 icu69)
+fi
diff --git a/extra/guile2.0/PKGBUILD b/extra/guile2.0/PKGBUILD
deleted file mode 100644
index 6c1f5c11..00000000
--- a/extra/guile2.0/PKGBUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-# 2 tests fail in stack overflows, ignoring for now
-eval "$(
-  declare -f check | \
-    sed '
-      s/make check/make check || true/
-    '
-)"
-
-# more and more tests failing disabling tests for now
-# as tests hang build machines
-unset check
diff --git a/extra/libadwaita/PKGBUILD b/extra/libadwaita/PKGBUILD
new file mode 100644
index 00000000..f22051ae
--- /dev/null
+++ b/extra/libadwaita/PKGBUILD
@@ -0,0 +1,5 @@
+# temporarily we depend on old sparql versions, which require older
+# versions of icu
+if [ "${CARCH}" = 'i486' ]; then
+	makedepends+=(icu70 icu69)
+fi
diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index c6fd7bef..385ba19a 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -1,9 +1,9 @@
-# upstream git revision: 3c400d6e2c903fb0fd78c83c3bdbbb7077682746
+# upstream git revision: 31186df6fd05fa7da3267455b285e6ed5292f58f
 
 # fail if upstream's .config changes
 for ((i=0; i<${#sha256sums[@]}; i++)); do
-  if [ "${sha256sums[${i}]}" = '2cc456e91aa8652436ea84e14fb889f61213376a04db8c590e549a6ceb832bac' ]; then
-    sha256sums[${i}]='5ad246fd9490920e5c8e224cf37f18e552d2d61b9c6614dcb21ea26ee503ece1'
+  if [ "${sha256sums[${i}]}" = 'ea604f8457e97764d604b3e484f372ab7b30452ef112acb23b399d39c954faaf' ]; then
+    sha256sums[${i}]='93ebf63c9e95a9b8a7ae325ce11508334ca83fd00db9677c483216a6bdef3c68'
   fi
 done
 
@@ -97,8 +97,3 @@ eval "$(
 # avoid using zstd compression in ultra mode (exhausts virtual memory)
 source+=('core/linux/no-ultra-zstd.patch')
 sha256sums+=('d32270be5fd9c3e3ba50f3aef33f6cfcb85be0c8216f03b777287cc621fdff28')
-
-# https://bbs.archlinux32.org/viewtopic.php?pid=9109#p9109
-# avoid "sleepy" VIA C7 CPUs (and possibly others)
-source+=('core/linux/acpi-c3.patch')
-sha256sums+=('fc44aaf0b68abc9502fd4e0f73345c53b756566b532005466b106bacc9f9bc9c')
diff --git a/extra/linux-zen/acpi-c3.patch b/extra/linux-zen/acpi-c3.patch
deleted file mode 100644
index a5b79972..00000000
--- a/extra/linux-zen/acpi-c3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rauN a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
---- a/drivers/acpi/processor_idle.c	2022-05-02 21:01:51.302162225 +0200
-+++ b/drivers/acpi/processor_idle.c	2022-05-02 21:04:58.169438104 +0200
-@@ -796,6 +796,8 @@
- 		    cx->type == ACPI_STATE_C3) {
- 			state->enter_dead = acpi_idle_play_dead;
- 			drv->safe_state_index = count;
-+			if (cx->type != ACPI_STATE_C3)
-+				drv->safe_state_index = count;
- 		}
- 		/*
- 		 * Halt-induced C1 is not good for ->enter_s2idle, because it
diff --git a/extra/linux-zen/config b/extra/linux-zen/config
index e1a11d38..e7ef2d29 100644
--- a/extra/linux-zen/config
+++ b/extra/linux-zen/config
@@ -1,18 +1,16 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.17.5-zen1 Kernel Configuration
+# Linux/x86 5.17.9-zen1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=110200
+CONFIG_GCC_VERSION=120100
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=23800
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=23800
 CONFIG_LLD_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
@@ -335,6 +333,7 @@ CONFIG_X86_FEATURE_NAMES=y
 CONFIG_X86_MPPARSE=y
 # CONFIG_GOLDFISH is not set
 CONFIG_RETPOLINE=y
+CONFIG_CC_HAS_SLS=y
 CONFIG_X86_CPU_RESCTRL=y
 # CONFIG_X86_BIGSMP is not set
 # CONFIG_X86_EXTENDED_PLATFORM is not set
@@ -2493,6 +2492,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -6089,6 +6089,7 @@ CONFIG_SMS_SIANO_RC=y
 CONFIG_VIDEO_V4L2_TPG=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_CAFE_CCIC=m
+# CONFIG_VIDEO_VIA_CAMERA is not set
 # CONFIG_VIDEO_CADENCE is not set
 CONFIG_VIDEO_ASPEED=m
 # CONFIG_VIDEO_MUX is not set
@@ -6718,7 +6719,13 @@ CONFIG_TINYDRM_ST7735R=m
 CONFIG_DRM_VBOXVIDEO=m
 CONFIG_DRM_GUD=m
 CONFIG_DRM_HYPERV=m
-# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_LEGACY=y
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 CONFIG_DRM_NOMODESET=y
 CONFIG_DRM_PRIVACY_SCREEN=y
@@ -6741,61 +6748,102 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+CONFIG_FB_BACKLIGHT=m
 CONFIG_FB_MODE_HELPERS=y
-# CONFIG_FB_TILEBLITTING is not set
+CONFIG_FB_TILEBLITTING=y
 
 #
 # Frame buffer hardware drivers
 #
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_UVESA is not set
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+CONFIG_FB_PM2_FIFO_DISCONNECT=y
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
+CONFIG_FB_ARC=m
+CONFIG_FB_ASILIANT=y
+CONFIG_FB_IMSTT=y
+CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
 CONFIG_FB_VESA=y
 CONFIG_FB_EFI=y
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_OPENCORES is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+CONFIG_FB_OPENCORES=m
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_I740=m
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_VIA is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_SM501 is not set
-# CONFIG_FB_SMSCUFX is not set
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_S3_DDC=y
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
+CONFIG_FB_SIS=m
+# CONFIG_FB_SIS_300 is not set
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_VIA_X_COMPATIBILITY=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_SMSCUFX=m
 CONFIG_FB_UDL=m
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_HYPERV is not set
-# CONFIG_FB_SSD1307 is not set
-# CONFIG_FB_SM712 is not set
+CONFIG_FB_IBM_GXT4500=m
+CONFIG_FB_VIRTUAL=m
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_HYPERV=m
+CONFIG_FB_SSD1307=m
+CONFIG_FB_SM712=m
 # end of Frame buffer Devices
 
 #
@@ -6817,6 +6865,7 @@ CONFIG_LCD_HX8357=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_KTD253=m
 CONFIG_BACKLIGHT_LM3533=m
+# CONFIG_BACKLIGHT_CARILLO_RANCH is not set
 # CONFIG_BACKLIGHT_PWM is not set
 CONFIG_BACKLIGHT_DA903X=m
 CONFIG_BACKLIGHT_DA9052=m
@@ -10340,16 +10389,15 @@ CONFIG_LSM="landlock,lockdown,yama,bpf"
 #
 # Kernel hardening options
 #
-CONFIG_GCC_PLUGIN_STRUCTLEAK=y
 
 #
 # Memory initialization
 #
+CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
+CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
 # CONFIG_INIT_STACK_NONE is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
-CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
+# CONFIG_INIT_STACK_ALL_PATTERN is not set
+CONFIG_INIT_STACK_ALL_ZERO=y
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
diff --git a/extra/nvidia-lts/PKGBUILD b/extra/nvidia-lts/PKGBUILD
deleted file mode 100644
index 84d71ec8..00000000
--- a/extra/nvidia-lts/PKGBUILD
+++ /dev/null
@@ -1,14 +0,0 @@
-unset source_x86_64
-unset sha512sums_x86_64
-
-source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
-sha512sums=('9d80616abbf1f95c89bb3e6bda864708adc887a62ccdf8865e956c305bb013b0e54ffb3f495805363ee60a9115ab5fb38adf1534750a6afb69a457a4d034daeb')
- 
-_pkg="NVIDIA-Linux-x86-${pkgver}"
-
-eval "$(
-  declare -f package | \
-    sed '
-      s/,-uvm//
-    '
-)"
diff --git a/extra/nvidia-utils/PKGBUILD b/extra/nvidia-utils/PKGBUILD
deleted file mode 100644
index 47a7917b..00000000
--- a/extra/nvidia-utils/PKGBUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-for ((i=${#source[@]}; i>0; i--)); do
-  if [ "${source[${i}]}" = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" ]; then
-    break;
-  fi
-done
-
-source[${i}]="http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
-sha512sums[${i}]='9d80616abbf1f95c89bb3e6bda864708adc887a62ccdf8865e956c305bb013b0e54ffb3f495805363ee60a9115ab5fb38adf1534750a6afb69a457a4d034daeb'
-
-_arch='x86'
-_pkg="${_pkg%-no-compat32}"
-_pkg="${_pkg/x86_64/x86}"
diff --git a/extra/nvidia/PKGBUILD b/extra/nvidia/PKGBUILD
deleted file mode 100644
index 383e500a..00000000
--- a/extra/nvidia/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-makedepends+=('libglvnd')
-
-for ((i=0; i<${#source[@]}; i++)); do
-  if [ "${source[${i}]}" = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" ]; then
-    source[${i}]="http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
-    sha256sums[${i}]='5115894ebb9d5d4c75c11e73a79093b7687328ebcf85d1de81a0edf41d14d6f8'
-    break
-  fi
-done
-
-_pkg="NVIDIA-Linux-x86-${pkgver}"
-
-eval "$(
-  declare -f package_nvidia | \
-    sed '
-      s/,-uvm//
-    '
-)"
diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD
new file mode 100644
index 00000000..29c515d9
--- /dev/null
+++ b/extra/polkit/PKGBUILD
@@ -0,0 +1,8 @@
+# do not build documentation, depends on too many broken things
+# python dbus fails currently, ignoring the test
+eval "$(
+  declare -f check | \
+    sed '
+      s/\(meson.*test.*\)/\1 || true/
+    '
+)"
diff --git a/extra/qt5-webengine/PKGBUILD b/extra/qt5-webengine/PKGBUILD
index 012f2d35..a3e2bbd3 100644
--- a/extra/qt5-webengine/PKGBUILD
+++ b/extra/qt5-webengine/PKGBUILD
@@ -23,34 +23,6 @@ eval "$(
     '
 )"
 
-# redone patch, see also https://bugs.gentoo.org/721876
-# most is now fixed upstream in 5.15.0, patch for
-# src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
-# might be superfluous, but testing takes too much time, so keeping it for now.
-# (IMHO it would include cstdint just by accident, the header file need uintxx_t)
-source+=('qtwebengine-everywhere-src-5.15.0-gcc10-patches.patch')
-sha256sums+=('b41d4eca4c75c6d8115444ac4b10b8aa0f742d3ce64077d77eb4fb2079d0a42c')
-
-eval "$(
-  declare -f prepare | \
-    sed '
-      $ i cd "$srcdir/${_pkgfqn}"; patch -Np1 -i "${srcdir}"/qtwebengine-everywhere-src-5.15.0-gcc10-patches.patch
-    '
-)"
-
-# backport seccomp time function jail fix from chromium
-# for for 64-bit time functions in seccomp sanbox (thanks to schnitzeltony)
-# https://github.com/schnitzeltony/meta-browser/blob/master/recipes-browser/chromium/files/0003-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch
-source+=('qtwebengine-everywhere-src-5.15.0-sandbox-Aw-snap-for-syscalls-403-and-407.patch')
-sha256sums+=('606adb05a5bc903ac371e8040a4c2b06847d32de72be8b15949a161946aa826c')
-
-eval "$(
-  declare -f prepare | \
-    sed '
-      $ i cd "$srcdir/${_pkgfqn}"; patch -Np1 -i "${srcdir}"/qtwebengine-everywhere-src-5.15.0-sandbox-Aw-snap-for-syscalls-403-and-407.patch
-    '
-)"
-
 # glibc 2.33, some more tim64-affected functions for seccomp (futex_time64,
 # pselect6_time64), also added missing network functions for __i386__ and missing statx
 # (see also FS32#162)
diff --git a/extra/qt5-webengine/qtwebengine-everywhere-src-5.15.0-gcc10-patches.patch b/extra/qt5-webengine/qtwebengine-everywhere-src-5.15.0-gcc10-patches.patch
deleted file mode 100644
index 2db3d074..00000000
--- a/extra/qt5-webengine/qtwebengine-everywhere-src-5.15.0-gcc10-patches.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- qtwebengine-everywhere-src-5.15.0/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h	2020-05-06 16:21:29.000000000 +0200
-+++ qtwebengine-everywhere-src-5.15.0-gcc10-patches-patch/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h	2020-06-04 12:07:20.407353742 +0200
-@@ -13,6 +13,7 @@
- 
- #include <map>
- #include <set>
-+#include <cstdint>
- #include <vector>
- 
- namespace webrtc {
diff --git a/extra/qt5-webengine/qtwebengine-everywhere-src-5.15.0-sandbox-Aw-snap-for-syscalls-403-and-407.patch b/extra/qt5-webengine/qtwebengine-everywhere-src-5.15.0-sandbox-Aw-snap-for-syscalls-403-and-407.patch
deleted file mode 100644
index f9211305..00000000
--- a/extra/qt5-webengine/qtwebengine-everywhere-src-5.15.0-sandbox-Aw-snap-for-syscalls-403-and-407.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -rauN qtwebengine-everywhere-src-5.15.0/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc qtwebengine-everywhere-src-5.15.0-sandbox-Aw-snap-for-syscalls-403-and-407-patch/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
---- qtwebengine-everywhere-src-5.15.0/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc	2020-05-06 16:21:29.000000000 +0200
-+++ qtwebengine-everywhere-src-5.15.0-sandbox-Aw-snap-for-syscalls-403-and-407-patch/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc	2020-08-16 08:55:45.992315648 +0200
-@@ -148,7 +148,14 @@
-     return Allow();
- #endif
- 
--  if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) {
-+  if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep
-+#if defined(__NR_clock_gettime64)
-+                                  || sysno == __NR_clock_gettime64
-+#endif
-+#if defined(__NR_clock_nanosleep_time64)
-+                                  || sysno == __NR_clock_nanosleep_time64
-+#endif
-+    ) {
-     return RestrictClockID();
-   }
- 
-diff -rauN qtwebengine-everywhere-src-5.15.0/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc qtwebengine-everywhere-src-5.15.0-sandbox-Aw-snap-for-syscalls-403-and-407-patch/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
---- qtwebengine-everywhere-src-5.15.0/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc	2020-05-06 16:21:29.000000000 +0200
-+++ qtwebengine-everywhere-src-5.15.0-sandbox-Aw-snap-for-syscalls-403-and-407-patch/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc	2020-08-16 08:56:28.085606998 +0200
-@@ -60,6 +60,12 @@
-       case __NR_clock_gettime:
-       case __NR_clock_getres:
-       case __NR_clock_nanosleep:
-+#if defined(__NR_clock_nanosleep_time64)
-+      case __NR_clock_nanosleep_time64:
-+#endif
-+#if defined(__NR_clock_gettime64)
-+      case __NR_clock_gettime64:
-+#endif
-         return RestrictClockID();
-       default:
-         return Allow();
-diff -rauN qtwebengine-everywhere-src-5.15.0/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc qtwebengine-everywhere-src-5.15.0-sandbox-Aw-snap-for-syscalls-403-and-407-patch/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
---- qtwebengine-everywhere-src-5.15.0/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc	2020-05-06 16:21:29.000000000 +0200
-+++ qtwebengine-everywhere-src-5.15.0-sandbox-Aw-snap-for-syscalls-403-and-407-patch/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc	2020-08-16 08:57:06.615551750 +0200
-@@ -39,6 +39,12 @@
-                                 // filtered by RestrictClokID().
-     case __NR_clock_gettime:    // Parameters filtered by RestrictClockID().
-     case __NR_clock_nanosleep:  // Parameters filtered by RestrictClockID().
-+#if defined(__NR_clock_gettime64)
-+    case __NR_clock_gettime64:  // Parameters filtered by RestrictClockID().
-+#endif
-+#if defined(__NR_clock_nanosleep_time64)
-+    case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
-+#endif
-     case __NR_clock_settime:    // Privileged.
- #if defined(__i386__) || \
-     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-diff -rauN qtwebengine-everywhere-src-5.15.0/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h qtwebengine-everywhere-src-5.15.0-sandbox-Aw-snap-for-syscalls-403-and-407-patch/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
---- qtwebengine-everywhere-src-5.15.0/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h	2020-05-06 16:21:29.000000000 +0200
-+++ qtwebengine-everywhere-src-5.15.0-sandbox-Aw-snap-for-syscalls-403-and-407-patch/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h	2020-08-16 08:57:56.025481868 +0200
-@@ -1385,6 +1385,14 @@
- #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
- #endif
- 
-+#if !defined(__NR_clock_gettime64)
-+#define __NR_clock_gettime64 (__NR_SYSCALL_BASE+403)
-+#endif
-+
-+#if !defined(__NR_clock_nanosleep_time64)
-+#define __NR_clock_nanosleep_time64 (__NR_SYSCALL_BASE+407)
-+#endif
-+
- // ARM private syscalls.
- #if !defined(__ARM_NR_BASE)
- #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
-diff -rauN qtwebengine-everywhere-src-5.15.0/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h qtwebengine-everywhere-src-5.15.0-sandbox-Aw-snap-for-syscalls-403-and-407-patch/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h
---- qtwebengine-everywhere-src-5.15.0/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h	2020-05-06 16:21:29.000000000 +0200
-+++ qtwebengine-everywhere-src-5.15.0-sandbox-Aw-snap-for-syscalls-403-and-407-patch/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h	2020-08-16 08:58:27.458771331 +0200
-@@ -1433,4 +1433,12 @@
- #define __NR_memfd_create (__NR_Linux + 354)
- #endif
- 
-+#if !defined(__NR_clock_gettime64)
-+#define __NR_clock_gettime64 (__NR_Linux + 403)
-+#endif
-+
-+#if !defined(__NR_clock_nanosleep_time64)
-+#define __NR_clock_nanosleep_time64 (__NR_Linux + 407)
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
diff --git a/extra/webkit2gtk/PKGBUILD b/extra/webkit2gtk/PKGBUILD
index 6919b547..6e0af735 100644
--- a/extra/webkit2gtk/PKGBUILD
+++ b/extra/webkit2gtk/PKGBUILD
@@ -1,14 +1,13 @@
 # disable SSE2 on 486 and 686
-source_i486+=('webkitgtk-2.32.0-no-sse2.arch32.patch')
-source_i686+=('webkitgtk-2.32.0-no-sse2.arch32.patch')
-sha256sums_i486+=('11f3d9cd6d36db290fd725f57530fb6ea398bb61fcf2575a77154d7009c1718a')
-sha256sums_i686+=('11f3d9cd6d36db290fd725f57530fb6ea398bb61fcf2575a77154d7009c1718a')
-
+source_i486+=('webkitgtk-2.36.3-no-sse2.arch32.patch')
+source_i686+=('webkitgtk-2.36.3-no-sse2.arch32.patch')
+sha256sums_i486+=('58a724b7f1092a9049186a3b8c61689c31558b6c2b587c827cec04219397adac')
+sha256sums_i686+=('58a724b7f1092a9049186a3b8c61689c31558b6c2b587c827cec04219397adac')
 if [ "${CARCH}" != "pentium4" ]; then
   eval "$(
     declare -f prepare | \
       sed '
-        /cd.*/a for _p in \"$srcdir\"\/*.arch32.patch; do patch -p1 -i \"$_p\"; done
+        /cd.*/a patch -Rp1 -i "$srcdir"/webkitgtk-2.36.3-no-sse2.arch32.patch
       '
   )"	
 fi
diff --git a/extra/webkit2gtk/webkitgtk-2.32.0-no-sse2.arch32.patch b/extra/webkit2gtk/webkitgtk-2.32.0-no-sse2.arch32.patch
deleted file mode 100644
index 4d453aae..00000000
--- a/extra/webkit2gtk/webkitgtk-2.32.0-no-sse2.arch32.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -rauN webkitgtk-2.32.0/Source/cmake/WebKitCompilerFlags.cmake webkitgtk-2.32.0-no-sse2-patch/Source/cmake/WebKitCompilerFlags.cmake
---- webkitgtk-2.32.0/Source/cmake/WebKitCompilerFlags.cmake	2021-03-25 14:27:32.000000000 +0100
-+++ webkitgtk-2.32.0-no-sse2-patch/Source/cmake/WebKitCompilerFlags.cmake	2021-05-08 17:00:53.952879632 +0200
-@@ -143,13 +143,13 @@
-     endif ()
- 
-     # Force SSE2 fp on x86 builds.
--    if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING)
--        WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse)
--        include(DetectSSE2)
--        if (NOT SSE2_SUPPORT_FOUND)
--            message(FATAL_ERROR "SSE2 support is required to compile WebKit")
--        endif ()
--    endif ()
-+#    if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING)
-+#        WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse)
-+#        include(DetectSSE2)
-+#        if (NOT SSE2_SUPPORT_FOUND)
-+#            message(FATAL_ERROR "SSE2 support is required to compile WebKit")
-+#        endif ()
-+#    endif ()
- endif ()
- 
- if (COMPILER_IS_GCC_OR_CLANG AND NOT MSVC)
-diff -rauN webkitgtk-2.32.0/Source/ThirdParty/ANGLE/src/common/platform.h webkitgtk-2.32.0-no-sse2-patch/Source/ThirdParty/ANGLE/src/common/platform.h
---- webkitgtk-2.32.0/Source/ThirdParty/ANGLE/src/common/platform.h	2021-02-26 10:57:06.000000000 +0100
-+++ webkitgtk-2.32.0-no-sse2-patch/Source/ThirdParty/ANGLE/src/common/platform.h	2021-05-08 17:02:05.056394762 +0200
-@@ -90,8 +90,8 @@
- #    include <intrin.h>
- #    define ANGLE_USE_SSE
- #elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
--#    include <x86intrin.h>
--#    define ANGLE_USE_SSE
-+//#    include <x86intrin.h>
-+//#    define ANGLE_USE_SSE
- #endif
- 
- // Mips and arm devices need to include stddef for size_t.
-diff -rauN webkitgtk-2.32.0/Source/WebCore/platform/audio/SincResampler.cpp webkitgtk-2.32.0-no-sse2-patch/Source/WebCore/platform/audio/SincResampler.cpp
---- webkitgtk-2.32.0/Source/WebCore/platform/audio/SincResampler.cpp	2021-02-26 10:57:13.000000000 +0100
-+++ webkitgtk-2.32.0-no-sse2-patch/Source/WebCore/platform/audio/SincResampler.cpp	2021-05-08 17:12:14.678638777 +0200
-@@ -39,6 +39,7 @@
- #if USE(ACCELERATE)
- #include <Accelerate/Accelerate.h>
- #elif CPU(X86_SSE2)
-+#error No SSE2
- #include <xmmintrin.h>
- #elif HAVE(ARM_NEON_INTRINSICS)
- #include <arm_neon.h>
-diff -rauN webkitgtk-2.32.0/Source/WebCore/platform/audio/VectorMath.cpp webkitgtk-2.32.0-no-sse2-patch/Source/WebCore/platform/audio/VectorMath.cpp
---- webkitgtk-2.32.0/Source/WebCore/platform/audio/VectorMath.cpp	2021-02-26 10:57:13.000000000 +0100
-+++ webkitgtk-2.32.0-no-sse2-patch/Source/WebCore/platform/audio/VectorMath.cpp	2021-05-08 17:12:40.725409625 +0200
-@@ -35,6 +35,7 @@
- #endif
- 
- #if CPU(X86_SSE2)
-+#error No SSE2
- #include <emmintrin.h>
- #endif
- 
-diff -rauN webkitgtk-2.32.0/Source/WTF/wtf/PlatformCPU.h webkitgtk-2.32.0-no-sse2-patch/Source/WTF/wtf/PlatformCPU.h
---- webkitgtk-2.32.0/Source/WTF/wtf/PlatformCPU.h	2021-02-26 10:57:08.000000000 +0100
-+++ webkitgtk-2.32.0-no-sse2-patch/Source/WTF/wtf/PlatformCPU.h	2021-05-08 17:13:21.592239207 +0200
-@@ -99,7 +99,7 @@
- #define WTF_CPU_KNOWN 1
- 
- #if defined(__SSE2__) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2)
--#define WTF_CPU_X86_SSE2 1
-+/* #define WTF_CPU_X86_SSE2 1 */
- #endif
- 
- #endif
-diff -rauN webkitgtk-2.32.0/Source/WTF/wtf/text/ASCIIFastPath.h webkitgtk-2.32.0-no-sse2-patch/Source/WTF/wtf/text/ASCIIFastPath.h
---- webkitgtk-2.32.0/Source/WTF/wtf/text/ASCIIFastPath.h	2021-02-26 10:57:08.000000000 +0100
-+++ webkitgtk-2.32.0-no-sse2-patch/Source/WTF/wtf/text/ASCIIFastPath.h	2021-05-08 17:13:42.528989083 +0200
-@@ -27,6 +27,7 @@
- #include <wtf/text/LChar.h>
- 
- #if CPU(X86_SSE2)
-+#error No SSE2
- #include <emmintrin.h>
- #endif
- 
diff --git a/extra/webkit2gtk/webkitgtk-2.36.3-no-sse2.arch32.patch b/extra/webkit2gtk/webkitgtk-2.36.3-no-sse2.arch32.patch
new file mode 100644
index 00000000..63a098a7
--- /dev/null
+++ b/extra/webkit2gtk/webkitgtk-2.36.3-no-sse2.arch32.patch
@@ -0,0 +1,50 @@
+diff -rauN webkitgtk-2.36.3/Source/cmake/WebKitCompilerFlags.cmake webkitgtk-2.36.3-no-sse2-patch/Source/cmake/WebKitCompilerFlags.cmake
+--- webkitgtk-2.36.3/Source/cmake/WebKitCompilerFlags.cmake	2022-06-02 08:44:07.302049344 +0200
++++ webkitgtk-2.36.3-no-sse2-patch/Source/cmake/WebKitCompilerFlags.cmake	2022-06-02 08:32:46.169362098 +0200
+@@ -163,13 +163,13 @@
+     endif ()
+ 
+     # Force SSE2 fp on x86 builds.
+-#    if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING)
+-#        WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse)
+-#        include(DetectSSE2)
+-#        if (NOT SSE2_SUPPORT_FOUND)
+-#            message(FATAL_ERROR "SSE2 support is required to compile WebKit")
+-#        endif ()
+-#    endif ()
++    if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING)
++        WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse)
++        include(DetectSSE2)
++        if (NOT SSE2_SUPPORT_FOUND)
++            message(FATAL_ERROR "SSE2 support is required to compile WebKit")
++        endif ()
++    endif ()
+ 
+     # Makes builds faster. The GCC manual warns about the possibility that the assembler being
+     # used may not support input from a pipe, but in practice the toolchains we support all do.
+diff -rauN webkitgtk-2.36.3/Source/ThirdParty/ANGLE/src/common/platform.h webkitgtk-2.36.3-no-sse2-patch/Source/ThirdParty/ANGLE/src/common/platform.h
+--- webkitgtk-2.36.3/Source/ThirdParty/ANGLE/src/common/platform.h	2022-06-02 08:45:17.042348743 +0200
++++ webkitgtk-2.36.3-no-sse2-patch/Source/ThirdParty/ANGLE/src/common/platform.h	2022-06-02 08:32:46.189362180 +0200
+@@ -97,8 +97,8 @@
+ #    include <intrin.h>
+ #    define ANGLE_USE_SSE
+ #elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
+-//#    include <x86intrin.h>
+-//#    define ANGLE_USE_SSE
++#    include <x86intrin.h>
++#    define ANGLE_USE_SSE
+ #endif
+ 
+ // Mips and arm devices need to include stddef for size_t.
+diff -rauN webkitgtk-2.36.3/Source/WTF/wtf/PlatformCPU.h webkitgtk-2.36.3-no-sse2-patch/Source/WTF/wtf/PlatformCPU.h
+--- webkitgtk-2.36.3/Source/WTF/wtf/PlatformCPU.h	2022-06-02 08:46:55.912771827 +0200
++++ webkitgtk-2.36.3-no-sse2-patch/Source/WTF/wtf/PlatformCPU.h	2022-06-02 08:32:45.789360661 +0200
+@@ -99,7 +99,7 @@
+ #define WTF_CPU_KNOWN 1
+ 
+ #if defined(__SSE2__) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2)
+-/* #define WTF_CPU_X86_SSE2 1 */
++#define WTF_CPU_X86_SSE2 1
+ #endif
+ 
+ #endif
diff --git a/extra/wpewebkit/PKGBUILD b/extra/wpewebkit/PKGBUILD
index 46d279ee..8b1e84de 100644
--- a/extra/wpewebkit/PKGBUILD
+++ b/extra/wpewebkit/PKGBUILD
@@ -18,3 +18,7 @@ if [ "$CARCH" = 'i486' ]; then
       '
   )"  
 fi
+
+if [ "$CARCH" = 'i486' ]; then
+  makedepends=(${makedepends[@]//gst-plugins-bad/})
+fi