diff --git a/autogen/PKGBUILD b/autogen/PKGBUILD
index 5f4a174..2b5a9bb 100644
--- a/autogen/PKGBUILD
+++ b/autogen/PKGBUILD
@@ -28,7 +28,7 @@ prepare() {
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-dependency-tracking
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
diff --git a/autogen/PKGBUILD-arch b/autogen/PKGBUILD-arch
index f0c3b47..1cc4d07 100644
--- a/autogen/PKGBUILD-arch
+++ b/autogen/PKGBUILD-arch
@@ -4,22 +4,26 @@
 
 pkgname=autogen
 pkgver=5.18.16
-pkgrel=3
+pkgrel=5
 pkgdesc="A tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text"
 arch=('x86_64')
 url="https://www.gnu.org/software/autogen/"
 license=('GPL3')
 depends=('guile' 'libxml2' 'perl')
 makedepends=('autogen' 'chrpath')
-source=(https://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.xz{,.sig} 10_libopts_tarball_perms.diff)
+source=(https://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.xz{,.sig}
+        guile-3.0.patch
+        10_libopts_tarball_perms.diff)
 validpgpkeys=('44A088E295C3A722C450590EC9EF76DEB74EE762'
               '3EEE51D1355B8EC40D9F3122495143D05D0712D1') # Bruce Korb <bkorb@gnu.org>
 sha512sums=('5f12c982dbe27873f5649a96049bf019ff183c90cc0c8a9196556b0ca02e72940cd422f6d6601f68cc7d8763b1124f2765c3b1a6335fc92ba07f84b03d2a53a1'
             'SKIP'
+            '4864c9f20448b7eea0e36b35b15408baf5485f77fe7b1e9181c5636ab30c6871c74c654da05c6b84c8e6a057531c234a6a1e263b7465d54842c04bfc9c5b821d'
             '687a725cc901b4acaa73e4503c933b949a99264647e0829902f3d9c7bc62867268cabdf2c31fe10dcfdec9b69397ef27592196b097e3c19c6b714ef84d4060a4')
 
 prepare() {
   cd $pkgname-$pkgver
+  patch -Np1 -i ${srcdir}/guile-3.0.patch
   # Reproducible man page generation
   export MAN_PAGE_DATE=$(LC_ALL=C date -u -d '@$(SOURCE_DATE_EPOCH)' +%Y-%m-%d)
   patch -Np1 -i ${srcdir}/10_libopts_tarball_perms.diff
diff --git a/autogen/guile-3.0.patch b/autogen/guile-3.0.patch
new file mode 100644
index 0000000..218c83c
--- /dev/null
+++ b/autogen/guile-3.0.patch
@@ -0,0 +1,50 @@
+# Patch origin: https://sourceforge.net/p/autogen/bugs/196/#1a10
+
+Index: autogen-5.18.16/agen5/guile-iface.h
+===================================================================
+--- autogen-5.18.16.orig/agen5/guile-iface.h
++++ autogen-5.18.16/agen5/guile-iface.h
+@@ -9,16 +9,13 @@
+ # error AutoGen does not work with this version of Guile
+   choke me.
+ 
+-#elif GUILE_VERSION < 203000
++#else
+ # define AG_SCM_IS_PROC(_p)           scm_is_true( scm_procedure_p(_p))
+ # define AG_SCM_LIST_P(_l)            scm_is_true( scm_list_p(_l))
+ # define AG_SCM_PAIR_P(_p)            scm_is_true( scm_pair_p(_p))
+ # define AG_SCM_TO_LONG(_v)           scm_to_long(_v)
+ # define AG_SCM_TO_ULONG(_v)          ((unsigned long)scm_to_ulong(_v))
+ 
+-#else
+-# error unknown GUILE_VERSION
+-  choke me.
+ #endif
+ 
+ #endif /* MUTATING_GUILE_IFACE_H_GUARD */
+Index: autogen-5.18.16/configure
+===================================================================
+--- autogen-5.18.16.orig/configure
++++ autogen-5.18.16/configure
+@@ -14798,7 +14798,7 @@ $as_echo "no" >&6; }
+ 		PKG_CONFIG=""
+ 	fi
+ fi
+-  _guile_versions_to_search="2.2 2.0 1.8"
++  _guile_versions_to_search="3.0 2.2 2.0 1.8"
+   if test -n "$GUILE_EFFECTIVE_VERSION"; then
+     _guile_tmp=""
+     for v in $_guile_versions_to_search; do
+Index: autogen-5.18.16/config/guile.m4
+===================================================================
+--- autogen-5.18.16.orig/config/guile.m4
++++ autogen-5.18.16/config/guile.m4
+@@ -61,7 +61,7 @@
+ #
+ AC_DEFUN([GUILE_PKG],
+  [PKG_PROG_PKG_CONFIG
+-  _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
++  _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0 1.8])"
+   if test -n "$GUILE_EFFECTIVE_VERSION"; then
+     _guile_tmp=""
+     for v in $_guile_versions_to_search; do
diff --git a/ell/PKGBUILD b/ell/PKGBUILD
index 72d5a5d..acd25bd 100644
--- a/ell/PKGBUILD
+++ b/ell/PKGBUILD
@@ -6,7 +6,7 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=ell
-pkgver=0.53
+pkgver=0.54
 pkgrel=01
 pkgdesc="Embedded Linux library"
 arch=(x86_64)
@@ -40,7 +40,7 @@ license=('LGPL2.1')
 
 validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # "Marcel Holtmann <marcel@holtmann.org>"
 
-sha256sums=(a7d0df846af839bbea1b80f292166371070328854b3fa785b5c607fe600552ad # ell-0.53.tar.xz
-	3727063831a3ae46d0984155237c12fe85a77350b4f6a1203fc669ac4b1a8358) # ell-0.53.tar.sign
+sha256sums=(43be093b25359acd84dd2b07b45a1eacc3a4089bb01342eb3fc99ec9d94a25d9  # ell-0.54.tar.xz
+	7e018d8c301fe8ef1c39a93683d5c5808f7449cb1443f99f28cccf07f2f1afd6) # ell-0.54.tar.sign
 
 
diff --git a/ell/PKGBUILD-arch b/ell/PKGBUILD-arch
index 92340cc..a819ddf 100644
--- a/ell/PKGBUILD-arch
+++ b/ell/PKGBUILD-arch
@@ -2,7 +2,7 @@
 # Contributor: Jameson Pugh <imntreal@gmail.com>
 
 pkgname=ell
-pkgver=0.53
+pkgver=0.54
 pkgrel=1
 pkgdesc="Embedded Linux library"
 arch=(x86_64)
@@ -14,7 +14,7 @@ checkdepends=('dbus')
 options=('debug')
 # https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc
 source=(https://mirrors.edge.kernel.org/pub/linux/libs/$pkgname/$pkgname-$pkgver.tar.{xz,sign})
-sha256sums=('a7d0df846af839bbea1b80f292166371070328854b3fa785b5c607fe600552ad'
+sha256sums=('43be093b25359acd84dd2b07b45a1eacc3a4089bb01342eb3fc99ec9d94a25d9'
             'SKIP')
 validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # "Marcel Holtmann <marcel@holtmann.org>"
 
diff --git a/ell/deps b/ell/deps
index 139597f..b28b04f 100644
--- a/ell/deps
+++ b/ell/deps
@@ -1,2 +1,3 @@
 
 
+
diff --git a/libunwind/PKGBUILD b/libunwind/PKGBUILD
index cfc76c8..2e35468 100644
--- a/libunwind/PKGBUILD
+++ b/libunwind/PKGBUILD
@@ -7,12 +7,13 @@
 
 pkgname=libunwind
 pkgver=1.6.2
-pkgrel=01
+pkgrel=02
 pkgdesc='Portable and efficient C programming interface (API) to determine the call-chain of a program'
 arch=('x86_64')
 url='https://www.nongnu.org/libunwind/'
 depends=('xz' 'zlib')
 makedepends=('texlive-core')
+## options=('debug') ##   uncomment to produce the debug pkg
 source=("https://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
 
 build() {
@@ -43,3 +44,6 @@ validpgpkeys=('5C96BDEAF5F47FB02BD4F6B965D98560914F3F48'  # Arun Sharma
 
 sha256sums=(4a6aec666991fb45d0889c44aede8ad6eb108071c3554fcdff671f9c94794976 # libunwind-1.6.2.tar.gz
 	c2f099d6d746e5a75db6e92838f1c3526f274a70be0e8e504891ee5f41e05060) # libunwind-1.6.2.tar.gz.sig
+
+
+
diff --git a/libunwind/PKGBUILD-arch b/libunwind/PKGBUILD-arch
index cf8461f..00b61a4 100644
--- a/libunwind/PKGBUILD-arch
+++ b/libunwind/PKGBUILD-arch
@@ -6,13 +6,14 @@
 
 pkgname=libunwind
 pkgver=1.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Portable and efficient C programming interface (API) to determine the call-chain of a program'
 arch=('x86_64')
 url='https://www.nongnu.org/libunwind/'
 license=('GPL')
 depends=('xz' 'zlib')
 makedepends=('texlive-core')
+options=('debug')
 source=("https://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
 sha512sums=('1d17dfb14f99a894a6cda256caf9ec481c14068aaf8f3a85fa3befa7c7cca7fca0f544a91a3a7c2f2fc55bab19b06a67ca79f55ac9081151d94478c7f611f8f7'
             'SKIP')
@@ -38,4 +39,4 @@ package() {
   make DESTDIR="$pkgdir" install
 }
 
-# vim:set ts=2 sw=2 et:
+# vim:set sw=2 sts=-1 et:
diff --git a/libunwind/deps b/libunwind/deps
index d7886e5..207ce6a 100644
--- a/libunwind/deps
+++ b/libunwind/deps
@@ -1 +1,3 @@
 texlive-core
+
+
diff --git a/libunwind/time b/libunwind/time
index d5fb653..70df8aa 100644
--- a/libunwind/time
+++ b/libunwind/time
@@ -1,5 +1,6 @@
 
-real	0m30.927s
-user	0m53.372s
-sys	0m12.067s
 
+real	0m52.879s
+user	0m44.122s
+sys	0m10.745s
+ 
diff --git a/libx11/PKGBUILD b/libx11/PKGBUILD
index eb6b893..4121608 100644
--- a/libx11/PKGBUILD
+++ b/libx11/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=libx11
 pkgver=1.8.2
-pkgrel=01
+pkgrel=02
 pkgdesc="X11 client-side library w/o ipv6"
 arch=(x86_64)
 url="https://xorg.freedesktop.org/"
@@ -15,6 +15,7 @@ url="https://xorg.freedesktop.org/"
 # https://lists.archlinux.org/pipermail/arch-dev-public/2019-December/029767.html
 depends=('libxcb' 'xorgproto')
 makedepends=('xorg-util-macros' 'xtrans')
+# options=('debug')  ##  uncomment this line to have the debug pkg produced
 source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.xz{,.sig})
 
 build() {
diff --git a/libx11/PKGBUILD-arch b/libx11/PKGBUILD-arch
index 07d5010..c33ab43 100644
--- a/libx11/PKGBUILD-arch
+++ b/libx11/PKGBUILD-arch
@@ -2,7 +2,7 @@
 
 pkgname=libx11
 pkgver=1.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 client-side library"
 arch=(x86_64)
 url="https://xorg.freedesktop.org/"
@@ -11,6 +11,7 @@ url="https://xorg.freedesktop.org/"
 depends=('libxcb' 'xorgproto')
 makedepends=('xorg-util-macros' 'xtrans')
 license=('custom')
+options=('debug')
 source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.xz{,.sig})
 sha512sums=('662ee8043d9ba27df82f647515b701d6f302a52715f21afdaba391f3b70691753e3649e7ff8322e07858be4297df9cbb19227958d676ed6dea198cce64330d1d'
             'SKIP')
diff --git a/libx11/time b/libx11/time
index 812a7b5..82f2d6d 100644
--- a/libx11/time
+++ b/libx11/time
@@ -1,5 +1,6 @@
 
-real	0m46.982s
-user	1m50.092s
-sys	0m10.900s
 
+real	1m22.826s
+user	1m16.803s
+sys	0m8.475s
+ 
diff --git a/llvm/PKGBUILD b/llvm/PKGBUILD
index e2bc41d..0ed18c9 100644
--- a/llvm/PKGBUILD
+++ b/llvm/PKGBUILD
@@ -7,13 +7,14 @@
 
 pkgname=('llvm' 'llvm-libs') 
 pkgver=14.0.6
-pkgrel=03
+pkgrel=04
 arch=('x86_64')
 url="https://llvm.org/"
 makedepends=('cmake' 'ninja' 'libffi' 'libedit' 'ncurses' 'libxml2'
 	'python-setuptools' 'python-psutil' 'python-sphinx'
 	'python-recommonmark')
 options=('staticlibs' '!lto') # Getting thousands of test failures with LTO
+#options=('staticlibs' 'debug' '!lto') ####  uncomment this to get debug pkg
 _source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver
 source=($_source_base/$pkgname-$pkgver.src.tar.xz{,.sig}
         llvm-coroutines-ubsan.patch
@@ -29,6 +30,10 @@ prepare() {
 build() {
   cd llvm-$pkgver.src/build
 
+  # Build only minimal debug info to reduce size  # arch -g1  joborun -g0
+  CFLAGS+=' -g0'
+  CXXFLAGS+=' -g0'
+
   local cmake_args=(
     -G Ninja
     -DCMAKE_BUILD_TYPE=Release
@@ -123,4 +128,5 @@ sha256sums=(050922ecaaca5781fdf6631ea92bc715183f202f9d2f15147226f023414f619a # l
 	ee9baf6df05474083857044d92f26f59d3ee709cdf82ba3bdb2792e6645f71d9 # llvm-coroutines-ubsan.patch
 	597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48) #  llvm-config.h
 
- 
+
+
diff --git a/llvm/PKGBUILD-arch b/llvm/PKGBUILD-arch
index 5509ddc..fb1348e 100644
--- a/llvm/PKGBUILD-arch
+++ b/llvm/PKGBUILD-arch
@@ -3,14 +3,14 @@
 
 pkgname=('llvm' 'llvm-libs')
 pkgver=14.0.6
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 url="https://llvm.org/"
 license=('custom:Apache 2.0 with LLVM Exception')
 makedepends=('cmake' 'ninja' 'libffi' 'libedit' 'ncurses' 'libxml2'
              'python-setuptools' 'python-psutil' 'python-sphinx'
              'python-recommonmark')
-options=('staticlibs' '!lto') # Getting thousands of test failures with LTO
+options=('staticlibs' 'debug' '!lto') # Getting thousands of test failures with LTO
 _source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver
 source=($_source_base/llvm-$pkgver.src.tar.xz{,.sig}
         llvm-coroutines-ubsan.patch
@@ -32,6 +32,10 @@ prepare() {
 build() {
   cd llvm-$pkgver.src/build
 
+  # Build only minimal debug info to reduce size
+  CFLAGS+=' -g1'
+  CXXFLAGS+=' -g1'
+
   local cmake_args=(
     -G Ninja
     -DCMAKE_BUILD_TYPE=Release
diff --git a/llvm/deps b/llvm/deps
index 62cfd4a..d2328f7 100644
--- a/llvm/deps
+++ b/llvm/deps
@@ -7,3 +7,4 @@ ninja
 libedit
 libxml2
 
+
diff --git a/mesa/PKGBUILD b/mesa/PKGBUILD
index 81b87cc..10f2515 100644
--- a/mesa/PKGBUILD
+++ b/mesa/PKGBUILD
@@ -8,8 +8,8 @@
 pkgbase=mesa
 pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification w/o zstd"
-pkgver=22.2.2
-pkgrel=01
+pkgver=22.2.3
+pkgrel=02
 arch=('x86_64')
 #options=('debug' '!lto')  #  uncomment this if you want the debug package built
 options=('!lto')
@@ -234,10 +234,11 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l
               '71C4B75620BC75708B4BDB254C95FAAB3EB073EC'  # Dylan Baker <dylan@pnwbakers.com>
               '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric@engestrom.ch>
 
-sha256sums=(2de11fb74fc5cc671b818e49fe203cea0cd1d8b69756e97cdb06a2f4e78948f9  # mesa-22.2.2.tar.xz
-	cf236663cd70fac3c8d892c23aea254551c75eed61c344a9e1d5e286e7603ffa  # mesa-22.2.2.tar.xz.sig
+sha256sums=(ee7d026f7b1991dbae0861d359b671145c3a86f2a731353b885d2ea2d5c098d6  # mesa-22.2.3.tar.xz
+	54c6bb19406fd21781a26ee4927abea08a08390410075195795a92040be415f7  # mesa-22.2.3.tar.xz.sig
 	3563afc26125e79cc1943c518b47d4f534861171808fc1fd5a1564fced36ec2c  # 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
 	d0c6401daff346054f1b4dd6d88e82b83a236fa235983ca54085c90948f0c1be  # 0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
 	7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537) # LICENSE
 
 
+
diff --git a/mesa/PKGBUILD-arch b/mesa/PKGBUILD-arch
index 00ee029..8642cd1 100644
--- a/mesa/PKGBUILD-arch
+++ b/mesa/PKGBUILD-arch
@@ -6,8 +6,8 @@
 pkgbase=mesa
 pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification"
-pkgver=22.2.2
-pkgrel=1
+pkgver=22.2.3
+pkgrel=2
 arch=('x86_64')
 makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
              'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd' 'elfutils' 'llvm'
@@ -20,7 +20,7 @@ source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
         0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
         0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
         LICENSE)
-sha512sums=('a1eb67e1ae4880c79b1fdc570f4389baba0b8ba796da7e695c9af19a7d92b6c06b95570e6c796548b61355989025fb7efbf9acac74cbd695f7e297dc913b933c'
+sha512sums=('08e9ce43392c46f9c0d122d70e118511eea81422d06f93ab6d330689b46feed3ac1c3bdcdcfd4a27cd5b9eaf26aab518d152a2c753f07b8ed19575d4ed892ad6'
             'SKIP'
             '9bf47019a7c1da6724393cf571c6e1ce6b56ca24fe32045bc056d2e1bb2584f6a81e886dd8b2f1b1aabb953367dd068f9833f520fa41a9b2bbce20fdc15d07b4'
             '3df104f4abbecb12fcf9631cabdc7fe883b6c529abebaf36a0d47933ebd0c57235f11767060604dec71acefdf55f2f025eb997b1dd1cf0b92c02af0a604cae98'
diff --git a/mesa/PKGBUILD.21 b/mesa/PKGBUILD.21
deleted file mode 100644
index 70705b4..0000000
--- a/mesa/PKGBUILD.21
+++ /dev/null
@@ -1,223 +0,0 @@
-#!/usr/bin/bash
-# JOBoRun		: Jwm OpenBox Obarun RUNit
-# Maintainer	: Joe Bo Run <joborun@disroot.org>
-# PkgSource		: url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
-# Website		: https://pozol.eu
-#-----------------------------------------| DESCRIPTION |---------------------------------------
-
-pkgbase=mesa
-pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
-pkgdesc="An open-source implementation of the OpenGL specification"
-pkgver=21.3.7
-pkgrel=02
-arch=('x86_64')
-makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
-             'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd' 'elfutils' 'llvm'
-             'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors' 'libxrandr'
-             'valgrind' 'glslang' 'vulkan-icd-loader' 'directx-headers' 'cmake' 'meson')
-url="https://www.mesa3d.org/"
-source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
-#        0001-iris-implement-inter-context-busy-tracking.patch
-        LICENSE)
-
-prepare() {
-  cd mesa-$pkgver
-
-#  # FS#73501 
-#  patch -Np1 -i ../0001-iris-implement-inter-context-busy-tracking.patch
-}
-
-build() {
-  arch-meson mesa-$pkgver build \
-    -D b_lto=true \
-    -D b_ndebug=true \
-    -D platforms=x11,wayland \
-    -D dri-drivers=i915,i965,r100,r200,nouveau \
-    -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris,crocus,zink,d3d12 \
-    -D vulkan-drivers=amd,intel,swrast \
-    -D vulkan-layers=device-select,intel-nullhw,overlay \
-    -D swr-arches=avx,avx2 \
-    -D dri3=enabled \
-    -D egl=enabled \
-    -D gallium-extra-hud=true \
-    -D gallium-nine=true \
-    -D gallium-omx=bellagio \
-    -D gallium-opencl=icd \
-    -D gallium-va=enabled \
-    -D gallium-vdpau=enabled \
-    -D gallium-xa=enabled \
-    -D gallium-xvmc=disabled \
-    -D gbm=enabled \
-    -D gles1=disabled \
-    -D gles2=enabled \
-    -D glvnd=true \
-    -D glx=dri \
-    -D libunwind=enabled \
-    -D llvm=enabled \
-    -D lmsensors=enabled \
-    -D osmesa=true \
-    -D shared-glapi=enabled \
-    -D microsoft-clc=disabled \
-    -D valgrind=enabled
-
-  # Print config
-  meson configure build
-
-  ninja -C build
-  meson compile -C build
-
-  # fake installation to be seperated into packages
-  # outside of fakeroot but mesa doesn't need to chown/mod
-  DESTDIR="${srcdir}/fakeinstall" meson install -C build
-}
-
-_install() {
-  local src f dir
-  for src; do
-    f="${src#fakeinstall/}"
-    dir="${pkgdir}/${f%/*}"
-    install -m755 -d "${dir}"
-    mv -v "${src}" "${dir}/"
-  done
-}
-
-package_vulkan-mesa-layers() {
-  pkgdesc="Mesa's Vulkan layers"
-  depends=('libdrm' 'libxcb' 'wayland' 'python')
-  conflicts=('vulkan-mesa-layer')
-  replaces=('vulkan-mesa-layer')
-
-  _install fakeinstall/usr/share/vulkan/explicit_layer.d
-  _install fakeinstall/usr/share/vulkan/implicit_layer.d
-  _install fakeinstall/usr/lib/libVkLayer_*.so
-  _install fakeinstall/usr/bin/mesa-overlay-control.py
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_opencl-mesa() {
-  pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
-  depends=('libdrm' 'libclc' 'clang')
-  optdepends=('opencl-headers: headers necessary for OpenCL development')
-  provides=('opencl-driver')
-
-  _install fakeinstall/etc/OpenCL
-  _install fakeinstall/usr/lib/lib*OpenCL*
-  _install fakeinstall/usr/lib/gallium-pipe
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_vulkan-intel() {
-  pkgdesc="Intel's Vulkan mesa driver"
-  depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'zstd')
-  optdepends=('vulkan-mesa-layers: additional vulkan layers')
-  provides=('vulkan-driver')
-
-  _install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json
-  _install fakeinstall/usr/lib/libvulkan_intel.so
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_vulkan-radeon() {
-  pkgdesc="Radeon's Vulkan mesa driver"
-  depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs')
-  optdepends=('vulkan-mesa-layers: additional vulkan layers')
-  provides=('vulkan-driver')
-
-  _install fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json
-  _install fakeinstall/usr/lib/libvulkan_radeon.so
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_vulkan-swrast() {
-  pkgdesc="Vulkan software rasteriser driver"
-  depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'zstd' 'llvm-libs')
-  optdepends=('vulkan-mesa-layers: additional vulkan layers')
-  conflicts=('vulkan-mesa')
-  replaces=('vulkan-mesa')
-  provides=('vulkan-driver')
-
-  _install fakeinstall/usr/share/vulkan/icd.d/lvp_icd*.json
-  _install fakeinstall/usr/lib/libvulkan_lvp.so
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_libva-mesa-driver() {
-  pkgdesc="VA-API implementation for gallium"
-  depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
-  depends+=('libexpat.so')
-
-  _install fakeinstall/usr/lib/dri/*_drv_video.so
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_mesa-vdpau() {
-  pkgdesc="Mesa VDPAU drivers"
-  depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
-  depends+=('libexpat.so')
-
-  _install fakeinstall/usr/lib/vdpau
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_mesa() {
-  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
-           'libomxil-bellagio' 'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd'
-           'zstd' 'vulkan-icd-loader')
-  depends+=('libsensors.so' 'libexpat.so' 'libvulkan.so')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages'
-              'mesa-vdpau: for accelerated video playback'
-              'libva-mesa-driver: for accelerated video playback')
-  provides=('mesa-libgl' 'opengl-driver')
-  conflicts=('mesa-libgl')
-  replaces=('mesa-libgl')
-
-  _install fakeinstall/usr/share/drirc.d/00-mesa-defaults.conf
-  _install fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json
-
-  # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast, swr
-  _install fakeinstall/usr/lib/dri/*_dri.so
-
-  _install fakeinstall/usr/lib/bellagio
-  _install fakeinstall/usr/lib/d3d
-  _install fakeinstall/usr/lib/lib{gbm,glapi}.so*
-  _install fakeinstall/usr/lib/libOSMesa.so*
-  _install fakeinstall/usr/lib/libxatracker.so*
-
-  _install fakeinstall/usr/include
-  _install fakeinstall/usr/lib/pkgconfig
-
-  # libglvnd support
-  _install fakeinstall/usr/lib/libGLX_mesa.so*
-  _install fakeinstall/usr/lib/libEGL_mesa.so*
-
-  # indirect rendering
-  ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}/usr/lib/libGLX_indirect.so.0"
-
-  # make sure there are no files left to install
-  find fakeinstall -depth -print0 | xargs -0 rmdir
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-#---- license gpg-key sha256sums ----
-
-license=('custom')
-
-validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov@gmail.com>
-              '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <tanty@igalia.com>
-              'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895'  # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez@igalia.com>
-              'A5CC9FEC93F2F837CB044912336909B6B25FADFA'  # Juan A. Suarez Romero <jasuarez@igalia.com>
-              '71C4B75620BC75708B4BDB254C95FAAB3EB073EC'  # Dylan Baker <dylan@pnwbakers.com>
-              '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric@engestrom.ch>
-
-sha256sums=(b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d # mesa-21.3.7.tar.xz
-	13cd1ad5f73a581b079dbe8b6deefa3b221ad22082c2a925f8f2664822bd6f58 # mesa-21.3.7.tar.xz.sig
-	7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537) # LICENSE
- 
diff --git a/mesa/PKGBUILD.22 b/mesa/PKGBUILD.22
deleted file mode 100644
index 6c57493..0000000
--- a/mesa/PKGBUILD.22
+++ /dev/null
@@ -1,220 +0,0 @@
-#!/usr/bin/bash
-# JOBoRun		: Jwm OpenBox Obarun RUNit
-# Maintainer	: Joe Bo Run <joborun@disroot.org>
-# PkgSource		: url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
-# Website		: https://pozol.eu
-#-----------------------------------------| DESCRIPTION |---------------------------------------
-
-pkgbase=mesa
-pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
-pkgdesc="An open-source implementation of the OpenGL specification"
-pkgver=22.0.0
-pkgrel=01
-arch=('x86_64')
-makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
-             'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd' 'elfutils' 'llvm'
-             'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors' 'libxrandr'
-             'valgrind' 'glslang' 'vulkan-icd-loader' 'directx-headers' 'cmake' 'meson')
-url="https://www.mesa3d.org/"
-source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
-#        0001-iris-implement-inter-context-busy-tracking.patch
-        LICENSE)
-
-prepare() {
-  cd mesa-$pkgver
-
-#  # FS#73501 
-#  patch -Np1 -i ../0001-iris-implement-inter-context-busy-tracking.patch
-}
-
-build() {
-  arch-meson mesa-$pkgver build \
-    -D b_lto=true \
-    -D b_ndebug=true \
-    -D platforms=x11,wayland \
-    -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris,crocus,zink,d3d12 \
-    -D vulkan-drivers=amd,intel,swrast \
-    -D vulkan-layers=device-select,intel-nullhw,overlay \
-    -D dri3=enabled \
-    -D egl=enabled \
-    -D gallium-extra-hud=true \
-    -D gallium-nine=true \
-    -D gallium-omx=bellagio \
-    -D gallium-opencl=icd \
-    -D gallium-va=enabled \
-    -D gallium-vdpau=enabled \
-    -D gallium-xa=enabled \
-    -D gallium-xvmc=disabled \
-    -D gbm=enabled \
-    -D gles1=disabled \
-    -D gles2=enabled \
-    -D glvnd=true \
-    -D glx=dri \
-    -D libunwind=enabled \
-    -D llvm=enabled \
-    -D lmsensors=enabled \
-    -D osmesa=true \
-    -D shared-glapi=enabled \
-    -D microsoft-clc=disabled \
-    -D valgrind=enabled
-
-  # Print config
-  meson configure build
-
-  ninja -C build
-  meson compile -C build
-
-  # fake installation to be seperated into packages
-  # outside of fakeroot but mesa doesn't need to chown/mod
-  DESTDIR="${srcdir}/fakeinstall" meson install -C build
-}
-
-_install() {
-  local src f dir
-  for src; do
-    f="${src#fakeinstall/}"
-    dir="${pkgdir}/${f%/*}"
-    install -m755 -d "${dir}"
-    mv -v "${src}" "${dir}/"
-  done
-}
-
-package_vulkan-mesa-layers() {
-  pkgdesc="Mesa's Vulkan layers"
-  depends=('libdrm' 'libxcb' 'wayland' 'python')
-  conflicts=('vulkan-mesa-layer')
-  replaces=('vulkan-mesa-layer')
-
-  _install fakeinstall/usr/share/vulkan/explicit_layer.d
-  _install fakeinstall/usr/share/vulkan/implicit_layer.d
-  _install fakeinstall/usr/lib/libVkLayer_*.so
-  _install fakeinstall/usr/bin/mesa-overlay-control.py
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_opencl-mesa() {
-  pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
-  depends=('libdrm' 'libclc' 'clang')
-  optdepends=('opencl-headers: headers necessary for OpenCL development')
-  provides=('opencl-driver')
-
-  _install fakeinstall/etc/OpenCL
-  _install fakeinstall/usr/lib/lib*OpenCL*
-  _install fakeinstall/usr/lib/gallium-pipe
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_vulkan-intel() {
-  pkgdesc="Intel's Vulkan mesa driver"
-  depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'zstd')
-  optdepends=('vulkan-mesa-layers: additional vulkan layers')
-  provides=('vulkan-driver')
-
-  _install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json
-  _install fakeinstall/usr/lib/libvulkan_intel.so
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_vulkan-radeon() {
-  pkgdesc="Radeon's Vulkan mesa driver"
-  depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs')
-  optdepends=('vulkan-mesa-layers: additional vulkan layers')
-  provides=('vulkan-driver')
-
-  _install fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json
-  _install fakeinstall/usr/lib/libvulkan_radeon.so
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_vulkan-swrast() {
-  pkgdesc="Vulkan software rasteriser driver"
-  depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'zstd' 'llvm-libs')
-  optdepends=('vulkan-mesa-layers: additional vulkan layers')
-  conflicts=('vulkan-mesa')
-  replaces=('vulkan-mesa')
-  provides=('vulkan-driver')
-
-  _install fakeinstall/usr/share/vulkan/icd.d/lvp_icd*.json
-  _install fakeinstall/usr/lib/libvulkan_lvp.so
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_libva-mesa-driver() {
-  pkgdesc="VA-API implementation for gallium"
-  depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
-  depends+=('libexpat.so')
-
-  _install fakeinstall/usr/lib/dri/*_drv_video.so
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_mesa-vdpau() {
-  pkgdesc="Mesa VDPAU drivers"
-  depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
-  depends+=('libexpat.so')
-
-  _install fakeinstall/usr/lib/vdpau
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_mesa() {
-  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
-           'libomxil-bellagio' 'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd'
-           'zstd' 'vulkan-icd-loader')
-  depends+=('libsensors.so' 'libexpat.so' 'libvulkan.so')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages'
-              'mesa-vdpau: for accelerated video playback'
-              'libva-mesa-driver: for accelerated video playback')
-  provides=('mesa-libgl' 'opengl-driver')
-  conflicts=('mesa-libgl')
-  replaces=('mesa-libgl')
-
-  _install fakeinstall/usr/share/drirc.d/00-mesa-defaults.conf
-  _install fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json
-
-  # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast, swr
-  _install fakeinstall/usr/lib/dri/*_dri.so
-
-  _install fakeinstall/usr/lib/bellagio
-  _install fakeinstall/usr/lib/d3d
-  _install fakeinstall/usr/lib/lib{gbm,glapi}.so*
-  _install fakeinstall/usr/lib/libOSMesa.so*
-  _install fakeinstall/usr/lib/libxatracker.so*
-
-  _install fakeinstall/usr/include
-  _install fakeinstall/usr/lib/pkgconfig
-
-  # libglvnd support
-  _install fakeinstall/usr/lib/libGLX_mesa.so*
-  _install fakeinstall/usr/lib/libEGL_mesa.so*
-
-  # indirect rendering
-  ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}/usr/lib/libGLX_indirect.so.0"
-
-  # make sure there are no files left to install
-  find fakeinstall -depth -print0 | xargs -0 rmdir
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-#---- license gpg-key sha256sums ----
-
-license=('custom')
-
-validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov@gmail.com>
-              '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <tanty@igalia.com>
-              'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895'  # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez@igalia.com>
-              'A5CC9FEC93F2F837CB044912336909B6B25FADFA'  # Juan A. Suarez Romero <jasuarez@igalia.com>
-              '71C4B75620BC75708B4BDB254C95FAAB3EB073EC'  # Dylan Baker <dylan@pnwbakers.com>
-              '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric@engestrom.ch>
-
-sha256sums=(b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d # mesa-21.3.7.tar.xz
-	13cd1ad5f73a581b079dbe8b6deefa3b221ad22082c2a925f8f2664822bd6f58 # mesa-21.3.7.tar.xz.sig
-	7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537) # LICENSE
diff --git a/mesa/pkglist b/mesa/pkglist
deleted file mode 100644
index 2b2ee0d..0000000
--- a/mesa/pkglist
+++ /dev/null
@@ -1,8 +0,0 @@
-sudo mv libva-mesa-driver-22.*-x86_64.pkg.tar.xz /var/cache/jobextra/
-sudo mv mesa-22.*-x86_64.pkg.tar.xz /var/cache/jobextra/
-sudo mv mesa-vdpau-22.*-x86_64.pkg.tar.xz /var/cache/jobextra/
-sudo mv opencl-mesa-22.*-x86_64.pkg.tar.xz /var/cache/jobextra/
-sudo mv vulkan-intel-22.*-x86_64.pkg.tar.xz /var/cache/jobextra/
-sudo mv vulkan-mesa-layers-22.*-x86_64.pkg.tar.xz /var/cache/jobextra/
-sudo mv vulkan-radeon-22.*-x86_64.pkg.tar.xz /var/cache/jobextra/
-sudo mv vulkan-swrast-22.*-x86_64.pkg.tar.xz /var/cache/jobextra/
diff --git a/python-setuptools/PKGBUILD b/python-setuptools/PKGBUILD
index 7627f08..70255fe 100644
--- a/python-setuptools/PKGBUILD
+++ b/python-setuptools/PKGBUILD
@@ -6,7 +6,7 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=python-setuptools
-pkgver=65.3.0
+pkgver=65.4.1
 pkgrel=01
 epoch=1
 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
@@ -98,13 +98,13 @@ package() {
 
 license=('PSF')
 
-sha512sums=('058e2204bd7f4ff2c37b8cf1cf4007bc8ee1e60a79d425dfd32d68ac02dce821158019878c3af5d98df1fdc175d1c03c75d4faf7251d7d6b33dfffc187fd3302'
-             '390fea2c575a0042054f51d33e629b04a48f832f0a4a2dd07d34e23cdf330c382dba0f54bfb7c8a6a253bb248a4940f2a789672f715e4dc2aeb395fa185cae7a'
-             '4277c983f17db19b0e499ceff7b6e24aad4f7956ec282bb7f5148f6f44e4e35077bfdfa219cbc04f49f37d0b9dc9c3e3075db7a36dbdc30944e1bd28efad0e0b')
-
-sha256sums=(abd54f52f8c454aca73a9f7084245ccd80a95db66ff56bcb846c3ba37402cc1e  # python-setuptools-65.3.0.tar.gz
+sha256sums=(1d2fd61fdcfab43e0ee26d63c0b1d5c93d4fa3af1f73c4b44329d9879a662593  # python-setuptools-65.4.1.tar.gz
 	06e2f68aebedbaeb0b0fe923eae686568910cc3355b33bf619db9266eef83efb  # system-validate-pyproject.patch
 	e4634a028f3741aa06ca8a5e61bb4bbc293146e943bbd8d5605c49a4d886203a) # add-dependency.patch
 
- 
- 
+sha512sums=('368c35fe4b3c05aea0bcb7ec0995473e6e9eca6fa51e61e6a908cbaf21972fbe0cdd71bb2aee53a819c2b740119b11a6a24e5da748bcdd19dc9560bc2c27d5f8'
+             '390fea2c575a0042054f51d33e629b04a48f832f0a4a2dd07d34e23cdf330c382dba0f54bfb7c8a6a253bb248a4940f2a789672f715e4dc2aeb395fa185cae7a'
+             '4277c983f17db19b0e499ceff7b6e24aad4f7956ec282bb7f5148f6f44e4e35077bfdfa219cbc04f49f37d0b9dc9c3e3075db7a36dbdc30944e1bd28efad0e0b')
+
+
+
diff --git a/python-setuptools/PKGBUILD-arch b/python-setuptools/PKGBUILD-arch
index c86e732..41fd2a1 100644
--- a/python-setuptools/PKGBUILD-arch
+++ b/python-setuptools/PKGBUILD-arch
@@ -3,7 +3,7 @@
 # Contributor: Eli Schwartz <eschwartz@archlinux.org>
 
 pkgname=python-setuptools
-pkgver=65.3.0
+pkgver=65.4.1
 pkgrel=1
 epoch=1
 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
@@ -22,7 +22,7 @@ replaces=('python-distribute')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/pypa/setuptools/archive/v$pkgver.tar.gz"
         system-validate-pyproject.patch
         add-dependency.patch)
-sha512sums=('058e2204bd7f4ff2c37b8cf1cf4007bc8ee1e60a79d425dfd32d68ac02dce821158019878c3af5d98df1fdc175d1c03c75d4faf7251d7d6b33dfffc187fd3302'
+sha512sums=('368c35fe4b3c05aea0bcb7ec0995473e6e9eca6fa51e61e6a908cbaf21972fbe0cdd71bb2aee53a819c2b740119b11a6a24e5da748bcdd19dc9560bc2c27d5f8'
             '390fea2c575a0042054f51d33e629b04a48f832f0a4a2dd07d34e23cdf330c382dba0f54bfb7c8a6a253bb248a4940f2a789672f715e4dc2aeb395fa185cae7a'
             '4277c983f17db19b0e499ceff7b6e24aad4f7956ec282bb7f5148f6f44e4e35077bfdfa219cbc04f49f37d0b9dc9c3e3075db7a36dbdc30944e1bd28efad0e0b')
 
diff --git a/tbb/PKGBUILD b/tbb/PKGBUILD
index f27b04f..d0da42a 100644
--- a/tbb/PKGBUILD
+++ b/tbb/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=tbb
 pkgver=2021.5.0
-pkgrel=02
+pkgrel=04
 pkgdesc='High level abstract threading library'
 arch=('x86_64')
 url='https://www.threadingbuildingblocks.org/'
@@ -16,9 +16,11 @@ makedepends=('cmake' 'inetutils' 'ninja' 'python' 'swig')
 conflicts=('intel-tbb')
 provides=("intel-tbb=$pkgver")
 replaces=('intel-tbb')
-source=(https://github.com/oneapi-src/oneTBB/archive/v$pkgver/$pkgname-$pkgver.tar.gz
+source=(https://github.com/oneapi-src/oneTBB/archive/v$pkgver/$pkgname-$pkgver.tar.gz)
         retry-pthread_create.patch::https://github.com/oneapi-src/oneTBB/pull/824.patch)
 
+## with or without the patch building fails (tried last 17 Noc 2022)
+
 prepare() {
   # Patch for mold:
   patch -d oneTBB-$pkgver -p1 -i ../retry-pthread_create.patch
@@ -37,12 +39,12 @@ build() {
 }
 
 
-#check() {
-#  cd oneTBB-$pkgver
-#  ninja test
-#}
+check() {
+  cd oneTBB-$pkgver
+  ninja test
+}
 # 
-## 2 out 134 tests failed see check.log
+## 2 out 134 tests failed see check.log  ##  comment out the check section and rerun makepkg without -f
 
 package() {
   cd oneTBB-$pkgver
@@ -56,4 +58,3 @@ license=('Apache')
 sha256sums=(e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a # tbb-2021.5.0.tar.gz
 	70b077d1cac26e35336a8217f9c56c1ce2c8885c6df6dfb9805aa8374dad9617) # retry-pthread_create.patch
 
-
diff --git a/tbb/PKGBUILD-arch b/tbb/PKGBUILD-arch
index 38ab1a1..7bf35a9 100644
--- a/tbb/PKGBUILD-arch
+++ b/tbb/PKGBUILD-arch
@@ -6,7 +6,7 @@
 
 pkgname=tbb
 pkgver=2021.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc='High level abstract threading library'
 arch=('x86_64')
 url='https://www.threadingbuildingblocks.org/'
@@ -16,11 +16,24 @@ makedepends=('cmake' 'inetutils' 'ninja' 'python' 'swig')
 conflicts=('intel-tbb')
 provides=("intel-tbb=$pkgver")
 replaces=('intel-tbb')
-source=(https://github.com/oneapi-src/oneTBB/archive/v$pkgver/$pkgname-$pkgver.tar.gz)
-sha512sums=('0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46')
+source=(https://github.com/oneapi-src/oneTBB/archive/v$pkgver/$pkgname-$pkgver.tar.gz
+        retry-pthread_create.patch::https://github.com/oneapi-src/oneTBB/pull/824.patch)
+sha512sums=('0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46'
+            '62c1535a3888f27f1af5f472c57b8e22dc6977a0a64edb84d9ea84e4a967169d2c79a2b20654c4aa3da2891fec9538c22c6e5d8a5f296947b8760c6f97e02d98')
+
+prepare() {
+  # Patch for mold:
+  patch -d oneTBB-$pkgver -p1 -i ../retry-pthread_create.patch
+}
 
 build() {
   cd oneTBB-$pkgver
+  # TBB_STRICT is ON by default and turns on -Werror, but `-DTBB_STRICT=OFF` is currently broken:
+  # https://github.com/oneapi-src/oneTBB/issues/847
+  # Upstream doesn't support GCC 12 yet:
+  # https://github.com/oneapi-src/oneTBB/issues/823#issuecomment-1128997690
+  # So we turn off the problematic new warnings in GCC 12 manually.
+  export CXXFLAGS="$CXXFLAGS -Wno-error=uninitialized -Wno-error=address"
   cmake -GNinja -DCMAKE_INSTALL_PREFIX=/usr -DTBB4PY_BUILD=ON .
   ninja all python_build
 }
diff --git a/vulkan-headers/PKGBUILD b/vulkan-headers/PKGBUILD
index 4081114..ee73936 100644
--- a/vulkan-headers/PKGBUILD
+++ b/vulkan-headers/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=vulkan-headers
 _pkgname=Vulkan-Headers
-pkgver=1.3.227
+pkgver=1.3.235
 pkgrel=01
 epoch=1
 pkgdesc="Vulkan header files"
@@ -38,6 +38,8 @@ package() {
 
 license=('APACHE')
 
-sha256sums=(5b345a9f0dafc96e4d0cd2d95547702c4451691dc731f6b486ba36fd9bab7bfe) # vulkan-headers-1.3.227.tar.gz
+sha256sums=(fca90d27e60816b5d72a700c241206c57e7d909e8ab4adfc340f5a5e9a019448) # vulkan-headers-1.3.235.tar.gz
  
  
+ 
+
diff --git a/vulkan-headers/PKGBUILD-arch b/vulkan-headers/PKGBUILD-arch
index b41f8ba..9b094d8 100644
--- a/vulkan-headers/PKGBUILD-arch
+++ b/vulkan-headers/PKGBUILD-arch
@@ -2,7 +2,7 @@
 
 pkgname=vulkan-headers
 _pkgname=Vulkan-Headers
-pkgver=1.3.227
+pkgver=1.3.235
 pkgrel=1
 epoch=1
 pkgdesc="Vulkan header files"
@@ -13,7 +13,7 @@ makedepends=(cmake git)
 provides=("vulkan-hpp=${pkgver}")
 groups=(vulkan-devel)
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/Vulkan-Headers/archive/v${pkgver}.tar.gz")
-sha256sums=('5b345a9f0dafc96e4d0cd2d95547702c4451691dc731f6b486ba36fd9bab7bfe')
+sha256sums=('fca90d27e60816b5d72a700c241206c57e7d909e8ab4adfc340f5a5e9a019448')
 
 build() {
   cd Vulkan-Headers*