various upgrades and rebuilds

2022-07-19 22:56:51 +03:00 · 2022-07-19 22:56:51 +03:00 · 0f7b38aff3
parent b37c616de4
commit 0f7b38aff3
55 changed files with 1443 additions and 190 deletions
--- a/anything-sync-daemon/PKGBUILD
+++ b/anything-sync-daemon/PKGBUILD
@ -1,40 +1,35 @@
 #!/usr/bin/bash
 # JOBoRun		: Jwm OpenBox Obarun RUNit
-# Maintainer		: Joe Bo Run <joborun@disroot.org>
+# Maintainer	: Joe Bo Run <joborun@disroot.org>
 # PkgSource		: url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
+# Website		: https://pozol.eu
 #-----------------------------------------| DESCRIPTION |---------------------------------------

 pkgname=anything-sync-daemon
-pkgver=5.86
+pkgver=6.0.0
 pkgrel=01
-pkgdesc="Symlinks and syncs user specified dirs to RAM"
+pkgdesc="Symlinks and syncs user specified dirs to RAM w/o systemd zstd"
 arch=(any)
 url="https://github.com/graysky2/anything-sync-daemon"
-depends=(bash findutils procps-ng rsync )
+depends=(bash findutils procps-ng rsync pv tar)
 optdepends=('bash-completion: for completion when using bash'
            'zsh-completions: for completion when using zhs')
-install="${pkgname}.install"
+install="$pkgname.install"
 backup=(etc/asd.conf)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/graysky2/${pkgname}/archive/v${pkgver}.tar.gz")
+source=($pkgname-$pkgver.tar.gz::https://github.com/graysky2/${pkgname}/archive/v$pkgver.tar.gz)

 build() {
-  cd "$pkgname-$pkgver"
-  make
+  make -C $pkgname-$pkgver
 }

 package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" 
-  install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
-  install -vDm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}/"
+  make DESTDIR="$pkgdir/" install-systemd-all -C $pkgname-$pkgver
+  install -vDm 644 $pkgname-$pkgver/LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+  install -vDm 644 $pkgname-$pkgver/README.md -t "$pkgdir/usr/share/doc/$pkgname/"
 }

 #---- license gpg-key sha256sums ----

 license=(MIT)

-sha512sums=('1554dd382ebc2aa6887908d8165378aeaaa768dbd6412e97fc0a095020fcefd17fad973b771880d959e8f6a7856adfb905d3401d0b9eba0b3beebb1482521c8d')
-
-b2sums=('f773c4d779c15c49f78fb659084dfdc0988be05f9dbf898b1a11b18a8b414df84b5645c0f299320194e6aa07100deaef7fbaa0c0453eb291108db50114ed1b61')
-
-sha256sums=(e78544efeb16a6d4ae375bcc964007475f9ce0fb602f721b6cb77210c1d6d072) # anything-sync-daemon-5.86.tar.gz
+sha256sums=(51a4abe0aa15623a5fc3012df6a94f5f977f2e65c6fba96829f8d7761e109d52) # anything-sync-daemon-6.0.0.tar.gz
--- a/anything-sync-daemon/PKGBUILD-arch
+++ b/anything-sync-daemon/PKGBUILD-arch
@ -2,29 +2,29 @@
 # Contributor: graysky <graysky AT archlinux DOT us>

 pkgname=anything-sync-daemon
-pkgver=5.86
+pkgver=6.0.0
 pkgrel=1
 pkgdesc="Symlinks and syncs user specified dirs to RAM"
 arch=(any)
 url="https://github.com/graysky2/anything-sync-daemon"
 license=(MIT)
-depends=(bash findutils procps-ng rsync systemd)
-optdepends=('bash-completion: for completion when using bash'
-            'zsh-completions: for completion when using zhs')
-install="${pkgname}.install"
+depends=(bash findutils procps-ng pv rsync systemd tar zstd)
+optdepends=(
+  'bash-completion: for completion when using bash'
+  'zsh-completions: for completion when using zsh'
+)
+install=$pkgname.install
 backup=(etc/asd.conf)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/graysky2/${pkgname}/archive/v${pkgver}.tar.gz")
-sha512sums=('1554dd382ebc2aa6887908d8165378aeaaa768dbd6412e97fc0a095020fcefd17fad973b771880d959e8f6a7856adfb905d3401d0b9eba0b3beebb1482521c8d')
-b2sums=('f773c4d779c15c49f78fb659084dfdc0988be05f9dbf898b1a11b18a8b414df84b5645c0f299320194e6aa07100deaef7fbaa0c0453eb291108db50114ed1b61')
+source=($pkgname-$pkgver.tar.gz::https://github.com/graysky2/$pkgname/archive/v$pkgver.tar.gz)
+sha512sums=('4161d6b6103a81fa3df4ef9ed054bd6831205624a8327e30b103d49cf0431de78fedc812004405dbecba0867df4b0be35fc70ae274931ad2592a3b7c32f93d77')
+b2sums=('462c4f381d10ff669ddec6081a4c98d4b972373d96004d32413e6f4c36fa7d0fc2e421255e3941fc85fe01cab3cf61c17c5fcd36e0cc43db5ae1c7dad137fd91')

 build() {
-  cd "$pkgname-$pkgver"
-  make
+  make -C $pkgname-$pkgver
 }

 package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install-systemd-all
-  install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
-  install -vDm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}/"
+  make DESTDIR="$pkgdir/" install-systemd-all -C $pkgname-$pkgver
+  install -vDm 644 $pkgname-$pkgver/LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+  install -vDm 644 $pkgname-$pkgver/README.md -t "$pkgdir/usr/share/doc/$pkgname/"
 }
--- a/anything-sync-daemon/deps
+++ b/anything-sync-daemon/deps
@ -1 +1,2 @@
 rsync
+pv
--- a/cmake/PKGBUILD
+++ b/cmake/PKGBUILD
@ -14,7 +14,12 @@ url="https://www.cmake.org/"
 depends=('curl' 'libarchive' 'hicolor-icon-theme' 'jsoncpp' 'libuv' 'rhash')
 makedepends=( 'python-sphinx' 'emacs-git')
 optdepends=('qt6-base: cmake-gui')
-source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz")
+source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
+         wxwidgets-3.2.patch)
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < wxwidgets-3.2.patch # Support wxWidgets 3.2
+}

 build() {
  cd ${pkgname}-${pkgver}
@ -44,6 +49,6 @@ package() {

 license=('custom')

-sha256sums=(f316b40053466f9a416adf981efda41b160ca859e97f6a484b447ea299ff26aa) # cmake-3.23.2.tar.gz
-
+sha256sums=(f316b40053466f9a416adf981efda41b160ca859e97f6a484b447ea299ff26aa # cmake-3.23.2.tar.gz
+	bd246e61a6afeebbc5cf5ccd282ee21c4320de04523145d3e27dd8a1efbf330d) # wxwidgets-3.2.patch

--- a/cmake/PKGBUILD-arch
+++ b/cmake/PKGBUILD-arch
@ -4,7 +4,7 @@

 pkgname=cmake
 pkgver=3.23.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A cross-platform open-source make system'
 arch=('x86_64')
 url="https://www.cmake.org/"
@ -12,8 +12,14 @@ license=('custom')
 depends=('curl' 'libarchive' 'hicolor-icon-theme' 'jsoncpp' 'libjsoncpp.so' 'libuv' 'rhash')
 makedepends=('qt6-base' 'python-sphinx' 'emacs')
 optdepends=('qt6-base: cmake-gui')
-source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('0925adf973d642fd76d4089b61b3882babb0a85050c4c57d5f5f3bd6b17564a9feb0beed236cd636e25f69072fa30b67ea3f80932380b6b6576f2dd78b8e6931')
+source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
+         wxwidgets-3.2.patch)
+sha512sums=('0925adf973d642fd76d4089b61b3882babb0a85050c4c57d5f5f3bd6b17564a9feb0beed236cd636e25f69072fa30b67ea3f80932380b6b6576f2dd78b8e6931'
+            '618a529fcd0a5029160fc6ef74439b7cb54ca74d13d52dd6cad005710bf1be263d0bf90bc4becc63a37929ac2f86c51278685e9da93fd82355ac646cb43b356f')
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < wxwidgets-3.2.patch # Support wxWidgets 3.2
+}

 build() {
  cd ${pkgname}-${pkgver}
--- a/cmake/deps
+++ b/cmake/deps
@ -6,3 +6,4 @@ python-sphinx
 emacs-git


+
--- a/cmake/time
+++ b/cmake/time
@ -1,5 +1,5 @@

-real	9m51.679s
-user	34m50.795s
-sys	1m32.376s
+real	11m24.191s
+user	40m13.508s
+sys	1m39.078s

--- a/cmake/wxwidgets-3.2.patch
+++ b/cmake/wxwidgets-3.2.patch
@ -0,0 +1,303 @@
+From ed51e0bb752ecaae29c4ac7a6a89ebfbe5fb4016 Mon Sep 17 00:00:00 2001
+From: Maarten Bent <MaartenBent@users.noreply.github.com>
+Date: Wed, 15 Jun 2022 18:23:41 +0200
+Subject: [PATCH 1/3] FindwxWidgets: Move extracting version number to a macro
+
+---
+ Modules/FindwxWidgets.cmake | 44 ++++++++++++++++++++-----------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
+index f7996bacb0..accae50e80 100644
+--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
+@@ -215,6 +215,29 @@ else()
+   set(wxWidgets_USE_FILE UsewxWidgets)
+ endif()
+ 
+macro(wx_extract_version)
+  unset(_wx_filename)
+  find_file(_wx_filename wx/version.h PATHS ${wxWidgets_INCLUDE_DIRS} NO_DEFAULT_PATH)
+  dbg_msg("_wx_filename:  ${_wx_filename}")
+
+  if(NOT _wx_filename)
+    message(FATAL_ERROR "wxWidgets wx/version.h file not found in ${wxWidgets_INCLUDE_DIRS}.")
+  endif()
+
+  file(READ "${_wx_filename}" _wx_version_h)
+  unset(_wx_filename CACHE)
+
+  string(REGEX REPLACE "^(.*\n)?#define +wxMAJOR_VERSION +([0-9]+).*"
+    "\\2" wxWidgets_VERSION_MAJOR "${_wx_version_h}" )
+  string(REGEX REPLACE "^(.*\n)?#define +wxMINOR_VERSION +([0-9]+).*"
+    "\\2" wxWidgets_VERSION_MINOR "${_wx_version_h}" )
+  string(REGEX REPLACE "^(.*\n)?#define +wxRELEASE_NUMBER +([0-9]+).*"
+    "\\2" wxWidgets_VERSION_PATCH "${_wx_version_h}" )
+  set(wxWidgets_VERSION_STRING
+    "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" )
+  dbg_msg("wxWidgets_VERSION_STRING:    ${wxWidgets_VERSION_STRING}")
+endmacro()
+
+ #=====================================================================
+ # Determine whether unix or win32 paths should be used
+ #=====================================================================
+@@ -981,26 +1004,7 @@ unset(_wx_lib_missing)
+ 
+ # Check if a specific version was requested by find_package().
+ if(wxWidgets_FOUND)
+-  unset(_wx_filename)
+-  find_file(_wx_filename wx/version.h PATHS ${wxWidgets_INCLUDE_DIRS} NO_DEFAULT_PATH)
+-  dbg_msg("_wx_filename:  ${_wx_filename}")
+-
+-  if(NOT _wx_filename)
+-    message(FATAL_ERROR "wxWidgets wx/version.h file not found in ${wxWidgets_INCLUDE_DIRS}.")
+-  endif()
+-
+-  file(READ "${_wx_filename}" _wx_version_h)
+-  unset(_wx_filename CACHE)
+-
+-  string(REGEX REPLACE "^(.*\n)?#define +wxMAJOR_VERSION +([0-9]+).*"
+-    "\\2" wxWidgets_VERSION_MAJOR "${_wx_version_h}" )
+-  string(REGEX REPLACE "^(.*\n)?#define +wxMINOR_VERSION +([0-9]+).*"
+-    "\\2" wxWidgets_VERSION_MINOR "${_wx_version_h}" )
+-  string(REGEX REPLACE "^(.*\n)?#define +wxRELEASE_NUMBER +([0-9]+).*"
+-    "\\2" wxWidgets_VERSION_PATCH "${_wx_version_h}" )
+-  set(wxWidgets_VERSION_STRING
+-    "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" )
+-  dbg_msg("wxWidgets_VERSION_STRING:    ${wxWidgets_VERSION_STRING}")
+  wx_extract_version()
+ endif()
+ 
+ # Debug output:
+-- 
+GitLab
+
+
+From 853449429dec94d64bd0c0cfd41d0104416210df Mon Sep 17 00:00:00 2001
+From: Maarten Bent <MaartenBent@users.noreply.github.com>
+Date: Wed, 15 Jun 2022 18:26:08 +0200
+Subject: [PATCH 2/3] FindwxWidgets: Use version number from header for library
+ names
+
+---
+ Modules/FindwxWidgets.cmake | 47 ++++++++++---------------------------
+ 1 file changed, 12 insertions(+), 35 deletions(-)
+
+diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
+index accae50e80..3567a62df0 100644
+--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
+@@ -292,10 +292,11 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+   #
+   # Find libraries associated to a configuration.
+   #
+-  macro(WX_FIND_LIBS _PF _UNV _UCD _DBG)
+  macro(WX_FIND_LIBS _PF _UNV _UCD _DBG _VER)
+     DBG_MSG_V("m_unv = ${_UNV}")
+     DBG_MSG_V("m_ucd = ${_UCD}")
+     DBG_MSG_V("m_dbg = ${_DBG}")
+    DBG_MSG_V("m_ver = ${_VER}")
+ 
+     # FIXME: What if both regex libs are available. regex should be
+     # found outside the loop and only wx${LIB}${_UCD}${_DBG}.
+@@ -313,28 +314,14 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+ 
+     # Find wxWidgets multilib base libraries.
+     find_library(WX_base${_DBG}
+-      NAMES
+-      wxbase31${_UCD}${_DBG}
+-      wxbase30${_UCD}${_DBG}
+-      wxbase29${_UCD}${_DBG}
+-      wxbase28${_UCD}${_DBG}
+-      wxbase27${_UCD}${_DBG}
+-      wxbase26${_UCD}${_DBG}
+-      wxbase25${_UCD}${_DBG}
+      NAMES wxbase${_VER}${_UCD}${_DBG}
+       PATHS ${WX_LIB_DIR}
+       NO_DEFAULT_PATH
+       )
+     mark_as_advanced(WX_base${_DBG})
+     foreach(LIB net odbc xml)
+       find_library(WX_${LIB}${_DBG}
+-        NAMES
+-        wxbase31${_UCD}${_DBG}_${LIB}
+-        wxbase30${_UCD}${_DBG}_${LIB}
+-        wxbase29${_UCD}${_DBG}_${LIB}
+-        wxbase28${_UCD}${_DBG}_${LIB}
+-        wxbase27${_UCD}${_DBG}_${LIB}
+-        wxbase26${_UCD}${_DBG}_${LIB}
+-        wxbase25${_UCD}${_DBG}_${LIB}
+        NAMES wxbase${_VER}${_UCD}${_DBG}_${LIB}
+         PATHS ${WX_LIB_DIR}
+         NO_DEFAULT_PATH
+         )
+@@ -343,14 +330,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+ 
+     # Find wxWidgets monolithic library.
+     find_library(WX_mono${_DBG}
+-      NAMES
+-      wx${_PF}${_UNV}31${_UCD}${_DBG}
+-      wx${_PF}${_UNV}30${_UCD}${_DBG}
+-      wx${_PF}${_UNV}29${_UCD}${_DBG}
+-      wx${_PF}${_UNV}28${_UCD}${_DBG}
+-      wx${_PF}${_UNV}27${_UCD}${_DBG}
+-      wx${_PF}${_UNV}26${_UCD}${_DBG}
+-      wx${_PF}${_UNV}25${_UCD}${_DBG}
+      NAMES wx${_PF}${_UNV}${_VER}${_UCD}${_DBG}
+       PATHS ${WX_LIB_DIR}
+       NO_DEFAULT_PATH
+       )
+@@ -360,14 +340,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+     foreach(LIB core adv aui html media xrc dbgrid gl qa richtext
+                 stc ribbon propgrid webview)
+       find_library(WX_${LIB}${_DBG}
+-        NAMES
+-        wx${_PF}${_UNV}31${_UCD}${_DBG}_${LIB}
+-        wx${_PF}${_UNV}30${_UCD}${_DBG}_${LIB}
+-        wx${_PF}${_UNV}29${_UCD}${_DBG}_${LIB}
+-        wx${_PF}${_UNV}28${_UCD}${_DBG}_${LIB}
+-        wx${_PF}${_UNV}27${_UCD}${_DBG}_${LIB}
+-        wx${_PF}${_UNV}26${_UCD}${_DBG}_${LIB}
+-        wx${_PF}${_UNV}25${_UCD}${_DBG}_${LIB}
+        NAMES wx${_PF}${_UNV}${_VER}${_UCD}${_DBG}_${LIB}
+         PATHS ${WX_LIB_DIR}
+         NO_DEFAULT_PATH
+         )
+@@ -678,10 +651,14 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+           set(wxWidgets_FOUND FALSE)
+         endif()
+ 
+        # Get version number.
+        wx_extract_version()
+        set(VER "${wxWidgets_VERSION_MAJOR}${wxWidgets_VERSION_MINOR}")
+
+         # Find wxWidgets libraries.
+-        WX_FIND_LIBS("${PF}" "${UNV}" "${UCD}" "${DBG}")
+        WX_FIND_LIBS("${PF}" "${UNV}" "${UCD}" "${DBG}" "${VER}")
+         if(WX_USE_REL_AND_DBG)
+-          WX_FIND_LIBS("${PF}" "${UNV}" "${UCD}" "d")
+          WX_FIND_LIBS("${PF}" "${UNV}" "${UCD}" "d" "${VER}")
+         endif()
+ 
+         # Settings for requested libs (i.e., include dir, libraries, etc.).
+-- 
+GitLab
+
+
+From 2a19231d618482755e9aae981a65680bb1ec1050 Mon Sep 17 00:00:00 2001
+From: Maarten Bent <MaartenBent@users.noreply.github.com>
+Date: Wed, 15 Jun 2022 18:28:00 +0200
+Subject: [PATCH 3/3] FindwxWidgets: Support more wxWidgets versions, including
+ 3.2
+
+Update the example to use a more recent wxWidgets version.
+
+Use a list with known version numbers when searching for installation directories and wx-config names.
+---
+ Modules/FindwxWidgets.cmake | 58 ++++++++++++-------------------------
+ 1 file changed, 18 insertions(+), 40 deletions(-)
+
+diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
+index 3567a62df0..9e7937e2ea 100644
+--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
+@@ -29,9 +29,9 @@ select a configuration):
+ ::
+ 
+   wxWidgets_ROOT_DIR      - Base wxWidgets directory
+-                            (e.g., C:/wxWidgets-2.6.3).
+                            (e.g., C:/wxWidgets-3.2.0).
+   wxWidgets_LIB_DIR       - Path to wxWidgets libraries
+-                            (e.g., C:/wxWidgets-2.6.3/lib/vc_lib).
+                            (e.g., C:/wxWidgets-3.2.0/lib/vc_x64_lib).
+   wxWidgets_CONFIGURATION - Configuration to use
+                             (e.g., msw, mswd, mswu, mswunivud, etc.)
+   wxWidgets_EXCLUDE_COMMON_LIBRARIES
+@@ -215,6 +215,9 @@ else()
+   set(wxWidgets_USE_FILE UsewxWidgets)
+ endif()
+ 
+# Known wxWidgets versions.
+set(wx_versions 3.3 3.2 3.1 3.0 2.9 2.8 2.7 2.6 2.5)
+
+ macro(wx_extract_version)
+   unset(_wx_filename)
+   find_file(_wx_filename wx/version.h PATHS ${wxWidgets_INCLUDE_DIRS} NO_DEFAULT_PATH)
+@@ -443,6 +446,13 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+   # WIN32: Start actual work.
+   #-------------------------------------------------------------------
+ 
+  set(wx_paths "wxWidgets")
+  foreach(version ${wx_versions})
+    foreach(patch RANGE 15 0 -1)
+      list(APPEND wx_paths "wxWidgets-${version}.${patch}")
+    endforeach()
+  endforeach()
+
+   # Look for an installation tree.
+   find_path(wxWidgets_ROOT_DIR
+     NAMES include/wx/wx.h
+@@ -454,41 +464,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+       D:/
+       ENV ProgramFiles
+     PATH_SUFFIXES
+-      wxWidgets-3.1.0
+-      wxWidgets-3.0.2
+-      wxWidgets-3.0.1
+-      wxWidgets-3.0.0
+-      wxWidgets-2.9.5
+-      wxWidgets-2.9.4
+-      wxWidgets-2.9.3
+-      wxWidgets-2.9.2
+-      wxWidgets-2.9.1
+-      wxWidgets-2.9.0
+-      wxWidgets-2.8.9
+-      wxWidgets-2.8.8
+-      wxWidgets-2.8.7
+-      wxWidgets-2.8.6
+-      wxWidgets-2.8.5
+-      wxWidgets-2.8.4
+-      wxWidgets-2.8.3
+-      wxWidgets-2.8.2
+-      wxWidgets-2.8.1
+-      wxWidgets-2.8.0
+-      wxWidgets-2.7.4
+-      wxWidgets-2.7.3
+-      wxWidgets-2.7.2
+-      wxWidgets-2.7.1
+-      wxWidgets-2.7.0
+-      wxWidgets-2.7.0-1
+-      wxWidgets-2.6.4
+-      wxWidgets-2.6.3
+-      wxWidgets-2.6.2
+-      wxWidgets-2.6.1
+-      wxWidgets-2.5.4
+-      wxWidgets-2.5.3
+-      wxWidgets-2.5.2
+-      wxWidgets-2.5.1
+-      wxWidgets
+      ${wx_paths}
+     DOC "wxWidgets base/installation directory"
+     )
+ 
+@@ -773,12 +749,14 @@ else()
+     # Look for wx-config -- this can be set in the environment,
+     # or try versioned and toolchain-versioned variants of the -config
+     # executable as well.
+    set(wx_config_names "wx-config")
+    foreach(version ${wx_versions})
+      list(APPEND wx_config_names "wx-config-${version}" "wxgtk3u-${version}-config" "wxgtk2u-${version}-config")
+    endforeach()
+     find_program(wxWidgets_CONFIG_EXECUTABLE
+       NAMES
+         $ENV{WX_CONFIG}
+-        wx-config
+-        wx-config-3.1 wx-config-3.0 wx-config-2.9 wx-config-2.8
+-        wxgtk3u-3.1-config wxgtk3u-3.0-config wxgtk2u-2.8-config
+        ${wx_config_names}
+       DOC "Location of wxWidgets library configuration provider binary (wx-config)."
+       ONLY_CMAKE_FIND_ROOT_PATH
+       )
+-- 
+GitLab
+
--- a/fakechroot/PKGBUILD
+++ b/fakechroot/PKGBUILD
@ -6,40 +6,66 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------

 pkgname=fakechroot
-pkgver=2.20.1
-pkgrel=02
-pkgdesc="Gives a fake chroot environment"
+pkgver=2.20.1.r7.gb42d1fb
+pkgrel=01
+pkgdesc="Gives a fake chroot environment - from git"
 arch=('x86_64')
 url="https://github.com/dex4er/fakechroot/wiki"
 depends=('sh' 'perl')
-source=($pkgname-$pkgver.tar.gz::https://github.com/dex4er/fakechroot/archive/${pkgver}.tar.gz)
-#	no_STAT_VER.patch)
+makedepends=('git')
+provides=('fakechroot')
+conflicts=('fakechroot')
+options=('staticlibs')
+source=("git+https://github.com/dex4er/fakechroot.git"
+        "fix_glibc_2.33_compatibility.patch::https://github.com/lipnitsk/fakechroot/commit/693a3597ea7fccfb62f357503ff177bd3e3d5a89.patch"
+        "remove_ver_from_lstat.patch::https://github.com/lipnitsk/fakechroot/commit/75d7e6fa191c11a791faff06a0de86eaa7801d05.patch")
+
+prepare() {
+  cd "fakechroot"
+
+  patch -Np1 -i "$srcdir/fix_glibc_2.33_compatibility.patch"
+  patch -Np1 -i "$srcdir/remove_ver_from_lstat.patch"
+}
+
+pkgver() {
+  cd "fakechroot"
+
+  _tag=$(git tag -l --sort -v:refname | sed '/rc[0-9]*/d' | head -n1)
+  _rev=$(git rev-list --count $_tag..HEAD)
+  _hash=$(git rev-parse --short HEAD)
+  printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash" | sed 's|^master/||'
+}

 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sbindir=/usr/bin \
-  --libdir=/usr/lib/libfakeroot --sysconfdir=/etc
+  cd $pkgname
+  ./autogen.sh
+  ./configure \
+     --prefix=/usr \
+     --sbindir=/usr/bin \
+     --libdir=/usr/lib/libfakeroot \
+     --sysconfdir=/etc
  make
 }

-check() {
-  cd $pkgname-$pkgver
-
-  # t/fts.t fails when building on BTRFS...  (really!)
-  make -k check
-}
+#check() {
+#  cd $pkgname
+#
+#  make check
+#}
  
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
+
  make DESTDIR="${pkgdir}" install
-  
-  install -dm755 "${pkgdir}"/etc/ld.so.conf.d/
-  echo '/usr/lib/libfakeroot/fakechroot/' > "${pkgdir}"/etc/ld.so.conf.d/fakechroot.conf
+
+  install -dm755 "$pkgdir/etc/ld.so.conf.d"
+  echo "/usr/lib/libfakeroot/fakechroot" > "$pkgdir/etc/ld.so.conf.d/fakechroot.conf"
 }

 #---- license gpg-key sha256sums ----

 license=('LGPL')
+sha256sums=(SKIP
+	4038238c9a3ec67b6a749a55eb206f92fcc75a8e762d27b1cca236bd49fdcd40 # fix_glibc_2.33_compatibility.patch
+	2ca655d046390b2822c0e8fc65c32a3c8851542896452e940b8e16d57f0dd0e5) # remove_ver_from_lstat.patch

-sha256sums=(7f9d60d0d48611969e195fadf84d05f6c74f71bbf8f41950ad8f5bf061773e18) # fakechroot-2.20.1.tar.gz
-#	3e2047d1888ee983cbec42e0d11d89fbb89e06b202fa97668ddd04e393acab4c) # no_STAT_VER.patch
--- a/fakechroot/PKGBUILD-aur
+++ b/fakechroot/PKGBUILD-aur
@ -0,0 +1,64 @@
+# Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
+
+pkgname=fakechroot-git
+pkgver=2.20.1.r7.gb42d1fb
+pkgrel=1
+pkgdesc="Gives a fake chroot environment"
+arch=('i686' 'x86_64')
+url="https://github.com/dex4er/fakechroot"
+license=('LGPL')
+depends=('glibc' 'perl' 'sh')
+makedepends=('git')
+provides=('fakechroot')
+conflicts=('fakechroot')
+options=('staticlibs')
+source=("git+https://github.com/dex4er/fakechroot.git"
+        "fix_glibc_2.33_compatibility.patch::https://github.com/lipnitsk/fakechroot/commit/693a3597ea7fccfb62f357503ff177bd3e3d5a89.patch"
+        "remove_ver_from_lstat.patch::https://github.com/lipnitsk/fakechroot/commit/75d7e6fa191c11a791faff06a0de86eaa7801d05.patch")
+sha256sums=('SKIP'
+            '959f931e86964058e3ceeae029078140db9070180807ba9118419cede7a19843'
+            '6ad03fcf98a619f550d6145d8b3855a606367de0bcb5f20113ba36f17d182bc9')
+
+
+prepare() {
+  cd "fakechroot"
+
+  patch -Np1 -i "$srcdir/fix_glibc_2.33_compatibility.patch"
+  patch -Np1 -i "$srcdir/remove_ver_from_lstat.patch"
+}
+
+pkgver() {
+  cd "fakechroot"
+
+  _tag=$(git tag -l --sort -v:refname | sed '/rc[0-9]*/d' | head -n1)
+  _rev=$(git rev-list --count $_tag..HEAD)
+  _hash=$(git rev-parse --short HEAD)
+  printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash" | sed 's|^master/||'
+}
+
+build() {
+  cd "fakechroot"
+
+  ./autogen.sh
+  ./configure \
+    --prefix="/usr" \
+    --libdir="/usr/lib/libfakeroot" \
+    --sbindir="/usr/bin" \
+    --sysconfdir="/etc"
+  make
+}
+
+check() {
+  cd "fakechroot"
+
+  #make check
+}
+
+package() {
+  cd "fakechroot"
+
+  make DESTDIR="$pkgdir" install
+
+  install -dm755 "$pkgdir/etc/ld.so.conf.d"
+  echo "/usr/lib/libfakeroot/fakechroot" > "$pkgdir/etc/ld.so.conf.d/fakechroot.conf"
+}
--- a/fakechroot/clean
+++ b/fakechroot/clean
@ -1 +1 @@
-rm -rf {src,pkg,fakech*tar.gz*}
+rm -rf {src,pkg,fakech*tar.gz*,fakechroot}
--- a/fakechroot/deps
+++ b/fakechroot/deps
@ -1,3 +1,7 @@

-sharutil
+sharutils
 automake
+
+
+git
+autoconf
--- a/fakechroot/fix_glibc_2.33_compatibility.patch
+++ b/fakechroot/fix_glibc_2.33_compatibility.patch
@ -0,0 +1,213 @@
+From 693a3597ea7fccfb62f357503ff177bd3e3d5a89 Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Mon, 22 Feb 2021 21:47:09 -0800
+Subject: [PATCH] fix glibc 2.33+ compatibility
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ configure.ac        | 20 ++++++++++++++++++++
+ src/ftw.c           |  2 +-
+ src/ftw64.c         | 14 +++++++++++---
+ src/libfakechroot.h | 15 +++++++++++++++
+ src/lstat.c         |  2 +-
+ src/lstat.h         |  2 +-
+ src/lstat64.c       |  2 +-
+ src/mknod.c         |  2 +-
+ src/mknodat.c       |  2 +-
+ src/stat.c          |  2 +-
+ src/stat64.c        |  2 +-
+ 11 files changed, 54 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8cdb323..9cc2e779 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -75,6 +75,26 @@ ACX_CHECK_C_ATTRIBUTE_VISIBILITY
+ # Checks for libraries.
+ AC_CHECK_LIB([dl], [dlsym])
+ 
+AH_TEMPLATE([NEW_GLIBC], [glibc >= 2.33])
+AC_MSG_CHECKING([for glibc 2.33+])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+       #include <sys/stat.h>
+  ]], [[
+#ifdef __GLIBC__
+#if !__GLIBC_PREREQ(2,33)
+#error glibc<2.33
+#endif
+#else
+#error not glibc
+#endif
+  ]])],[
+   AC_DEFINE(NEW_GLIBC,1)
+   AC_MSG_RESULT([yes])
+  ],[
+   AC_DEFINE(NEW_GLIBC,0)
+   AC_MSG_RESULT([no])
+  ])
+
+ # Checks for header files.
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+diff --git a/src/ftw.c b/src/ftw.c
+index 92fc126c..a9abc853 100644
+--- a/src/ftw.c
+++ b/src/ftw.c
+@@ -185,7 +185,7 @@ int rpl_lstat (const char *, struct stat *);
+ # define NFTW_NEW_NAME __new_nftw
+ # define INO_T ino_t
+ # define STAT stat
+-# ifdef _LIBC
+# if defined(_LIBC) && !NEW_GLIBC
+ #  define LXSTAT __lxstat
+ #  define XSTAT __xstat
+ #  define FXSTATAT __fxstatat
+diff --git a/src/ftw64.c b/src/ftw64.c
+index 7cc8cdfd..cee1f2bc 100644
+--- a/src/ftw64.c
+++ b/src/ftw64.c
+@@ -18,6 +18,8 @@
+    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+    02111-1307 USA.  */
+ 
+#include "config.h"
+
+ #define __FTW64_C
+ #define FTW_NAME ftw64
+ #define NFTW_NAME nftw64
+@@ -25,9 +27,15 @@
+ #define NFTW_NEW_NAME __new_nftw64
+ #define INO_T ino64_t
+ #define STAT stat64
+-#define LXSTAT __lxstat64
+-#define XSTAT __xstat64
+-#define FXSTATAT __fxstatat64
+#if NEW_GLIBC
+#  define LXSTAT(V,f,sb) lstat64 (f,sb)
+#  define XSTAT(V,f,sb) stat64 (f,sb)
+#  define FXSTATAT(V,d,f,sb,m) fstatat64 (d, f, sb, m)
+#else
+#  define LXSTAT __lxstat64
+#  define XSTAT __xstat64
+#  define FXSTATAT __fxstatat64
+#endif
+ #define FTW_FUNC_T __ftw64_func_t
+ #define NFTW_FUNC_T __nftw64_func_t
+ 
+diff --git a/src/libfakechroot.h b/src/libfakechroot.h
+index 4cf199ff..64ff15fb 100644
+--- a/src/libfakechroot.h
+++ b/src/libfakechroot.h
+@@ -200,6 +200,21 @@
+ # endif
+ #endif
+ 
+#ifndef _STAT_VER
+ #if defined (__aarch64__)
+  #define _STAT_VER 0
+ #elif defined (__powerpc__) && __WORDSIZE == 64
+  #define _STAT_VER 1
+ #elif defined (__riscv) && __riscv_xlen==64
+  #define _STAT_VER 0
+ #elif defined (__s390x__)
+  #define _STAT_VER 1
+ #elif defined (__x86_64__)
+  #define _STAT_VER 1
+ #else
+  #define _STAT_VER 3
+ #endif
+#endif
+ 
+ typedef void (*fakechroot_wrapperfn_t)(void);
+ 
+diff --git a/src/lstat.c b/src/lstat.c
+index 54e3263f..fa383234 100644
+--- a/src/lstat.c
+++ b/src/lstat.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#ifndef HAVE___LXSTAT
+#if !defined(HAVE___LXSTAT) || NEW_GLIBC
+ 
+ #include <sys/stat.h>
+ #include <unistd.h>
+diff --git a/src/lstat.h b/src/lstat.h
+index ee483033..c46a2b9b 100644
+--- a/src/lstat.h
+++ b/src/lstat.h
+@@ -24,7 +24,7 @@
+ #include <config.h>
+ #include "libfakechroot.h"
+ 
+-#ifndef HAVE___LXSTAT
+#if !defined(HAVE___LXSTAT) || NEW_GLIBC
+ 
+ wrapper_proto(lstat, int, (const char *, struct stat *));
+ 
+diff --git a/src/lstat64.c b/src/lstat64.c
+index b6212fc8..a332d7c3 100644
+--- a/src/lstat64.c
+++ b/src/lstat64.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#if defined(HAVE_LSTAT64) && !defined(HAVE___LXSTAT64)
+#if defined(HAVE_LSTAT64) && (!defined(HAVE___LXSTAT64) || NEW_GLIBC)
+ 
+ #define _LARGEFILE64_SOURCE
+ #define _BSD_SOURCE
+diff --git a/src/mknod.c b/src/mknod.c
+index 27710372..aeb750b0 100644
+--- a/src/mknod.c
+++ b/src/mknod.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#ifndef HAVE___XMKNOD
+#if !defined(HAVE___XMKNOD) || NEW_GLIBC
+ 
+ #include <sys/stat.h>
+ #include "libfakechroot.h"
+diff --git a/src/mknodat.c b/src/mknodat.c
+index 732a22bc..3239b357 100644
+--- a/src/mknodat.c
+++ b/src/mknodat.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#if defined(HAVE_MKNODAT) && !defined(HAVE___XMKNODAT)
+#if defined(HAVE_MKNODAT) && (!defined(HAVE___XMKNODAT) || NEW_GLIBC)
+ 
+ #define _ATFILE_SOURCE
+ #include <sys/stat.h>
+diff --git a/src/stat.c b/src/stat.c
+index 7b377933..5ef57bab 100644
+--- a/src/stat.c
+++ b/src/stat.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#ifndef HAVE___XSTAT
+#if !defined(HAVE___XSTAT) || NEW_GLIBC
+ 
+ #define _BSD_SOURCE
+ #define _DEFAULT_SOURCE
+diff --git a/src/stat64.c b/src/stat64.c
+index a360f66f..993ce808 100644
+--- a/src/stat64.c
+++ b/src/stat64.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#if defined(HAVE_STAT64) && !defined(HAVE___XSTAT64)
+#if defined(HAVE_STAT64) && (!defined(HAVE___XSTAT64) || NEW_GLIBC)
+ 
+ #define _BSD_SOURCE
+ #define _LARGEFILE64_SOURCE
--- a/fakechroot/remove_ver_from_lstat.patch
+++ b/fakechroot/remove_ver_from_lstat.patch
@ -0,0 +1,93 @@
+From 75d7e6fa191c11a791faff06a0de86eaa7801d05 Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Mon, 22 Feb 2021 21:46:36 -0800
+Subject: [PATCH] declare missing bufs, remove ver from lstat
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ src/lstat.c  | 8 +++++---
+ src/lstat.h  | 2 +-
+ src/mknod.c  | 2 ++
+ src/stat.c   | 2 ++
+ src/stat64.c | 2 ++
+ 5 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/src/lstat.c b/src/lstat.c
+index 3f6d819f..54e3263f 100644
+--- a/src/lstat.c
+++ b/src/lstat.c
+@@ -28,9 +28,11 @@
+ #include "lstat.h"
+ 
+ 
+-wrapper(lstat, int, (int ver, const char * filename, struct stat * buf))
+wrapper(lstat, int, (const char * filename, struct stat * buf))
+ {
+-    debug("lstat(%d, \"%s\", &buf)", ver, filename);
+    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
+    char fakechroot_buf[FAKECHROOT_PATH_MAX];
+    debug("lstat(\"%s\", &buf)", filename);
+ 
+     if (!fakechroot_localdir(filename)) {
+         if (filename != NULL) {
+@@ -40,7 +42,7 @@ wrapper(lstat, int, (int ver, const char * filename, struct stat * buf))
+         }
+     }
+ 
+-    return lstat_rel(ver, filename, buf);
+    return lstat_rel(filename, buf);
+ }
+ 
+ 
+diff --git a/src/lstat.h b/src/lstat.h
+index 751c1ead..ee483033 100644
+--- a/src/lstat.h
+++ b/src/lstat.h
+@@ -26,7 +26,7 @@
+ 
+ #ifndef HAVE___LXSTAT
+ 
+-wrapper_proto(lstat, int, (int, const char *, struct stat *));
+wrapper_proto(lstat, int, (const char *, struct stat *));
+ 
+ int lstat_rel(const char *, struct stat *);
+ 
+diff --git a/src/mknod.c b/src/mknod.c
+index 52fd33b2..27710372 100644
+--- a/src/mknod.c
+++ b/src/mknod.c
+@@ -28,6 +28,8 @@
+ 
+ wrapper(mknod, int, (const char * pathname, mode_t mode, dev_t dev))
+ {
+    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
+    char fakechroot_buf[FAKECHROOT_PATH_MAX];
+     debug("mknod(\"%s\", 0%o, %ld)", pathname, mode, dev);
+     expand_chroot_path(pathname);
+     return nextcall(mknod)(pathname, mode, dev);
+diff --git a/src/stat.c b/src/stat.c
+index 78456620..7b377933 100644
+--- a/src/stat.c
+++ b/src/stat.c
+@@ -33,6 +33,8 @@
+ 
+ wrapper(stat, int, (const char * file_name, struct stat * buf))
+ {
+    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
+    char fakechroot_buf[FAKECHROOT_PATH_MAX];
+     debug("stat(\"%s\", &buf)", file_name);
+     expand_chroot_path(file_name);
+     return nextcall(stat)(file_name, buf);
+diff --git a/src/stat64.c b/src/stat64.c
+index aac9c75f..a360f66f 100644
+--- a/src/stat64.c
+++ b/src/stat64.c
+@@ -34,6 +34,8 @@
+ 
+ wrapper(stat64, int, (const char * file_name, struct stat64 * buf))
+ {
+    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
+    char fakechroot_buf[FAKECHROOT_PATH_MAX];
+     debug("stat64(\"%s\", &buf)", file_name);
+     expand_chroot_path(file_name);
+     return nextcall(stat64)(file_name, buf);
--- a/gptfdisk/PKGBUILD
+++ b/gptfdisk/PKGBUILD
@ -1,11 +1,12 @@
 #!/usr/bin/bash
 # JOBoRun		: Jwm OpenBox Obarun RUNit
-# Maintainer		: Joe Bo Run <joborun@disroot.org>
+# Maintainer	: Joe Bo Run <joborun@disroot.org>
 # PkgSource		: url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
+# Website		: https://pozol.eu
 #-----------------------------------------| DESCRIPTION |---------------------------------------

 pkgname=gptfdisk
-pkgver=1.0.8
+pkgver=1.0.9
 pkgrel=01
 pkgdesc="A text-mode partitioning tool that works on GUID Partition Table (GPT) disks"
 arch=('x86_64')
@ -14,10 +15,12 @@ depends=('gcc-libs' 'popt' 'libuuid.so' 'libncursesw.so')
 provides=("gdisk=$pkgver")
 conflicts=('gdisk')
 replaces=('gdisk')
-source=(https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
+source=(https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
+        util-linux-2.38.patch)

 prepare() {
  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i ../util-linux-2.38.patch

  # https://sourceforge.net/p/gptfdisk/discussion/939590/thread/bc29ca06f8/
  sed -i '/^#include /s:ncursesw/::' gptcurses.cc
@ -46,5 +49,5 @@ package () {

 license=('GPL2')

-sha256sums=(95d19856f004dabc4b8c342b2612e8d0a9eebdd52004297188369f152e9dc6df) #  gptfdisk-1.0.8.tar.gz
-
+sha256sums=(dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2 # gptfdisk-1.0.9.tar.gz
+	c014a1054c597fb9afb06e7cd4c91a038d887e66dd36aba26a68494ea0f41a43) # util-linux-2.38.patch
--- a/gptfdisk/PKGBUILD-arch
+++ b/gptfdisk/PKGBUILD-arch
@ -1,23 +1,26 @@
-#!/usr/bin/bash
-# JOBoRun		: Jwm OpenBox Obarun RUNit
-# Maintainer		: Joe Bo Run <joborun@disroot.org>
-# PkgSource		: url="https://gittea.disroot.org/joborun/jobextra/$pkgname"
-#-----------------------------------------| DESCRIPTION |---------------------------------------
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Hokum <hokum_at_mail_dot_ru>

 pkgname=gptfdisk
-pkgver=1.0.8
-pkgrel=01
+pkgver=1.0.9
+pkgrel=1
 pkgdesc="A text-mode partitioning tool that works on GUID Partition Table (GPT) disks"
 arch=('x86_64')
 url="https://www.rodsbooks.com/gdisk/"
+license=('GPL2')
 depends=('gcc-libs' 'popt' 'libuuid.so' 'libncursesw.so')
 provides=("gdisk=$pkgver")
 conflicts=('gdisk')
 replaces=('gdisk')
-source=(https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
+source=(https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
+        util-linux-2.38.patch)
+sha256sums=('dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2'
+            'c014a1054c597fb9afb06e7cd4c91a038d887e66dd36aba26a68494ea0f41a43')

 prepare() {
  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i ../util-linux-2.38.patch

  # https://sourceforge.net/p/gptfdisk/discussion/939590/thread/bc29ca06f8/
  sed -i '/^#include /s:ncursesw/::' gptcurses.cc
@ -41,11 +44,3 @@ package () {
  install -m644 -t "$pkgdir/usr/share/man/man8" {{,c,s}gdisk,fixparts}.8
  install -m644 -t "$pkgdir/usr/share/doc/gdisk" README NEWS
 }
-
-#---- license gpg-key sha256sums ----
-
-license=('GPL2')
-
-sha256sums=('95d19856f004dabc4b8c342b2612e8d0a9eebdd52004297188369f152e9dc6df'
-	a)
-
--- a/gptfdisk/deps
+++ b/gptfdisk/deps
@ -1 +1,3 @@
 popt
+
+
--- a/gptfdisk/util-linux-2.38.patch
+++ b/gptfdisk/util-linux-2.38.patch
@ -0,0 +1,25 @@
+From 127e40dcc2d62ad693cb4e03e1182d0a227d85e1 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Sat, 16 Apr 2022 08:24:58 +0300
+Subject: [PATCH] Fix uuid/uuid.h detection with util-linux 2.38
+
+util-linux commit 10f5f79485964ab52272ebe79c3b0047b1f84d82 changed the
+header guard in uuid/uuid.h from _UUID_UUID_H to _UL_LIBUUID_UUID_H as
+the former was too generic; fix guid.cc to also look for the new name.
+---
+ guid.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/guid.cc b/guid.cc
+index 1e73ab7..d3e4fd5 100644
+--- a/guid.cc
+++ b/guid.cc
+@@ -141,7 +141,7 @@ void GUIDData::Zero(void) {
+ void GUIDData::Randomize(void) {
+    int i, uuidGenerated = 0;
+ 
+-#ifdef _UUID_UUID_H
+#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H)
+    uuid_generate(uuidData);
+    ReverseBytes(&uuidData[0], 4);
+    ReverseBytes(&uuidData[4], 2);
--- a/gtk2/PKGBUILD
+++ b/gtk2/PKGBUILD
@ -1,9 +1,13 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+#!/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 |---------------------------------------

 pkgname=gtk2
 pkgver=2.24.33
-pkgrel=2
+pkgrel=02
 pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
 arch=(x86_64)
 url="https://www.gtk.org/"
@ -14,17 +18,12 @@ optdepends=('gnome-themes-standard: Default widget theme'
            'adwaita-icon-theme: Default icon theme'
            'python: gtk-builder-convert')
 provides=(libgailutil.so libg{d,t}k-x11-2.0.so)
-license=(LGPL)
 install=gtk2.install
 _commit=68631945733158f164427db84f01301d7e875763  # tags/2.24.33^0
 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
        gtkrc
        gtk-query-immodules-2.0.hook
        xid-collision-debug.patch)
-sha256sums=('SKIP'
-            'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805'
-            '427e7ed2626465ea7a8986189b6c8340a0520b9f7b8e2a56cd1169d375da7425'
-            '7724a55c4916318ed81b22f21c37c0a66e78adce017563fed6d84d813a4b80bc')

 pkgver() {
  cd gtk
@ -63,4 +62,12 @@ package() {
  rm "$pkgdir/usr/bin/gtk-update-icon-cache"
 }

-# vim:set et sw=2:
+
+#---- license gpg-key sha256sums ----
+
+license=(LGPL)
+
+sha256sums=(SKIP
+	bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805 # gtkrc
+	427e7ed2626465ea7a8986189b6c8340a0520b9f7b8e2a56cd1169d375da7425 # gtk-query-immodules-2.0.hook
+	7724a55c4916318ed81b22f21c37c0a66e78adce017563fed6d84d813a4b80bc) # xid-collision-debug.patch
--- a/gtk2/PKGBUILD-arch
+++ b/gtk2/PKGBUILD-arch
@ -0,0 +1,66 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gtk2
+pkgver=2.24.33
+pkgrel=2
+pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
+arch=(x86_64)
+url="https://www.gtk.org/"
+depends=(atk pango libxcursor libxinerama libxrandr libxi libxcomposite libxdamage
+         shared-mime-info cairo libcups gtk-update-icon-cache librsvg desktop-file-utils)
+makedepends=(gobject-introspection git gtk-doc)
+optdepends=('gnome-themes-standard: Default widget theme'
+            'adwaita-icon-theme: Default icon theme'
+            'python: gtk-builder-convert')
+provides=(libgailutil.so libg{d,t}k-x11-2.0.so)
+license=(LGPL)
+install=gtk2.install
+_commit=68631945733158f164427db84f01301d7e875763  # tags/2.24.33^0
+source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
+        gtkrc
+        gtk-query-immodules-2.0.hook
+        xid-collision-debug.patch)
+sha256sums=('SKIP'
+            'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805'
+            '427e7ed2626465ea7a8986189b6c8340a0520b9f7b8e2a56cd1169d375da7425'
+            '7724a55c4916318ed81b22f21c37c0a66e78adce017563fed6d84d813a4b80bc')
+
+pkgver() {
+  cd gtk
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd gtk
+  git apply -3 ../xid-collision-debug.patch
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd gtk
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --with-xinput=yes \
+    --disable-gtk-doc
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd gtk
+  make DESTDIR="$pkgdir" install
+
+  install -Dt "$pkgdir/usr/share/gtk-2.0" -m644 ../gtkrc
+  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../gtk-query-immodules-2.0.hook
+
+  rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+}
+
+# vim:set et sw=2:
--- a/gtk2/clean
+++ b/gtk2/clean
@ -0,0 +1 @@
+rm -rf {src,pkg,gtk}
--- a/gtk2/deps
+++ b/gtk2/deps
@ -0,0 +1,20 @@
+atk
+pango
+libxcursor
+libxinerama
+libxrandr
+libxi
+libxcomposite
+libxdamage
+shared-mime-info
+cairo
+libcups
+gtk-update-icon-cache
+librsvg
+desktop-file-utils
+gobject-introspection
+git
+gtk-doc
+
+automake
+autoconf
--- a/gtk2/time
+++ b/gtk2/time
@ -0,0 +1,5 @@
+
+real	2m52.660s
+user	8m8.564s
+sys	0m36.257s
+
--- a/gyp/0001-gyp-python38.patch
+++ b/gyp/0001-gyp-python38.patch
@ -0,0 +1,71 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Fri, 23 Aug 2019 09:33:14 +0100
+Subject: [PATCH] gyp-python38
+
+Fix python 3.8 warnings
+
+(From Fedora)
+---
+ pylib/gyp/input.py  | 2 +-
+ test/lib/TestCmd.py | 6 +++---
+ test/lib/TestGyp.py | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/pylib/gyp/input.py b/pylib/gyp/input.py
+index 4c1289164045..2bea3341adc5 100644
+--- a/pylib/gyp/input.py
+++ b/pylib/gyp/input.py
+@@ -1183,7 +1183,7 @@ def LoadVariablesFromVariablesDict(variables, the_dict, the_dict_key):
+       if variable_name in variables:
+         # If the variable is already set, don't set it.
+         continue
+-      if the_dict_key is 'variables' and variable_name in the_dict:
+      if the_dict_key == 'variables' and variable_name in the_dict:
+         # If the variable is set without a % in the_dict, and the_dict is a
+         # variables dict (making |variables| a varaibles sub-dict of a
+         # variables dict), use the_dict's definition.
+diff --git a/test/lib/TestCmd.py b/test/lib/TestCmd.py
+index 1ec50933a4a8..457694c877d4 100644
+--- a/test/lib/TestCmd.py
+++ b/test/lib/TestCmd.py
+@@ -283,7 +283,7 @@ if os.name in ('posix', 'nt'):
+ else:
+     tempfile.template = 'testcmd.'
+ 
+-re_space = re.compile('\s')
+re_space = re.compile(r'\s')
+ 
+ _Cleanup = []
+ 
+@@ -882,7 +882,7 @@ class TestCmd(object):
+                 #self.diff_function = difflib.unified_diff
+         self._dirlist = []
+         self._preserve = {'pass_test': 0, 'fail_test': 0, 'no_result': 0}
+-        if 'PRESERVE' in os.environ and os.environ['PRESERVE'] is not '':
+        if 'PRESERVE' in os.environ and os.environ['PRESERVE'] != '':
+             self._preserve['pass_test'] = os.environ['PRESERVE']
+             self._preserve['fail_test'] = os.environ['PRESERVE']
+             self._preserve['no_result'] = os.environ['PRESERVE']
+@@ -1103,7 +1103,7 @@ class TestCmd(object):
+         the temporary working directories to be preserved for all
+         conditions.
+         """
+-        if conditions is ():
+        if len(conditions) == 0:
+             conditions = ('pass_test', 'fail_test', 'no_result')
+         for cond in conditions:
+             self._preserve[cond] = 1
+diff --git a/test/lib/TestGyp.py b/test/lib/TestGyp.py
+index 2aa78684f517..badfa910100f 100644
+--- a/test/lib/TestGyp.py
+++ b/test/lib/TestGyp.py
+@@ -743,7 +743,7 @@ def FindVisualStudioInstallation():
+           build_tool = None
+       if not build_tool:
+         args1 = ['reg', 'query',
+-                    'HKLM\Software\Microsoft\VisualStudio\SxS\VS7',
+                    r'HKLM\Software\Microsoft\VisualStudio\SxS\VS7',
+                     '/v', '15.0', '/reg:32']
+         build_tool = subprocess.check_output(args1).decode(
+             'utf-8', 'ignore').strip().split(b'\r\n').pop().split(b' ').pop()
--- a/gyp/0002-gyp-fix-cmake.patch
+++ b/gyp/0002-gyp-fix-cmake.patch
@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Sat, 25 Jun 2022 20:41:40 +0000
+Subject: [PATCH] gyp-fix-cmake
+
+(From Fedora, with fixed exception type)
+---
+ pylib/gyp/generator/cmake.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pylib/gyp/generator/cmake.py b/pylib/gyp/generator/cmake.py
+index 4a2041cf2687..12461dc1d48b 100644
+--- a/pylib/gyp/generator/cmake.py
+++ b/pylib/gyp/generator/cmake.py
+@@ -40,9 +40,9 @@ import gyp.xcode_emulation
+ 
+ try:
+   # maketrans moved to str in python3.
+-  _maketrans = string.maketrans
+-except NameError:
+   _maketrans = str.maketrans
+except AttributeError:
+  _maketrans = string.maketrans
+ 
+ generator_default_variables = {
+   'EXECUTABLE_PREFIX': '',
+@@ -281,7 +281,7 @@ def WriteActions(target_name, actions, extra_sources, extra_deps,
+     dirs = set(dir for dir in (os.path.dirname(o) for o in outputs) if dir)
+ 
+     if int(action.get('process_outputs_as_sources', False)):
+-      extra_sources.extend(zip(cmake_outputs, outputs))
+      extra_sources.extend(list(zip(cmake_outputs, outputs)))
+ 
+     # add_custom_command
+     output.write('add_custom_command(OUTPUT ')
+@@ -987,7 +987,7 @@ def WriteTarget(namer, qualified_target, target_dicts, build_dir, config_to_use,
+ 
+     # XCode settings
+     xcode_settings = config.get('xcode_settings', {})
+-    for xcode_setting, xcode_value in xcode_settings.viewitems():
+    for xcode_setting, xcode_value in xcode_settings.items():
+       SetTargetProperty(output, cmake_target_name,
+                         "XCODE_ATTRIBUTE_%s" % xcode_setting, xcode_value,
+                         '' if isinstance(xcode_value, str) else ' ')
--- a/gyp/0003-gyp-fips.patch
+++ b/gyp/0003-gyp-fips.patch
@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Sat, 25 Jun 2022 20:45:54 +0000
+Subject: [PATCH] gyp-fips
+
+(From Fedora, ported to gyp master)
+---
+ pylib/gyp/generator/make.py  | 2 +-
+ pylib/gyp/generator/ninja.py | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pylib/gyp/generator/make.py b/pylib/gyp/generator/make.py
+index 997eec08666e..06c763db609a 100644
+--- a/pylib/gyp/generator/make.py
+++ b/pylib/gyp/generator/make.py
+@@ -1774,7 +1774,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
+ 
+       # Hash the target name to avoid generating overlong filenames.
+       cmdstring = (command if command else self.target).encode('utf-8')
+-      cmddigest = hashlib.sha1(cmdstring).hexdigest()
+      cmddigest = hashlib.sha1(cmdstring, usedforsecurity=False).hexdigest()
+       intermediate = "%s.intermediate" % (cmddigest)
+       self.WriteLn('%s: %s' % (' '.join(outputs), intermediate))
+       self.WriteLn('\t%s' % '@:');
+diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py
+index 3bcfe352925b..c439c8b728ad 100644
+--- a/pylib/gyp/generator/ninja.py
+++ b/pylib/gyp/generator/ninja.py
+@@ -752,7 +752,7 @@ class NinjaWriter(object):
+         if self.flavor == 'win':
+           # WriteNewNinjaRule uses unique_name for creating an rsp file on win.
+           extra_bindings.append(('unique_name',
+-              hashlib.md5(six.ensure_binary(outputs[0])).hexdigest()))
+              hashlib.md5(six.ensure_binary(outputs[0]), usedforsecurity=False).hexdigest()))
+ 
+         self.ninja.build(outputs, rule_name, self.GypPathToNinja(source),
+                          implicit=inputs,
+@@ -2389,7 +2389,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
+     qualified_target_for_hash = gyp.common.QualifiedTarget(build_file, name,
+                                                            toolset)
+     qualified_target_for_hash = qualified_target_for_hash.encode('utf-8')
+-    hash_for_rules = hashlib.md5(qualified_target_for_hash).hexdigest()
+    hash_for_rules = hashlib.md5(qualified_target_for_hash, usedforsecurity=False).hexdigest()
+ 
+     base_path = os.path.dirname(build_file)
+     obj = 'obj'
--- a/gyp/PKGBUILD
+++ b/gyp/PKGBUILD
@ -6,16 +6,18 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------

 pkgname=gyp
-pkgver=20190716.fcd686f1
-pkgrel=07
+pkgver=20220404.9ecf45e3
+pkgrel=01
 pkgdesc='"Generate Your Projects" Meta-Build system'
 arch=(any)
 url="https://gyp.gsrc.io/"
-depends=(python ninja)
+depends=(python-six ninja)
 makedepends=(git python-setuptools)
-_commit=fcd686f1880fa52a1ee78d3e98af1b88cb334528  # changes/82/1701782/5
+_commit=9ecf45e37677743503342ee4c6a76eaee80e4a7f  # changes/24/3562924/3
 source=("git+https://chromium.googlesource.com/external/gyp#commit=$_commit"
-        gyp-fips.patch gyp-fix-cmake.patch gyp-python38.patch gyp-python39.patch)
+        0001-gyp-python38.patch
+        0002-gyp-fix-cmake.patch
+        0003-gyp-fips.patch)

 pkgver() {
  cd $pkgname
@ -47,7 +49,6 @@ package() {
 license=(custom:BSD)

 sha256sums=(SKIP
-	43022909aa2f320bdc0cc5813734f42bd6ef2ac4372821bf5757f753c7a3c277 # gyp-fips.patch
-	8610250f946ee070c5182cc87cd23cdd9f66a47ec57a98049bb2aaae4a1e09e6 # gyp-fix-cmake.patch
-	6580f0f02f430f1ba4aa7e8e2d32203dcb3d6f07f1de5287d0fb33ab2ed1cc30 # gyp-python38.patch
-	06b9092eea1513a70f8c5213ba2dc7f550cf5ddf6ee0bb801ea0cda290e3a6f9) # gyp-python39.patch
+	7fb04acbac92a1d173c2bc3022b7814a711427225a7fd32912dc60f1e1a6746e # 0001-gyp-python38.patch
+	8a9f1a413b943dd469f981ee5fa7b7cc372e3cd9e9f0ecf9640d4f0f6bb29647 # 0002-gyp-fix-cmake.patch
+	dda2c6717d52a9dd53ce5b4985115f947dcca2bce3a207bd9c543976c41decf5) # 0003-gyp-fips.patch
--- a/gyp/PKGBUILD-arch
+++ b/gyp/PKGBUILD-arch
@ -1,44 +1,45 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>

 pkgname=gyp
-pkgver=20190716.fcd686f1
-pkgrel=7
+pkgver=20220404.9ecf45e3
+pkgrel=1
 pkgdesc='"Generate Your Projects" Meta-Build system'
-arch=(any)
 url="https://gyp.gsrc.io/"
+arch=(any)
 license=(custom:BSD)
-depends=(python ninja)
+depends=(python-six ninja)
 makedepends=(git python-setuptools)
-_commit=fcd686f1880fa52a1ee78d3e98af1b88cb334528  # changes/82/1701782/5
+_commit=9ecf45e37677743503342ee4c6a76eaee80e4a7f  # changes/24/3562924/3
 source=("git+https://chromium.googlesource.com/external/gyp#commit=$_commit"
-        gyp-fips.patch gyp-fix-cmake.patch gyp-python38.patch gyp-python39.patch)
+        0001-gyp-python38.patch
+        0002-gyp-fix-cmake.patch
+        0003-gyp-fips.patch)
 sha256sums=('SKIP'
-            '43022909aa2f320bdc0cc5813734f42bd6ef2ac4372821bf5757f753c7a3c277'
-            '8610250f946ee070c5182cc87cd23cdd9f66a47ec57a98049bb2aaae4a1e09e6'
-            '6580f0f02f430f1ba4aa7e8e2d32203dcb3d6f07f1de5287d0fb33ab2ed1cc30'
-            '06b9092eea1513a70f8c5213ba2dc7f550cf5ddf6ee0bb801ea0cda290e3a6f9')
+            '7fb04acbac92a1d173c2bc3022b7814a711427225a7fd32912dc60f1e1a6746e'
+            '8a9f1a413b943dd469f981ee5fa7b7cc372e3cd9e9f0ecf9640d4f0f6bb29647'
+            'dda2c6717d52a9dd53ce5b4985115f947dcca2bce3a207bd9c543976c41decf5')

 pkgver() {
-  cd $pkgname
+  cd gyp

  # Commit date + short rev
  echo $(TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD).$(git rev-parse --short HEAD)
 }

 prepare() {
-  cd $pkgname
+  cd gyp

  # Python 3 fixes from Fedora
  git apply -3 ../*.patch
 }

 build() {
-  cd $pkgname
+  cd gyp
  python setup.py build
 }

 package() {
-  cd $pkgname
+  cd gyp
  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE
 }
--- a/gyp/deps
+++ b/gyp/deps
@ -1,4 +1,6 @@
-python
+python-six
 ninja
 git
 python-setuptools
+
+
--- a/libbpf/PKGBUILD
+++ b/libbpf/PKGBUILD
@ -6,7 +6,7 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------

 pkgname=libbpf
-pkgver=0.8.0
+pkgver=0.8.1
 pkgrel=01
 pkgdesc='Library for loading eBPF programs and reading and manipulating eBPF objects from user-space'
 url='https://github.com/libbpf/libbpf'
@ -32,7 +32,5 @@ package() {

 license=('LGPL2.1')

-sha256sums=(f4480242651a93c101ece320030f6b2b9b437f622f807719c13cb32569a6d65a) # libbpf-0.8.0.tar.gz
+sha256sums=(7bda8187efc619d1eb20a1ba5ab949dd68d40dd44945310c91ac0f915fa4a42b) # libbpf-0.8.1.tar.gz

-sha512sums=('8b034a9c8f23207638630b95ff95a651148a800589eb52f2fe09698bf3c4147f2e2008b24de45a70832cc7669cdfebd78bc491e575ca0b27de5c2de3b1fb5637')
-b2sums=('c8e380d80f69f10da9d8a6ea4d19a53e8b34ed5a6072e1b57c61273f0714d13135c917224086de37246d9e47e9b848cbe75aced79278711a3007aa9e564db4b5')
--- a/libbpf/PKGBUILD-arch
+++ b/libbpf/PKGBUILD-arch
@ -2,7 +2,7 @@
 # Contributor:  Adrian Bacircea <adrian.bacircea@gmail.com>

 pkgname=libbpf
-pkgver=0.8.0
+pkgver=0.8.1
 pkgrel=1
 pkgdesc='Library for loading eBPF programs and reading and manipulating eBPF objects from user-space'
 url='https://github.com/libbpf/libbpf'
@ -12,8 +12,8 @@ depends=('glibc' 'libelf' 'linux-api-headers')
 makedepends=('rsync')
 provides=('libbpf.so')
 source=(https://github.com/libbpf/libbpf/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz)
-sha512sums=('8b034a9c8f23207638630b95ff95a651148a800589eb52f2fe09698bf3c4147f2e2008b24de45a70832cc7669cdfebd78bc491e575ca0b27de5c2de3b1fb5637')
-b2sums=('c8e380d80f69f10da9d8a6ea4d19a53e8b34ed5a6072e1b57c61273f0714d13135c917224086de37246d9e47e9b848cbe75aced79278711a3007aa9e564db4b5')
+sha512sums=('e3bb602f55215a4f030e564af7321ba6338937c426fcaee478b607f88b0c773c40a0c3f59a2b345bda951a19e79061733f8a3fdc10a6292e92782e65754b584a')
+b2sums=('084be7d4258500fa894560ed2e52821addcc5d150dcd77fd646271b614d788b7931271be9c3e46fdbc4ed93d053ea3e09023158a8e4a31f9452d10dcb0677b58')

 build() {
  cd ${pkgname}-${pkgver}
--- a/libbpf/deps
+++ b/libbpf/deps
@ -1,3 +1,4 @@
 rsync


+
--- a/libudev-zero/PKGBUILD
+++ b/libudev-zero/PKGBUILD
@ -5,28 +5,32 @@
 # Website		: https://pozol.eu
 #-----------------------------------------| DESCRIPTION |---------------------------------------

-pkgbase=libudev-zero
 pkgname=libudev-zero
-
-pkgdesc="Daemonless replacement for libudev"
-_pkgver=1.0.0
-pkgver=215
-pkgrel=03
+pkgver=222
+pkgrel=01
+libudev_ver=1-64
 so_ver=1.6.3
+pkgdesc="Daemonless replacement for libudev "
+arch=('x86_64' 'aarch64')
 url="https://github.com/illiliti/libudev-zero"
-source=("${url}/archive/refs/tags/${_pkgver}.tar.gz"
-        arch-nosystemd-install.patch)
-arch=('x86_64')
-makedepends=('glibc' 'make')
+makedepends=('glibc' 'make' 'git')
 provides=('libudev-zero' 'libeudev' 'libudev' "libudev.so=$libudev_ver")
+conflicts=('libudev')
+source=("git+https://github.com/illiliti/$pkgname"
+        arch-nosystemd-install.patch)
+
+pkgver() {
+  cd $srcdir/$pkgname
+  git rev-list --count HEAD
+}

 prepare() {
-	cd ${pkgname}-${_pkgver}
+	cd $pkgname
 	patch -p0 -i ../arch-nosystemd-install.patch
 }

 build() {
-	cd ${pkgname}-${_pkgver}
+	cd $pkgname

 	LIBUDEV_VER="${so_ver}" make

@ -36,24 +40,16 @@ build() {
 }

 package() {
-	cd ${pkgname}-${_pkgver}
+	cd $pkgname

-	LIBUDEV_VER="${so_ver}" make DESTDIR="${pkgdir}" PREFIX="/usr" install
+	LIBUDEV_VER="$so_ver" make DESTDIR="$pkgdir" PREFIX="/usr" install

-	install -Dm755 contrib/libudev-helper "${pkgdir}"/usr/bin/libudev-helper
+	install -Dm755 contrib/libudev-helper "$pkgdir"/usr/bin/libudev-helper
 }

-depends=()
-
-groups=(no-udev)
-
-provides=('libudev-zero' 'libeudev' 'libudev' 'libudev.so=1-64')
-
-conflicts=('libudev' 'libeudev' 'libudev-zero-git')
-
 #---- license gpg-key sha256sums ----

 license=('GPL')

-sha256sums=(68c20aefd7aa89abe446cf5ec76f5846315ded719f0665eabed9261cc3c7f47a # 1.0.0.tar.gz
-	1f8a6dc821c616b4c57c3e58b9cf6e5b5e6bd319872e20eea11e9f48b696a700) # arch-nosystemd-install.patch
+sha256sums=(SKIP
+	755787ff9111c81fa2978232e512e1fc5f1706786abd7ac6f203c8ef18660b2b) #  arch-nosystemd-install.patch
--- a/libudev-zero/PKGBUILD-aur
+++ b/libudev-zero/PKGBUILD-aur
@ -0,0 +1,49 @@
+# Maintainer: Platon Ryzhikov <ihummer63@yandex.ru>
+
+pkgname=libudev-zero-git
+_pkgname=libudev-zero
+pkgver=219
+pkgrel=1
+libudev_ver=1-64
+so_ver=1.6.3
+pkgdesc="Daemonless replacement for libudev "
+arch=('x86_64' 'aarch64')
+url="https://github.com/illiliti/libudev-zero"
+license=('GPL')
+makedepends=('glibc' 'make' 'git')
+provides=('libudev-zero' 'libeudev' 'libudev' "libudev.so=$libudev_ver")
+conflicts=('libudev')
+source=("git+https://github.com/illiliti/libudev-zero"
+        artix-install.patch)
+md5sums=('SKIP'
+         'b951df22b38f2c30383334a462a1ec2a')
+
+pkgver() {
+  cd ${srcdir}/${_pkgname}
+  git rev-list --count HEAD
+}
+
+prepare() {
+	cd ${_pkgname}
+
+	patch -p0 -i ../artix-install.patch
+}
+
+build() {
+	cd ${_pkgname}
+
+	LIBUDEV_VER="${so_ver}" make
+
+	msg "Compiling helper"
+	cd contrib
+	gcc $CFLAGS -o libudev-helper helper.c
+}
+
+package() {
+	cd ${_pkgname}
+
+	LIBUDEV_VER="${so_ver}" make DESTDIR="${pkgdir}" PREFIX="/usr" install
+
+	install -Dm755 contrib/libudev-helper "${pkgdir}"/usr/bin/libudev-helper
+}
+
--- a/libudev-zero/PKGBUILD.old
+++ b/libudev-zero/PKGBUILD.old
@ -0,0 +1,59 @@
+#!/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=libudev-zero
+pkgname=libudev-zero
+
+pkgdesc="Daemonless replacement for libudev"
+_pkgver=1.0.0
+pkgver=215
+pkgrel=03
+so_ver=1.6.3
+url="https://github.com/illiliti/libudev-zero"
+source=("${url}/archive/refs/tags/${_pkgver}.tar.gz"
+        arch-nosystemd-install.patch)
+arch=('x86_64')
+makedepends=('glibc' 'make')
+provides=('libudev-zero' 'libeudev' 'libudev' "libudev.so=$libudev_ver")
+
+prepare() {
+	cd ${pkgname}-${_pkgver}
+	patch -p0 -i ../arch-nosystemd-install.patch
+}
+
+build() {
+	cd ${pkgname}-${_pkgver}
+
+	LIBUDEV_VER="${so_ver}" make
+
+	msg "Compiling helper"
+	cd contrib
+	gcc $CFLAGS -o libudev-helper helper.c
+}
+
+package() {
+	cd ${pkgname}-${_pkgver}
+
+	LIBUDEV_VER="${so_ver}" make DESTDIR="${pkgdir}" PREFIX="/usr" install
+
+	install -Dm755 contrib/libudev-helper "${pkgdir}"/usr/bin/libudev-helper
+}
+
+depends=()
+
+groups=(no-udev)
+
+provides=('libudev-zero' 'libeudev' 'libudev' 'libudev.so=1-64')
+
+conflicts=('libudev' 'libeudev' 'libudev-zero-git')
+
+#---- license gpg-key sha256sums ----
+
+license=('GPL')
+
+sha256sums=(68c20aefd7aa89abe446cf5ec76f5846315ded719f0665eabed9261cc3c7f47a # 1.0.0.tar.gz
+	1f8a6dc821c616b4c57c3e58b9cf6e5b5e6bd319872e20eea11e9f48b696a700) # arch-nosystemd-install.patch
--- a/libudev-zero/arch-nosystemd-install.patch
+++ b/libudev-zero/arch-nosystemd-install.patch
@ -1,10 +1,18 @@
--- Makefile.orig	2021-06-05 14:12:08.523206518 +0300
-+++ Makefile	2021-06-05 14:15:00.663156464 +0300
-@@ -51,6 +51,7 @@ install: libudev.so libudev.a libudev.pc
- 	cp -f libudev.a  ${DESTDIR}${LIBDIR}/libudev.a
+--- Makefile.orig	2022-01-12 18:48:51.787247423 +0300
+++ Makefile	2022-01-12 18:50:32.105253773 +0300
+@@ -57,6 +57,7 @@ install-shared: libudev.so.1 install-hea
+ 	mkdir -p ${DESTDIR}${LIBDIR}
 	cp -f libudev.so.1 ${DESTDIR}${LIBDIR}/libudev.so.1
 	ln -fs libudev.so.1 ${DESTDIR}${LIBDIR}/libudev.so
 +	ln -fs libudev.so.1 ${DESTDIR}${LIBDIR}/libudev.so.${LIBUDEV_VER}
- 	cp -f libudev.pc ${DESTDIR}${PKGCONFIGDIR}/libudev.pc
 
- uninstall:
+ install-static: libudev.a install-headers install-pkgconfig
+ 	mkdir -p ${DESTDIR}${LIBDIR}
+@@ -68,6 +69,7 @@ uninstall:
+ 	rm -f ${DESTDIR}${LIBDIR}/libudev.a \
+           ${DESTDIR}${LIBDIR}/libudev.so \
+           ${DESTDIR}${LIBDIR}/libudev.so.1 \
+          ${DESTDIR}${LIBDIR}/libudev.so.${LIBUDEV_VER} \
+           ${DESTDIR}${PKGCONFIGDIR}/libudev.pc \
+           ${DESTDIR}${INCLUDEDIR}/libudev.h
+ 
--- a/libudev-zero/clean
+++ b/libudev-zero/clean
@ -1 +1 @@
-rm -rf {src,pkg,1*.gz}
+rm -rf {src,pkg,libudev-zero}
--- a/libudev-zero/deps
+++ b/libudev-zero/deps
@ -0,0 +1,2 @@
+git
+
--- a/meson/0001-Skip-broken-tests.patch
+++ b/meson/0001-Skip-broken-tests.patch
@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Thu, 14 Apr 2022 14:08:15 +0000
+Subject: [PATCH] Skip broken tests
+
+---
+ test cases/linuxlike/13 cmake dependency/meson.build | 2 ++
+ unittests/linuxliketests.py                          | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/test cases/linuxlike/13 cmake dependency/meson.build b/test cases/linuxlike/13 cmake dependency/meson.build
+index 193ad184b637..e94ba68ac30f 100644
+--- a/test cases/linuxlike/13 cmake dependency/meson.build	
+++ b/test cases/linuxlike/13 cmake dependency/meson.build	
+@@ -6,6 +6,8 @@ if not find_program('cmake', required: false).found()
+   error('MESON_SKIP_TEST cmake binary not available.')
+ endif
+ 
+error('MESON_SKIP_TEST flaky, see https://github.com/mesonbuild/meson/issues/10104')
+
+ # Zlib is probably on all dev machines.
+ 
+ dep = dependency('ZLIB', version : '>=1.2', method : 'cmake')
+diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py
+index 9b84740bbada..a8265acdde98 100644
+--- a/unittests/linuxliketests.py
+++ b/unittests/linuxliketests.py
+@@ -343,6 +343,7 @@ class LinuxlikeTests(BasePlatformTests):
+             raise SkipTest('asan not available on Cygwin')
+         if is_openbsd():
+             raise SkipTest('-fsanitize=address is not supported on OpenBSD')
+        raise SkipTest('cannot run sanitizers in containers without ptrace')
+ 
+         testdir = os.path.join(self.framework_test_dir, '7 gnome')
+         self.init(testdir, extra_args=['-Db_sanitize=address', '-Db_lundef=false'])
+@@ -998,6 +999,7 @@ class LinuxlikeTests(BasePlatformTests):
+             raise SkipTest('asan not available on Cygwin')
+         if is_openbsd():
+             raise SkipTest('-fsanitize=address is not supported on OpenBSD')
+        raise SkipTest('cannot run sanitizers in containers without ptrace')
+ 
+         testdir = os.path.join(self.common_test_dir, '13 pch')
+         self.init(testdir, extra_args=['-Db_sanitize=address', '-Db_lundef=false'])
--- a/tbb/PKGBUILD
+++ b/tbb/PKGBUILD
@ -1,12 +1,13 @@
 #!/usr/bin/bash
 # JOBoRun		: Jwm OpenBox Obarun RUNit
-# Maintainer		: Joe Bo Run <joborun@disroot.org>
+# Maintainer	: Joe Bo Run <joborun@disroot.org>
 # PkgSource		: url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
+# Website		: https://pozol.eu
 #-----------------------------------------| DESCRIPTION |---------------------------------------

 pkgname=tbb
 pkgver=2021.5.0
-pkgrel=01
+pkgrel=02
 pkgdesc='High level abstract threading library'
 arch=('x86_64')
 url='https://www.threadingbuildingblocks.org/'
@ -15,18 +16,31 @@ 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)
+
+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
 }
-#
-#check() {
-#  cd oneTBB-$pkgver
-#  ninja test
-#}
+
+
+check() {
+  cd oneTBB-$pkgver
+  ninja test
+}
 # 
 ## 2 out 134 tests failed see check.log

@ -39,6 +53,6 @@ package() {

 license=('Apache')

-sha512sums=('0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46')
+sha256sums=(e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a # tbb-2021.5.0.tar.gz
+	70b077d1cac26e35336a8217f9c56c1ce2c8885c6df6dfb9805aa8374dad9617) # retry-pthread_create.patch

-sha256sums=(e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a) #  tbb-2021.5.0.tar.gz
--- a/tbb/deps
+++ b/tbb/deps
@ -4,3 +4,5 @@ inetutils
 ninja
 python
 swig
+
+
--- a/tbb/note
+++ b/tbb/note
@ -0,0 +1 @@
+can't be build with this patch or at this time
--- a/tbb/retry-pthread_create.patch
+++ b/tbb/retry-pthread_create.patch
@ -0,0 +1,63 @@
+From f12c93efd04991bc982a27e2fa6142538c33ca82 Mon Sep 17 00:00:00 2001
+From: Rui Ueyama <ruiu@cs.stanford.edu>
+Date: Sat, 7 May 2022 19:55:24 +0800
+Subject: [PATCH] Retry if pthread_create fails with EAGAIN
+
+On many Unix-like systems, pthread_create can fail spuriously even if
+the running machine has enough resources to spawn a new thread.
+Therefore, if EAGAIN is returned from pthread_create, we actually have
+to try again.
+
+I observed this issue when running the mold linker
+(https://github.com/rui314/mold) under a heavy load. mold uses OneTBB
+for parallelization.
+
+As another data point, Go has the same logic to retry on EAGAIN:
+https://go-review.googlesource.com/c/go/+/33894/
+
+nanosleep is defined in POSIX 2001, so I believe that all Unix-like
+systems support it.
+
+Signed-off-by: Rui Ueyama <ruiu@cs.stanford.edu>
+---
+ src/tbb/rml_thread_monitor.h | 19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/src/tbb/rml_thread_monitor.h b/src/tbb/rml_thread_monitor.h
+index 13b556380..5b844b232 100644
+--- a/src/tbb/rml_thread_monitor.h
+++ b/src/tbb/rml_thread_monitor.h
+@@ -31,6 +31,7 @@
+ #include <pthread.h>
+ #include <cstring>
+ #include <cstdlib>
+#include <time.h>
+ #else
+ #error Unsupported platform
+ #endif
+@@ -191,8 +192,24 @@ inline thread_monitor::handle_type thread_monitor::launch( void* (*thread_routin
+     check(pthread_attr_init( &s ), "pthread_attr_init has failed");
+     if( stack_size>0 )
+         check(pthread_attr_setstacksize( &s, stack_size ), "pthread_attr_setstack_size has failed" );
+
+     pthread_t handle;
+-    check( pthread_create( &handle, &s, thread_routine, arg ), "pthread_create has failed" );
+    int tries = 0;
+    for (;;) {
+      int error_code = pthread_create(&handle, &s, thread_routine, arg);
+      if (!error_code)
+        break;
+      if (error_code != EAGAIN || tries++ > 20) {
+        handle_perror(error_code, "pthread_create has failed");
+        break;
+      }
+
+      // pthreaed_create can spuriously fail on many Unix-like systems.
+      // Retry after tries * 1 millisecond.
+      struct timespec ts = {0, tries * 1000 * 1000};
+      nanosleep(&ts, NULL);
+    }
+
+     check( pthread_attr_destroy( &s ), "pthread_attr_destroy has failed" );
+     return handle;
+ }
--- a/vala/PKGBUILD
+++ b/vala/PKGBUILD
@ -6,7 +6,7 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------

 pkgname=vala
-pkgver=0.56.1
+pkgver=0.56.2
 pkgrel=01
 pkgdesc='Compiler for the GObject type system'
 url='https://wiki.gnome.org/Projects/Vala'
@ -18,8 +18,7 @@ provides=(valadoc libvala-${pkgver%.*}.so libvaladoc-${pkgver%.*}.so)
 conflicts=(valadoc)
 replaces=(valadoc)
 #options=(debug)  ## uncomment this to have the debug package produced
-_commit=ef23c1bd93e5c4f3e52f87ef98e3cf7a833a18d9  # tags/0.56.1^0
-
+_commit=f65cb3451a3d3a7a679e0774cba1f537a7c791de  # tags/0.56.2^0
 source=("git+https://gitlab.gnome.org/GNOME/vala.git#commit=$_commit")

 pkgver() {
@ -54,3 +53,5 @@ package() {
 license=(LGPL)

 sha256sums=('SKIP')
+ 
+ 
--- a/vala/PKGBUILD-arch
+++ b/vala/PKGBUILD-arch
@ -4,7 +4,7 @@
 # Contributor: Timm Preetz <timm@preetz.us>

 pkgname=vala
-pkgver=0.56.1
+pkgver=0.56.2
 pkgrel=1
 pkgdesc='Compiler for the GObject type system'
 url='https://wiki.gnome.org/Projects/Vala'
@ -17,7 +17,7 @@ provides=(valadoc libvala-${pkgver%.*}.so libvaladoc-${pkgver%.*}.so)
 conflicts=(valadoc)
 replaces=(valadoc)
 options=(debug)
-_commit=ef23c1bd93e5c4f3e52f87ef98e3cf7a833a18d9  # tags/0.56.1^0
+_commit=f65cb3451a3d3a7a679e0774cba1f537a7c791de  # tags/0.56.2^0
 source=("git+https://gitlab.gnome.org/GNOME/vala.git#commit=$_commit")
 sha256sums=('SKIP')

--- a/vala/deps
+++ b/vala/deps
@ -12,3 +12,4 @@ automake
 bison 
 byacc

+
--- a/vulkan-headers/PKGBUILD
+++ b/vulkan-headers/PKGBUILD
@ -7,7 +7,7 @@

 pkgname=vulkan-headers
 _pkgname=Vulkan-Headers
-pkgver=1.3.217
+pkgver=1.3.221
 pkgrel=01
 epoch=1
 pkgdesc="Vulkan header files"
@ -38,4 +38,7 @@ package() {

 license=('APACHE')

-sha256sums=(004b4f7841bd912d1cc3f5ac5694d5dea2f944f10053451233b533874368df87) # vulkan-headers-1.3.217.tar.gz
+sha256sums=(75057d8231bb7a3f6ac091f1b08f50604f07a7e9b4424fd12c035f01787ebf0c) # vulkan-headers-1.3.221.tar.gz
+ 
+ 
+
--- a/vulkan-headers/PKGBUILD-arch
+++ b/vulkan-headers/PKGBUILD-arch
@ -2,7 +2,7 @@

 pkgname=vulkan-headers
 _pkgname=Vulkan-Headers
-pkgver=1.3.217
+pkgver=1.3.221
 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=('004b4f7841bd912d1cc3f5ac5694d5dea2f944f10053451233b533874368df87')
+sha256sums=('75057d8231bb7a3f6ac091f1b08f50604f07a7e9b4424fd12c035f01787ebf0c')

 build() {
  cd Vulkan-Headers*
--- a/vulkan-headers/deps
+++ b/vulkan-headers/deps
@ -2,4 +2,3 @@ cmake
 git


-
--- a/xf86-input-wacom/PKGBUILD
+++ b/xf86-input-wacom/PKGBUILD
@ -6,14 +6,17 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------

 pkgname=xf86-input-wacom
-pkgver=1.0.0
+pkgver=1.1.0
 pkgrel=01
 pkgdesc="X.Org Wacom tablet driver w/o systemd"
 arch=(x86_64)
 url="https://github.com/linuxwacom/xf86-input-wacom"
 depends=(libxi libxinerama libxrandr)
 makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=24.4' 'meson'
- 	'gobject-introspection' )
+ 	'gobject-introspection')
+	# for tests
+checkdepends=('python-libevdev' 'python-pytest' 'python-yaml' 'python-gobject' 'attr')
+
 conflicts=('xorg-server<21.1.1' 'X-ABI-XINPUT_VERSION<24' 'X-ABI-XINPUT_VERSION>=25')
 source=(https://github.com/linuxwacom/xf86-input-wacom/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2{,.sig})
 # check at https://github.com/linuxwacom/xf86-input-wacom/releases
@ -47,5 +50,5 @@ validpgpkeys+=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') #  "Peter Hutterer (W
 #validpgpkeys+=('5222AA87620F928D2C16F62BDB4ABF7C3424190B') # "Aaron Armstrong Skomra <skomra@gmail.com>"
 #validpgpkeys+=('FBE078781106933D3DDCF93E5B4EA609784983CA') # "Jason Gerecke <jason.gerecke@wacom.com>"

-sha256sums=(14c9262bb090ee92ff73d3447b4ae85a06564a15f44e01962473708636def252 # xf86-input-wacom-1.0.0.tar.bz2
-	32747870a2087dee663dbbe6754d698f950238e369b3825d4ac9b5d4f30996db) #  xf86-input-wacom-1.0.0.tar.bz2.sig
+sha256sums=(23b674067f344de22bcbb4bac885c43df54c5e841f6dade7c9d18ba7ce297a12 # xf86-input-wacom-1.1.0.tar.bz2
+	d11758b2279799fe912aa0165166eed988163b42a6e5c129052c3dec039c6043) # xf86-input-wacom-1.1.0.tar.bz2.sig
--- a/xf86-input-wacom/PKGBUILD-arch
+++ b/xf86-input-wacom/PKGBUILD-arch
@ -4,7 +4,7 @@
 # Contributor: M Rawash <mrawash@gmail.com>

 pkgname=xf86-input-wacom
-pkgver=1.0.0
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="X.Org Wacom tablet driver"
 arch=(x86_64)
@ -12,11 +12,13 @@ url="https://github.com/linuxwacom/xf86-input-wacom"
 license=(GPL)
 depends=(libxi libxinerama libxrandr systemd-libs)
 makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=24.4' 'meson'
- 	'gobject-introspection' )
+ 	'gobject-introspection'
+	# for tests
+        'python-libevdev' 'python-pytest' 'python-yaml' 'python-gobject' 'attr')
 conflicts=('xorg-server<21.1.1' 'X-ABI-XINPUT_VERSION<24' 'X-ABI-XINPUT_VERSION>=25')
 source=(https://github.com/linuxwacom/xf86-input-wacom/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2{,.sig})
 # check at https://github.com/linuxwacom/xf86-input-wacom/releases
-sha256sums=('14c9262bb090ee92ff73d3447b4ae85a06564a15f44e01962473708636def252'
+sha256sums=('23b674067f344de22bcbb4bac885c43df54c5e841f6dade7c9d18ba7ce297a12'
            'SKIP')
 #validpgpkeys=('9A12ECCC5383CA2AF5B42CDCA6DC66911B2127D5') # Jason Gerecke <killertofu@gmail.com>
 validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') #  "Peter Hutterer (Who-T) <office@who-t.net>"
--- a/xf86-input-wacom/deps
+++ b/xf86-input-wacom/deps
@ -5,3 +5,10 @@ libxinerama
 libxrandr
 meson
 gobject-introspection
+
+python-libevdev 
+python-pytest 
+python-yaml 
+python-gobject 
+attr
+
--- a/xf86-input-wacom/time
+++ b/xf86-input-wacom/time
@ -1,4 +1,5 @@

-real	0m8.697s
-user	0m18.322s
-sys	0m1.516s
+real	0m12.339s
+user	0m24.977s
+sys	0m1.762s
+
--- a/xorg-xwayland/PKGBUILD
+++ b/xorg-xwayland/PKGBUILD
@ -6,7 +6,7 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------

 pkgname=xorg-xwayland
-pkgver=22.1.2
+pkgver=22.1.3
 pkgrel=01
 arch=('x86_64')
 groups=('xorg')
@ -60,7 +60,7 @@ license=('custom')
 #validpgpkeys=('B09FAF35BE914521980951145A81AF8E6ADBB200') # "Michel Daenzer <michel@daenzer.net>"
 validpgpkeys=('67DC86F2623FC5FD4BB5225D14706DBE1E4B4540') # "Olivier Fourdan <fourdan@xfce.org>"

-sha256sums=(743c4d56cfc0818755e2281d625d51860b41a473c641e179649a4f41776d1fca #  xwayland-22.1.2.tar.xz
-	f2b290ce6598d11f922d7a12fd593c35f3f128627a36f23124986165632efe01) # xwayland-22.1.2.tar.xz.sig
+sha256sums=(a712eb7bce32cd934df36814b5dd046aa670899c16fe98f2afb003578f86a1c5 # xwayland-22.1.3.tar.xz
+	d8187daa8507274c799a262be8523bb5e93e6725e61abfe9bc32b0b949ecad64) # xwayland-22.1.3.tar.xz.sig


--- a/xorg-xwayland/PKGBUILD-arch
+++ b/xorg-xwayland/PKGBUILD-arch
@ -1,7 +1,7 @@
 # Maintainer: AndyRTR <andyrtr@archlinux.org>

 pkgname=xorg-xwayland
-pkgver=22.1.2
+pkgver=22.1.3
 pkgrel=1
 arch=('x86_64')
 license=('custom')
@ -18,7 +18,7 @@ makedepends=('meson' 'xorgproto' 'xtrans' 'libxkbfile' 'dbus'
             'egl-wayland'
 )
 source=(https://xorg.freedesktop.org/archive/individual/xserver/xwayland-$pkgver.tar.xz{,.sig})
-sha512sums=('c8620169f16c2bbd592dbe77bc1f7a2c27a78f49a89bf966d8a449b7faacd69f5ea4aac7adb5b75e06dcc5efca26a2141c9b5d4cf6a592ec7882bad5e235bce4'
+sha512sums=('be15cb398f9a8aad70352d09b0745c827d4766d5996e817b92c828b5ede27b10186c7ee319901abdc5e141da97170a3ace039269146461d4e2ceb5002a7c35b4'
            'SKIP')
 provides=('xorg-server-xwayland')
 conflicts=('xorg-server-xwayland')
				`@ -0,0 +1 @@`
				`can't be build with this patch or at this time`