From b3af50109d2c56e8e0a740727c5a1fb6c4a7fa05 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 20 Dec 2022 18:09:51 +0100
Subject: [PATCH] Update static-compat packages

---
 glib2/static-compat/PKGBUILD         |  4 ++--
 harfbuzz/static-compat/PKGBUILD      |  7 ++-----
 libice/static-compat/PKGBUILD        | 13 +++++++------
 libxau/static-compat/PKGBUILD        |  9 +++++----
 libxcomposite/static-compat/PKGBUILD |  8 ++++----
 libxdamage/static-compat/PKGBUILD    |  8 ++++----
 xz/static-compat/PKGBUILD            |  6 +++---
 7 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/glib2/static-compat/PKGBUILD b/glib2/static-compat/PKGBUILD
index 336d567d..9a66faf8 100644
--- a/glib2/static-compat/PKGBUILD
+++ b/glib2/static-compat/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=glib2
 pkgname=static-compat-$_pkgname
-pkgver=2.74.2
+pkgver=2.74.3
 pkgrel=1
 pkgdesc="Low level core library"
 url="https://wiki.gnome.org/Projects/GLib"
@@ -13,7 +13,7 @@ depends=(static-compat-pcre2 static-compat-libffi static-compat-util-linux stati
 makedepends=(gettext shared-mime-info python libelf git static-compat-meson)
 checkdepends=(desktop-file-utils)
 options=(!strip !emptydirs staticlibs)
-_commit=b5299ed2055aa3ccd628aceb016c1e9bda516e39  # tags/2.74.2^0
+_commit=a8ad6347a404962c3b83aca1bf50610a76618c0f  # tags/2.74.3^0
 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
         0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch)
 b2sums=('SKIP'
diff --git a/harfbuzz/static-compat/PKGBUILD b/harfbuzz/static-compat/PKGBUILD
index b45d8ee0..ac224b0d 100644
--- a/harfbuzz/static-compat/PKGBUILD
+++ b/harfbuzz/static-compat/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=harfbuzz
 pkgname=static-compat-$_pkgname
-pkgver=5.3.1
+pkgver=6.0.0
 pkgrel=1
 pkgdesc="OpenType text shaping engine"
 url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -13,7 +13,7 @@ depends=(static-compat-glib2 static-compat-freetype2 static-compat-graphite)
 makedepends=(gobject-introspection ragel git python static-compat-meson)
 checkdepends=(python-fonttools python-setuptools)
 options=(!emptydirs !docs staticlibs)
-_commit=970321db7bddbe8c579b73751fc655a924ea3ce6  # tags/5.3.1^0
+_commit=afcae83a064843d71d47624bc162e121cc56c08b  # tags/6.0.0^0
 source=("git+https://github.com/harfbuzz/harfbuzz#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -24,9 +24,6 @@ pkgver() {
 
 prepare() {
   cd harfbuzz
-
-  # https://github.com/harfbuzz/harfbuzz/issues/3850
-  git cherry-pick -n b0b7a65388da25ae3fa01e969ad6abc67eed4f49
 }
 
 build() {
diff --git a/libice/static-compat/PKGBUILD b/libice/static-compat/PKGBUILD
index 394c1ec4..9bae4552 100644
--- a/libice/static-compat/PKGBUILD
+++ b/libice/static-compat/PKGBUILD
@@ -4,19 +4,20 @@
 
 _pkgname=libice
 pkgname=static-compat-$_pkgname
-pkgver=1.0.10
-pkgrel=3
+pkgver=1.1.1
+pkgrel=1
 pkgdesc="X11 Inter-Client Exchange library"
 arch=('x86_64')
 url="https://xorg.freedesktop.org/"
 depends=('glibc-static-compat')
-makedepends=('static-compat-configure' 'static-compat-xtrans>=1.2.5' 'xorg-util-macros' 'static-compat-xorgproto')
+makedepends=('static-compat-configure' 'static-compat-xtrans' 'xorg-util-macros' 'static-compat-xorgproto')
 options=(!emptydirs staticlibs)
-source=(${url}/releases/individual/lib/libICE-${pkgver}.tar.bz2{,.sig})
+source=(${url}/releases/individual/lib/libICE-${pkgver}.tar.xz{,.sig})
 license=('custom')
-sha512sums=('2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468'
+sha512sums=('2f7833a25f31cc743ca95cb88f9a8403b50e19ffb5bf43bfef87ba405857d359789daaa9ec2391351237d958f16d35dbf082adb76d301e46d3a54162a6b452d3'
             'SKIP')
-validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith <alan.coopersmith@oracle.com>"
+#validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith <alan.coopersmith@oracle.com>"
+validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <mattst88@gmail.com>
 
 build() {
   source static-compat-environment
diff --git a/libxau/static-compat/PKGBUILD b/libxau/static-compat/PKGBUILD
index b1dd3018..1ba007e9 100644
--- a/libxau/static-compat/PKGBUILD
+++ b/libxau/static-compat/PKGBUILD
@@ -4,8 +4,8 @@
 
 _pkgname=libxau
 pkgname=static-compat-$_pkgname
-pkgver=1.0.10
-pkgrel=2
+pkgver=1.0.11
+pkgrel=1
 pkgdesc="X11 authorisation library"
 arch=('x86_64')
 url="https://xorg.freedesktop.org/"
@@ -14,8 +14,9 @@ makedepends=('static-compat-configure' 'static-compat-xorgproto')
 license=('custom')
 options=(!emptydirs staticlibs)
 source=(${url}/releases/individual/lib/libXau-${pkgver}.tar.xz{,.sig})
-validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith <alan.coopersmith@oracle.com>"
-sha512sums=('e56a862a7bbccb108c9683eeb8b643d2587a121dd96982e1e7edc5bd0b676302d244bfaa750afc7fb2ad31df8b825095d779b6e2ab2c76f94e47095d90071ebb'
+#validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith <alan.coopersmith@oracle.com>"
+validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <mattst88@gmail.com>
+sha512sums=('f56abba3bef3fdd4739dfa69367a4251b5fab7c89194c9aece9efa66b9ebbf0736690cc9bd654aab19d9db377e4b9a5268c9c020b3d293bb5351bff5fe75a4dd'
             'SKIP')
 
 build() {
diff --git a/libxcomposite/static-compat/PKGBUILD b/libxcomposite/static-compat/PKGBUILD
index d81c0fc6..fcf56e72 100644
--- a/libxcomposite/static-compat/PKGBUILD
+++ b/libxcomposite/static-compat/PKGBUILD
@@ -2,8 +2,8 @@
 
 _pkgname=libxcomposite
 pkgname=static-compat-$_pkgname
-pkgver=0.4.5
-pkgrel=3
+pkgver=0.4.6
+pkgrel=1
 pkgdesc="X11 Composite extension library"
 arch=('x86_64')
 url="https://xorg.freedesktop.org/"
@@ -11,8 +11,8 @@ license=('custom')
 depends=('static-compat-libxfixes')
 makedepends=('static-compat-configure' 'static-compat-xorgproto')
 options=(staticlibs !docs !emptydirs)
-source=("${url}/releases/individual/lib/libXcomposite-${pkgver}.tar.bz2"{,.sig})
-sha512sums=('502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5'
+source=("${url}/releases/individual/lib/libXcomposite-${pkgver}.tar.xz"{,.sig})
+sha512sums=('f35a0da8f9f22fd788eee01209557fe3a1b1abdc9744f76330ba42b21b6e3af5464ca4451c33415856417c30da5aa5624e3707980c644327249bfeda5a62a59b'
             'SKIP')
 validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith <alan.coopersmith@oracle.com>"
 
diff --git a/libxdamage/static-compat/PKGBUILD b/libxdamage/static-compat/PKGBUILD
index 3bae6488..baf26082 100644
--- a/libxdamage/static-compat/PKGBUILD
+++ b/libxdamage/static-compat/PKGBUILD
@@ -2,8 +2,8 @@
 
 _pkgname=libxdamage
 pkgname=static-compat-$_pkgname
-pkgver=1.1.5
-pkgrel=3
+pkgver=1.1.6
+pkgrel=1
 pkgdesc="X11 damaged region extension library"
 arch=('x86_64')
 url="https://xorg.freedesktop.org/"
@@ -11,8 +11,8 @@ license=('custom')
 depends=('static-compat-libxfixes')
 makedepends=('static-compat-xorgproto' 'static-compat-configure')
 options=(staticlibs !emptydirs)
-source=(${url}/releases/individual/lib/libXdamage-${pkgver}.tar.bz2{,.sig})
-sha512sums=('a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124'
+source=(${url}/releases/individual/lib/libXdamage-${pkgver}.tar.xz{,.sig})
+sha512sums=('624dcefa1c79064569df952892f7f1351dc19ad338ce73d1a57041e406cb3e18abe531bab352b93d1f0f5c9b5c6b2652cc84a8f1fbfcbba648343812695a8acb'
             'SKIP')
 validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith <alan.coopersmith@oracle.com>"
 
diff --git a/xz/static-compat/PKGBUILD b/xz/static-compat/PKGBUILD
index 8a9bd145..b56c99de 100644
--- a/xz/static-compat/PKGBUILD
+++ b/xz/static-compat/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=xz
 pkgname=static-compat-$_pkgname
-pkgver=5.2.8
+pkgver=5.4.0
 pkgrel=1
 pkgdesc='Library and command line tools for XZ and LZMA compressed files'
 arch=('x86_64')
@@ -14,9 +14,9 @@ makedepends=('static-compat-configure')
 options=(!emptydirs staticlibs)
 validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620') # Lasse Collin <lasse.collin@tukaani.org>
 source=("https://tukaani.org/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"{,.sig})
-sha256sums=('ec5cda9f0b91336ab1b881d3d144e8203fcca604e607caca8ae678ddbc29207d'
+sha256sums=('7471ef5991f690268a8f2be019acec2e0564b7b233ca40035f339fe9a07f830b'
             'SKIP')
-sha512sums=('aaba9e4dfabc1ccb66b92f5930ca07219089c7c02396be80bd727073f90c824d2698f7aaaf156b881fdc6750da993e8a6289929d71225df8327bc3beed5cdee1'
+sha512sums=('29b2cd25bb5b234b329ffe9547692d2c29be393db9d8d4ce70a66dfdaebd54433e79a89d80c57e58cd4559c3c68b9845507d5fedf3eec1c528a81e3d9ddbd811'
              'SKIP')
 
 build() {