Update several package variants to match the corresponding regular package

This commit is contained in:
Martchus 2022-06-25 12:22:19 +02:00
parent 33dd68c7c9
commit c471e99957
17 changed files with 72 additions and 100 deletions

View File

@ -8,7 +8,7 @@ Subject: [PATCH] glib-compile-schemas: Remove noisy deprecation warnings
1 file changed, 13 deletions(-)
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
index 7e1152f6bf45..924a3e7f176a 100644
index 83184e1e8d67..e575dad294e5 100644
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state,

View File

@ -3,8 +3,8 @@
_pkgname=glib2
pkgname=static-compat-$_pkgname
pkgver=2.72.0
pkgrel=2
pkgver=2.72.2
pkgrel=1
pkgdesc="Low level core library"
url="https://wiki.gnome.org/Projects/GLib"
license=(LGPL)
@ -17,7 +17,7 @@ _commit=bacbec652d356895ec493f3de2f2f6f4c7dafde0 # tags/2.66.4^0
source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch)
sha256sums=('SKIP'
'edb5e34ac0a77431978cab55b98e39754d73455e28a38f5003424e943bbe5fff')
'f410289d8acf787cf0fc512efe5622d4bbd574c032e3ee0efd9cae2155b2c3dc')
pkgver() {
cd glib

View File

@ -3,7 +3,7 @@
_pkgname=harfbuzz
pkgname=static-compat-$_pkgname
pkgver=4.2.0
pkgver=4.3.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=9d5730b958974bc9db95e46e6bad52e9e9cd6e1c # tags/4.2.0^0
_commit=aee123fc83388b8f5acfb301d87bd92eccc5b843 # tags/4.3.0^0
source=("git+https://github.com/harfbuzz/harfbuzz#commit=$_commit")
sha256sums=('SKIP')

View File

@ -5,8 +5,8 @@
_pkgname=libcap
pkgname=static-compat-$_pkgname
pkgver=2.63
pkgrel=2
pkgver=2.64
pkgrel=1
pkgdesc="POSIX 1003.1e capabilities"
arch=(x86_64)
url="https://sites.google.com/site/fullycapable/"
@ -14,11 +14,10 @@ license=(GPL2)
depends=(glibc-static-compat)
makedepends=(static-compat-environment)
options=(staticlibs)
source=("https://kernel.org/pub/linux/libs/security/linux-privs/${_pkgname}2/${_pkgname}-$pkgver.tar."{xz,sign}
)
sha512sums=('832842b71ca32db8f53ca5f1a3010f14e7f42693f62f29632e9948c860f990899bb094165c37307ce8b9e5bc5eb1c833e780ebca98442df3e6d900e4b238834b'
source=("https://kernel.org/pub/linux/libs/security/linux-privs/${_pkgname}2/${_pkgname}-$pkgver.tar."{xz,sign})
sha512sums=('3c5cf478cef249585ee1a0dfd75c6b41b0daf4e1ecb59dce894eac5523841aa79ca499be4161f73193dd8e7363edcd51063f3e281930cee939ebd50983eecbaf'
'SKIP')
b2sums=('a49a628f5b9ddf5a3d077428544a53b9cdedf62053ff296a0aa7d61e12ca05f9ba7597f20ee16a3843736bee2417a3d1585ad6b336651fcb3e4ee29b108cfa0f'
b2sums=('078ce2505a79c1bd4ca0a8eaf3444178bc19a566f0505d28c6959f86fbbac2fe2fc88c06fd0d988087a6e20e8ec66a2633146cea957f0f3fd92eaff4f81d7c66'
'SKIP')
validpgpkeys=(38A644698C69787344E954CE29EE848AE2CCF3F4) # Andrew G. Morgan <morgan@kernel.org>

View File

@ -3,8 +3,8 @@
_pkgname=libgpg-error
pkgname=static-compat-$_pkgname
pkgver=1.44
pkgrel=1
pkgver=1.45
pkgrel=2
pkgdesc="Support library for libgcrypt"
arch=(x86_64)
url="https://www.gnupg.org"
@ -14,11 +14,10 @@ makedepends=('static-compat-configure')
options=(staticlibs)
source=(https://www.gnupg.org/ftp/gcrypt/libgpg-error/${_pkgname}-${pkgver}.tar.bz2{,.sig})
# https://www.gnupg.org/download/integrity_check.html
sha1sums=('c16ab473d1e558ba1712c77ace38bd03e467cbb0'
sha1sums=('fe724ed37b4935964059a47b7c64d5f8246659d8'
'SKIP')
validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch
'031EC2536E580D8EA286A9F22071B08A33BD3F06' # NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org>
'6DAA6E64A76D2840571B4902528897B826403ADA') # "Werner Koch (dist signing 2020)"
validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA') # Werner Koch (dist signing 2020)
validpgpkeys+=('AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD') # Niibe Yutaka (GnuPG Release Key)
prepare() {
source static-compat-environment

View File

@ -1,44 +0,0 @@
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=libinput
pkgver=1.20.0
pkgrel=2
pkgdesc="Input device management and event handling library"
url="https://gitlab.freedesktop.org/libinput"
arch=(x86_64)
license=(custom:X11)
depends=('mtdev' 'systemd' 'libevdev' 'libwacom')
# upstream doesn't recommend building docs
makedepends=('gtk4' 'meson' 'wayland-protocols' 'check') # 'doxygen' 'graphviz' 'python-sphinx' 'python-recommonmark'
optdepends=('gtk4: libinput debug-gui'
'python-pyudev: libinput measure'
'python-libevdev: libinput measure')
options=(debug)
source=(https://gitlab.freedesktop.org/libinput/libinput/-/archive/$pkgver/$pkgname-$pkgver.tar.bz2)
sha512sums=('145b0e0760929137ab442b2030b4b42f6df54a3ae61c47c929e1a74857a170f0f2a56bb7522b7d1d9c0943028ac54c7728cf8d66a0c384f6118f31d6625ab44c')
#source=(https://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
#sha512sums=('f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298'
# 'SKIP')
#validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
build() {
arch-meson $pkgname-$pkgver build \
-D udev-dir=/usr/lib/udev \
-D documentation=false
# Print config
meson configure build
meson compile -C build
}
check() {
meson test -C build --print-errorlogs
}
package() {
meson install -C build --destdir "$pkgdir"
install -Dvm644 $pkgname-$pkgver/COPYING \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}

View File

@ -2,7 +2,7 @@
_pkgname=libinput
pkgname=static-compat-$_pkgname
pkgver=1.20.0
pkgver=1.21.0
pkgrel=2
pkgdesc="Input device management and event handling library"
url="https://gitlab.freedesktop.org/libinput"
@ -13,10 +13,7 @@ depends=('static-compat-mtdev' 'static-compat-systemd-libs' 'static-compat-libev
makedepends=('static-compat-meson' 'static-compat-wayland') # 'check' 'doxygen' 'graphviz' 'python-sphinx' 'python-recommonmark'
options=(staticlibs !emptydirs)
source=(https://gitlab.freedesktop.org/libinput/libinput/-/archive/$pkgver/$_pkgname-$pkgver.tar.bz2)
sha512sums=('145b0e0760929137ab442b2030b4b42f6df54a3ae61c47c929e1a74857a170f0f2a56bb7522b7d1d9c0943028ac54c7728cf8d66a0c384f6118f31d6625ab44c')
#source=(https://freedesktop.org/software/$_pkgname/$_pkgname-$pkgver.tar.xz{,.sig})
#sha512sums=('f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298'
# 'SKIP')
sha256sums=('3173d83e0f5a686606d2780129c802b865b6a0750c86db88d56097afc016a2dd')
#validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
prepare() {

View File

@ -1,8 +1,9 @@
# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
_pkgname=libwacom
pkgname=static-compat-$_pkgname
pkgver=2.2.0
pkgver=2.3.0
pkgrel=1
pkgdesc="Library to identify Wacom tablets and their features"
arch=('x86_64')
@ -15,7 +16,7 @@ options=('staticlibs')
validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF')
source=(https://github.com/linuxwacom/libwacom/releases/download/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.xz{,.sig})
# https://github.com/linuxwacom/libwacom/releases
sha256sums=('e62ac9edb522d36ad2fa99adca35ddc02067383d4668eeaa13d7efccc30bb8c8'
sha256sums=('2fb22a7072cdbcf742d91c38246b0f91bbfd753b934ef5227e31554effb62334'
'SKIP')
prepare() {

View File

@ -4,7 +4,7 @@
_pkgname=libxcb
pkgname=static-compat-$_pkgname
pkgver=1.14
pkgver=1.15
pkgrel=1
pkgdesc="X11 client-side library"
arch=('x86_64')
@ -14,10 +14,10 @@ makedepends=('libxslt' 'python' 'xorg-util-macros' 'static-compat-xorgproto' 'st
license=('custom')
options=(!emptydirs staticlibs)
source=(https://xorg.freedesktop.org/archive/individual/lib/$_pkgname-$pkgver.tar.xz{,.sig})
sha512sums=('b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6'
sha512sums=('f6c7d766b7cf9cab6abe948ee424cbae6951dbfe2f76fa58a109cdc05b0f0919dcc4e38176a22ff4b95fc1e38596115317e32ba33b24cae0035a4e30dbcbdad9'
'SKIP')
validpgpkeys=('A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # "Daniel Stone <daniels@collabora.com>"
validpgpkeys+=('3BB639E56F861FA2E86505690FDD682D974CA72A') # "Matt Turner <mattst88@gmail.com>"
#validpgpkeys=('A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # "Daniel Stone <daniels@collabora.com>"
validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # "Matt Turner <mattst88@gmail.com>"
build() {
source static-compat-environment

View File

@ -4,7 +4,7 @@
_pkgname=libxkbcommon
pkgname=static-compat-$_pkgname
pkgver=1.4.0
pkgver=1.4.1
pkgrel=1
pkgdesc="Keymap handling library for toolkits and window systems"
url="https://xkbcommon.org/"
@ -14,7 +14,7 @@ depends=(static-compat-libxcb xkeyboard-config static-compat-libxml2 static-comp
makedepends=(xkeyboard-config wayland-protocols doxygen git static-compat-meson)
checkdepends=(xorg-server-xvfb libgl)
options=(!emptydirs !docs staticlibs)
_commit=c60b77ea512bef92e481be38972b58dd71a34180 # tags/xkbcommon-1.0.3^0
_commit=57af9cb71f19f37394399b549f7cb7b0d9fe3988 # tags/xkbcommon-1.4.1^0
source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit")
sha256sums=('SKIP')

View File

@ -1,3 +1,4 @@
# Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
# Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Tom Gundersen <teg@jklm.no>
@ -5,8 +6,8 @@
_pkgname=libxml2
pkgname=static-compat-$_pkgname
pkgver=2.9.13
pkgrel=8
pkgver=2.9.14
pkgrel=1
pkgdesc='XML parsing library, version 2'
url='http://www.xmlsoft.org/'
arch=(x86_64)
@ -14,13 +15,13 @@ license=(MIT)
depends=(static-compat-zlib static-compat-xz)
makedepends=(git)
options=(!emptydirs staticlibs)
_commit=41a34e1f4ffae2ce401600dbb5fe43f8fe402641 # tags/v2.9.10^0
_commit=7846b0a677f8d3ce72486125fa281e92ac9970e8 # tags/v2.9.14^0
source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit"
libxml2-2.9.8-python3-unicode-errors.patch
no-fuzz.diff
https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
sha256sums=('SKIP'
'37eb81a8ec6929eed1514e891bff2dd05b450bcf0c712153880c485b7366c17c'
'd331748e504e69603dac9c57f7b110a98a4bd4cb87e63d0c1bbcd71ec3635383'
'3fc010d8c42b93e6d6f1fca6b598a561e9d2c8780ff3ca0c76a31efabaea404f'
'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
@ -44,7 +45,7 @@ prepare() {
# Do not run fuzzing tests
git apply -3 ../no-fuzz.diff
autoreconf -fiv
NOCONFIGURE=1 ./autogen.sh
}
build() (
@ -72,7 +73,7 @@ package() {
source static-compat-environment
make -C libxml2/build DESTDIR="$pkgdir" install
rm -r "$pkgdir/$static_compat_prefix"/{bin,share/man,share/doc,share/gtk-doc}
install -Dm 644 libxml2/COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
install -Dm 644 libxml2/build/COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
}
# vim: ts=2 sw=2 et:

View File

@ -1,8 +1,8 @@
Index: libxml2-2.9.5/python/libxml.c
===================================================================
--- libxml2-2.9.5.orig/python/libxml.c
+++ libxml2-2.9.5/python/libxml.c
@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
diff --git i/python/libxml.c w/python/libxml.c
index ef630254..65a51af0 100644
--- i/python/libxml.c
+++ w/python/libxml.c
@@ -1621,28 +1621,37 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, const char *msg,
PyObject *message;
PyObject *result;
char str[1000];
@ -10,7 +10,16 @@ Index: libxml2-2.9.5/python/libxml.c
#ifdef DEBUG_ERROR
printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
#endif
if (libxml_xmlPythonErrorFuncHandler == NULL) {
va_start(ap, msg);
vfprintf(stderr, msg, ap);
va_end(ap);
} else {
va_start(ap, msg);
if (vsnprintf(str, 999, msg, ap) >= 998)
str[999] = 0;
va_end(ap);

View File

@ -1,5 +1,5 @@
pkgname=mingw-w64-pcre2
pkgver=10.39
pkgver=10.40
pkgrel=1
pkgdesc='A library that implements Perl 5-style regular expressions. 2nd version (mingw-w64)'
arch=('any')
@ -10,7 +10,7 @@ depends=(mingw-w64-crt)
options=(staticlibs !strip !buildflags)
optdepends=(mingw-w64-readline mingw-w64-bzip2 mingw-w64-zlib)
source=("https://github.com/PhilipHazel/${pkgname##mingw-w64-}/releases/download/${pkgname##mingw-w64-}-$pkgver/${pkgname##mingw-w64-}-$pkgver.tar.bz2"{,.sig})
sha512sums=('b3d898198f4b5ffc3453d2ba56fe2a7298c01c52e5f67d45f1e046fc0dee62e16a4024fcb65839ac9c367beedb531647affd6f8599fbeb102f19423c150d80d4'
sha512sums=('00e7b48a6554b9127cb6fe24c5cacf72783416a9754ec88f62f73c52f46ed72c86c1869e62c91a31b2ff2cbafbbedabca44b3f1eb7670bc92f49d8401c7374e8'
'SKIP')
validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel

View File

@ -7,7 +7,7 @@
_pkgname=pcre2
pkgname=static-compat-$_pkgname
pkgver=10.39
pkgver=10.40
pkgrel=1
pkgdesc='A library that implements Perl 5-style regular expressions. 2nd version'
arch=('x86_64')
@ -17,7 +17,7 @@ depends=('gcc-libs-static-compat')
makedepends=('static-compat-configure')
options=(!emptydirs staticlibs)
source=("https://github.com/PhilipHazel/${_pkgname}/releases/download/${_pkgname}-$pkgver/${_pkgname}-$pkgver.tar.bz2"{,.sig})
sha512sums=('b3d898198f4b5ffc3453d2ba56fe2a7298c01c52e5f67d45f1e046fc0dee62e16a4024fcb65839ac9c367beedb531647affd6f8599fbeb102f19423c150d80d4'
sha512sums=('00e7b48a6554b9127cb6fe24c5cacf72783416a9754ec88f62f73c52f46ed72c86c1869e62c91a31b2ff2cbafbbedabca44b3f1eb7670bc92f49d8401c7374e8'
'SKIP')
validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel

View File

@ -3,10 +3,10 @@
_pkgname=sqlite
pkgname=static-compat-$_pkgname
_srcver=3380200
_srcver=3380500
_docver=${_srcver}
#_docver=3330000
pkgver=3.38.2
pkgver=3.38.5
pkgrel=1
pkgdesc="A C library that implements an SQL database engine"
arch=('x86_64')
@ -19,7 +19,7 @@ source=(https://www.sqlite.org/2022/sqlite-src-${_srcver}.zip
license.txt)
options=('!emptydirs' '!makeflags' 'staticlibs') # json extensions breaks parallel build
# upstream now switched to sha3sums - currently not suppoerted by makepkg
sha256sums=('c7c0f070a338c92eb08805905c05f254fa46d1c4dda3548a02474f6fb567329a'
sha256sums=('6503bb59e39ec8663083696940ec818cd5555196e6ca543d4029440cca7b00d9'
'55746d93b0df4b349c4aa4f09535746dac3530f9fd6de241c9f38e2c92e8ee97'
'4e57d9ac979f1c9872e69799c2597eeef4c6ce7224f3ede0bf9dc8d217b1e65d')

View File

@ -2,7 +2,7 @@
pkgname=static-compat-vulkan-headers
_pkgname=Vulkan-Headers
pkgver=1.3.211
pkgver=1.3.217
pkgrel=1
epoch=1
pkgdesc="Vulkan header files"
@ -12,7 +12,7 @@ license=('APACHE')
makedepends=(static-compat-cmake git)
provides=("static-compat-vulkan-hpp=${pkgver}")
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/Vulkan-Headers/archive/v${pkgver}.tar.gz")
sha256sums=('67ab69142f69389dfdf5f1c7922e62aa4a03ba286b9229dd7f7f3e827232463c')
sha256sums=('004b4f7841bd912d1cc3f5ac5694d5dea2f944f10053451233b533874368df87')
build() {
source static-compat-environment

View File

@ -3,20 +3,30 @@
_pkgname=xcb-proto
pkgname=static-compat-$_pkgname
pkgver=1.14.1
pkgrel=5
pkgver=1.15.2
pkgrel=1
pkgdesc="XML-XCB protocol descriptions"
arch=(any)
url="https://xcb.freedesktop.org/"
license=('custom')
makedepends=('python' 'libxml2' 'static-compat-configure')
source=(https://xorg.freedesktop.org/archive/individual/proto/$_pkgname-$pkgver.tar.xz{,.sig})
sha512sums=('140fbf48483bacc7f6b70fdcf76f9e4ff0e87df9cb3a071cea47d8fe4574407cdefcfbd674099014d297e5fc010748e71d8609fca4cc32e8b25c634f928b727d'
source=(https://xorg.freedesktop.org/archive/individual/proto/$_pkgname-$pkgver.tar.xz{,.sig}
0001_xcb-proto_revert_datarootdir.patch::https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/d849b9534a52b0199f26c1dd30ac11aba12db9dc.patch)
sha512sums=('9d0b2f0a4dbbf2d64e32ff4658d1663e13d7e5f1bffc1e8d45be7b9dd5bab46e29fc1c2f6e66a7a569e374ba6756faf3c39b0b5e5560df6d7f8b68beec97659d'
'SKIP'
'SKIP')
validpgpkeys=('A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # "Daniel Stone <daniels@collabora.com>"
validpgpkeys+=('3BB639E56F861FA2E86505690FDD682D974CA72A') # "Matt Turner <mattst88@gmail.com>"
validpgpkeys+=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith <alan.coopersmith@oracle.com>"
prepare() {
source static-compat-environment
cd $_pkgname-$pkgver
# revert pkgfile back to /usr/lib
patch -Rp1 -i ../0001_xcb-proto_revert_datarootdir.patch
autoreconf -vfi
}
build() {
source static-compat-environment
cd $_pkgname-$pkgver