upg glib2 lvm2 pcre2

This commit is contained in:
joborun linux 2022-12-23 00:04:50 +02:00
parent 33e05f0fc5
commit 067216c8d6
7 changed files with 46 additions and 33 deletions

View file

@ -8,7 +8,7 @@
#pkgbase=glib2
#pkgname=(glib2 glib2-docs)
pkgname=glib2
pkgver=2.74.3
pkgver=2.74.4
pkgrel=01
# this is a waste of resources rebuilding this for the shake of catching up
# to arch's late decision to be building debug symbol packages along with the core pkg
@ -18,13 +18,14 @@ pkgdesc="Low level core library"
url="https://wiki.gnome.org/Projects/GLib"
arch=(x86_64)
depends=(pcre2 libffi util-linux-libs zlib) # libsysprof-capture)
makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux
makedepends=(gettext shared-mime-info python libelf git util-linux
meson dbus gtk3)
checkdepends=(desktop-file-utils glib2)
#checkdepends=(desktop-file-utils glib2)
#options=(debug staticlibs) ### uncomment this to have the debug pkg produced
options=(staticlibs)
_commit=a8ad6347a404962c3b83aca1bf50610a76618c0f # tags/2.74.3^0
source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
_commit=e35768fe299d6389f8f5eef15593762389d2c07d # tags/2.74.4^0
source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
"git+https://gitlab.gnome.org/GNOME/gvdb.git"
0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
gio-querymodules.{hook,script}
glib-compile-schemas.hook)
@ -37,18 +38,15 @@ pkgver() {
prepare() {
cd glib
# # Fix building WebKitGTK
# git cherry-pick -n 560e56fa71f21e8f0f7b91322d560dedb1af13e4
# # Unicode 14
# git cherry-pick -n ab895d91d570a18ac74d6f4f6390488210d8fb15
# Fix build (missing include)
git cherry-pick -n 03cb4261e00cf505790f4fd4e69f97b2ef4fcccd
# Suppress noise from glib-compile-schemas.hook
git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
# # https://bugs.archlinux.org/task/75980
# # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2921
# git cherry-pick -n 'ea3f17d598d550345e94e4571130e429443e91cb'
git submodule init
git submodule set-url subprojects/gvdb "$srcdir/gvdb"
git -c protocol.file.allow=always submodule update
}
build() {
@ -56,18 +54,19 @@ build() {
# use fat LTO objects for static libraries
CFLAGS+=' -ffat-lto-objects -g3'
CXXFLAGS+=' -ffat-lto-objects -g3'
CFLAGS+=" -DG_DISABLE_CAST_CHECKS"
arch-meson glib build \
--default-library both \
-D glib_debug=disabled \
-D selinux=disabled \
-D man=true \
-D sysprof=disabled \
-D man=true \
-D gtk_doc=false
meson compile -C build
}
# Read ./note about the reason of the failing test, it is because I refuse to let dbus run!
# Read ./note about the reason of the failing test, it is because we refuse to let dbus run!
#check() {
# meson test -C build --no-suite flaky --no-suite slow --print-errorlogs
#}
@ -105,7 +104,7 @@ package() {
# pkgdesc="Documentation for GLib"
# depends=()
# license+=(custom)
#
# mv -t "$pkgdir" docs/*
# install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 glib/docs/reference/COPYING
#}
@ -117,6 +116,7 @@ license=(LGPL)
validpgpkeys=('923B7025EE03C1C59F42684CF0942E894B2EAFA0') # Philip Withnall (https://endlessos.org/) <pwithnall@endlessos.org>
sha256sums=(SKIP
SKIP
6d51eb5856268d79eee01b97a299fa9f99db18b2abb4df56f2ed9e641a09138a # 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
2a9f9b8235f48e3b7d0f6cfcbc76cd2116c45f28692cac4bd61074c495bd5eb7 # gio-querymodules.hook
92d08db5aa30bda276bc3d718e7ff9dd01dc40dcab45b359182dcc290054e24e # gio-querymodules.script
@ -124,4 +124,3 @@ sha256sums=(SKIP
# d949f464fba85ab331546bdc2658edec549e4c3534a3069848a7e1d2d1007fae # glib2-2.74.3-01-x86_64.pkg.tar.xz

View file

@ -3,7 +3,7 @@
pkgbase=glib2
pkgname=(glib2 glib2-docs)
pkgver=2.74.3
pkgver=2.74.4
pkgrel=1
pkgdesc="Low level core library"
url="https://wiki.gnome.org/Projects/GLib"
@ -35,14 +35,16 @@ options=(
debug
staticlibs
)
_commit=a8ad6347a404962c3b83aca1bf50610a76618c0f # tags/2.74.3^0
_commit=e35768fe299d6389f8f5eef15593762389d2c07d # tags/2.74.4^0
source=(
"git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
"git+https://gitlab.gnome.org/GNOME/gvdb.git"
0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
gio-querymodules.{hook,script}
glib-compile-schemas.hook
)
b2sums=('SKIP'
'SKIP'
'4d5cb5ad1222a5e8d06e79736170cd694a6277e0da71ffd55560d74cf5c3273551d302a35bd2ff43f09070d61c1de147bb312428fce98347d232ac3d44406511'
'cd3a7817193ca985be5aff0813e78cc59c39ad8d4a2171c1c719267e4f51beda47c58a44c6d5afead64e9fa1b854430ac935976d02158e927ba3ec8f36fce282'
'4b90eb8d582509b09aab401313d4399cc139ad21b5dd7d45d79860d0764c7494c60714e0794e09823e51d1894ac032a994f27d79d1499abf24ee6f59bdb0c243'
@ -57,8 +59,15 @@ pkgver() {
prepare() {
cd glib
# Fix build (missing include)
git cherry-pick -n 03cb4261e00cf505790f4fd4e69f97b2ef4fcccd
# Suppress noise from glib-compile-schemas.hook
git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
git submodule init
git submodule set-url subprojects/gvdb "$srcdir/gvdb"
git -c protocol.file.allow=always submodule update
}
build() {

View file

@ -1,4 +1,3 @@
gtk-doc
git
gettext
shared-mime-info
@ -6,5 +5,9 @@ meson
desktop-file-utils
gtk3
at-spi2-core
libxslt
cmake
valgrind
gtk-doc

View file

@ -7,8 +7,8 @@
pkgbase=lvm2
pkgname=('lvm2' 'device-mapper')
_tag='0ea00227b96a383479139e72db9168448eee48c9' # git rev-parse v${pkgver//./_}
pkgver=2.03.17
_tag='fba794b52541452da9131af594f5cd0fa7affb6d' # git rev-parse v${pkgver//./_}
pkgver=2.03.18
pkgrel=01
arch=('x86_64')
url='https://sourceware.org/lvm2/'
@ -133,7 +133,7 @@ sha256sums=(SKIP
def6e03aa1629bbc0ca1ee5e84e620366daf779f037eab2fda47487a8471729b # lvm2_install
e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0) # 11-dm-initramfs.rules
# 3ebdd4a25c274d64a6f90431a7ff0402325e94e6db5f5cb0f1ad6d74b6b751d1 device-mapper-2.03.18-01-x86_64.pkg.tar.xz
# 04f786e400dd383205096140d439dee08215e9af3f6bd5bd61d8d06c195ace6c lvm2-2.03.18-01-x86_64.pkg.tar.xz
# 5292e1b20eb0c4a8b6108c997ccd96bb163d5fcbc7582080a59acee0b472e8e7 device-mapper-2.03.17-01-x86_64.pkg.tar.xz
# 6677167b10e88a968264d3d563acab201c81f6a8119a0350cc8f9e843df80a9b lvm2-2.03.17-01-x86_64.pkg.tar.xz

View file

@ -3,8 +3,8 @@
pkgbase=lvm2
pkgname=('lvm2' 'device-mapper')
_tag='0ea00227b96a383479139e72db9168448eee48c9' # git rev-parse v${pkgver//./_}
pkgver=2.03.17
_tag='fba794b52541452da9131af594f5cd0fa7affb6d' # git rev-parse v${pkgver//./_}
pkgver=2.03.18
pkgrel=1
arch=('x86_64')
url='https://sourceware.org/lvm2/'

View file

@ -6,8 +6,8 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=pcre2
pkgver=10.40
pkgrel=03
pkgver=10.41
pkgrel=01
pkgdesc='A library that implements Perl 5-style regular expressions. 2nd version'
arch=('x86_64')
url='https://www.pcre.org/'
@ -53,7 +53,9 @@ license=('BSD')
validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel <ph10@hermes.cam.ac.uk>
sha256sums=(14e4b83c4783933dc17e964318e6324f7cae1bc75d8f3c79bc6969f00c159d68 # pcre2-10.40.tar.bz2
f1d2b3fce3ca63d50b589a00402d4736e8b725a7b8d3165805b534415b846ea4) # pcre2-10.40.tar.bz2.sig
sha256sums=(0f78cebd3e28e346475fb92e95fe9999945b4cbaad5f3b42aca47b887fb53308 # pcre2-10.41.tar.bz2
806cd96b8473275b1578e4c03f53febb26a7c3498c42ab1bc2ce901cc0a09f57) # pcre2-10.41.tar.bz2.sig

View file

@ -6,8 +6,8 @@
# Contributor: John Proctor <jproctor@prium.net>
pkgname=pcre2
pkgver=10.40
pkgrel=3
pkgver=10.41
pkgrel=1
pkgdesc='A library that implements Perl 5-style regular expressions. 2nd version'
arch=('x86_64')
url='https://www.pcre.org/'
@ -16,7 +16,7 @@ depends=('gcc-libs' 'readline' 'zlib' 'bzip2' 'bash')
provides=(libpcre2-{8,16,32,posix}.so)
options=(debug staticlibs)
source=("https://github.com/PhilipHazel/pcre2/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"{,.sig})
sha512sums=('00e7b48a6554b9127cb6fe24c5cacf72783416a9754ec88f62f73c52f46ed72c86c1869e62c91a31b2ff2cbafbbedabca44b3f1eb7670bc92f49d8401c7374e8'
sha512sums=('328f331a56f152424f6021b37f8dcf660842c55d43ff39f1b49115f0d05ed651d0bbb66b43c0ed61d65022030615768b92ce5e6218a54e4e17152ec473cca68d'
'SKIP')
validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel <ph10@hermes.cam.ac.uk>