[trunk] -> [testing] 'glib2-2.74.2-1' add

master
artoo 2 months ago
parent 401f25df86
commit 8f057ce5c4
Signed by: artoo
GPG Key ID: 3292CD0BB0DB310B

@ -3,28 +3,51 @@
pkgbase=glib2
pkgname=(glib2 glib2-docs)
pkgver=2.74.1
pkgrel=1.1
pkgver=2.74.2
pkgrel=1
pkgdesc="Low level core library"
url="https://wiki.gnome.org/Projects/GLib"
license=(LGPL)
arch=(x86_64)
depends=(pcre2 libffi util-linux-libs zlib libsysprof-capture)
makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux
meson dbus)
checkdepends=(desktop-file-utils glib2)
options=(debug staticlibs)
_commit=058491cb6f635ff6e0a57fcdd4107a40ca91c62a # tags/2.74.1^0
source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
glib-compile-schemas.hook gio-querymodules.{hook,script}
gnome-keyring-cpu-usage.patch::https://gitlab.gnome.org/GNOME/glib/-/commit/ca905744dffb844663b5bd6b42f33e2d44f9b4cd.patch)
sha256sums=('SKIP'
'6d51eb5856268d79eee01b97a299fa9f99db18b2abb4df56f2ed9e641a09138a'
'64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25'
'2a9f9b8235f48e3b7d0f6cfcbc76cd2116c45f28692cac4bd61074c495bd5eb7'
'92d08db5aa30bda276bc3d718e7ff9dd01dc40dcab45b359182dcc290054e24e'
'c0dd0894baa9a59bbccf5a977dbc82bd5f0c91f8544bbd5e36f3e945633401cf')
depends=(
libffi
libsysprof-capture
pcre2
util-linux-libs
zlib
)
makedepends=(
dbus
gettext
git
gtk-doc
libelf
meson
python
shared-mime-info
util-linux
)
checkdepends=(
desktop-file-utils
glib2
)
options=(
debug
staticlibs
)
_commit=b5299ed2055aa3ccd628aceb016c1e9bda516e39 # tags/2.74.2^0
source=(
"git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
gio-querymodules.{hook,script}
glib-compile-schemas.hook
)
b2sums=('SKIP'
'4d5cb5ad1222a5e8d06e79736170cd694a6277e0da71ffd55560d74cf5c3273551d302a35bd2ff43f09070d61c1de147bb312428fce98347d232ac3d44406511'
'cd3a7817193ca985be5aff0813e78cc59c39ad8d4a2171c1c719267e4f51beda47c58a44c6d5afead64e9fa1b854430ac935976d02158e927ba3ec8f36fce282'
'4b90eb8d582509b09aab401313d4399cc139ad21b5dd7d45d79860d0764c7494c60714e0794e09823e51d1894ac032a994f27d79d1499abf24ee6f59bdb0c243'
'd30d349b4cb4407839d9074ce08f5259b8a5f3ca46769aabc621f17d15effdb89c4bf19bd23603f6df3d59f8d1adaded0f4bacd0333afcab782f2d048c882858')
pkgver() {
cd glib
@ -36,8 +59,6 @@ prepare() {
# Suppress noise from glib-compile-schemas.hook
git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
patch -Np 1 -i ../gnome-keyring-cpu-usage.patch
}
build() {
@ -58,17 +79,20 @@ build() {
}
check() {
# 74 spawn-test fails with patch
meson test -C build --no-suite flaky --no-suite slow --print-errorlogs || :
meson test -C build --no-suite flaky --no-suite slow --print-errorlogs
}
package_glib2() {
depends+=(libmount.so libffi.so)
provides+=(libgio-2.0.so libglib-2.0.so libgmodule-2.0.so libgobject-2.0.so
libgthread-2.0.so)
optdepends=('python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report'
'libelf: gresource inspection tool'
'gvfs: most gio functionality')
depends+=(
libffi.so
libmount.so
)
provides+=(libg{lib,io,module,object,thread}-2.0.so)
optdepends=(
'gvfs: most gio functionality'
'libelf: gresource inspection tool'
'python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report'
)
meson install -C build --destdir "$pkgdir"

@ -0,0 +1,33 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Fri, 7 Jan 2022 18:59:10 +0000
Subject: [PATCH] glib-compile-schemas: Remove noisy deprecation warnings
---
gio/glib-compile-schemas.c | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
index 326658a88b35..f61d45b9a364 100644
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
@@ -1234,19 +1234,6 @@ parse_state_start_schema (ParseState *state,
return;
}
- if (path && (g_str_has_prefix (path, "/apps/") ||
- g_str_has_prefix (path, "/desktop/") ||
- g_str_has_prefix (path, "/system/")))
- {
- gchar *message = NULL;
- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. "
- "Paths starting with "
- "“/apps/”, “/desktop/” or “/system/” are deprecated."),
- id, path);
- g_printerr ("%s\n", message);
- g_free (message);
- }
-
state->schema_state = schema_state_new (path, gettext_domain,
extends, extends_name, list_of);

@ -0,0 +1,121 @@
# Maintainer: artoo <artoo@artixlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgbase=glib2
pkgname=(glib2 glib2-docs)
pkgver=2.74.2
pkgrel=1
pkgdesc="Low level core library"
url="https://wiki.gnome.org/Projects/GLib"
license=(LGPL)
arch=(x86_64)
depends=(
libffi
libsysprof-capture
pcre2
util-linux-libs
zlib
)
makedepends=(
dbus
gettext
git
gtk-doc
libelf
meson
python
shared-mime-info
util-linux
)
checkdepends=(
desktop-file-utils
glib2
)
options=(
debug
staticlibs
)
_commit=b5299ed2055aa3ccd628aceb016c1e9bda516e39 # tags/2.74.2^0
source=(
"git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
gio-querymodules.{hook,script}
glib-compile-schemas.hook
)
b2sums=('SKIP'
'4d5cb5ad1222a5e8d06e79736170cd694a6277e0da71ffd55560d74cf5c3273551d302a35bd2ff43f09070d61c1de147bb312428fce98347d232ac3d44406511'
'cd3a7817193ca985be5aff0813e78cc59c39ad8d4a2171c1c719267e4f51beda47c58a44c6d5afead64e9fa1b854430ac935976d02158e927ba3ec8f36fce282'
'4b90eb8d582509b09aab401313d4399cc139ad21b5dd7d45d79860d0764c7494c60714e0794e09823e51d1894ac032a994f27d79d1499abf24ee6f59bdb0c243'
'd30d349b4cb4407839d9074ce08f5259b8a5f3ca46769aabc621f17d15effdb89c4bf19bd23603f6df3d59f8d1adaded0f4bacd0333afcab782f2d048c882858')
pkgver() {
cd glib
git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
}
prepare() {
cd glib
# Suppress noise from glib-compile-schemas.hook
git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
}
build() {
# Produce more debug info: GLib has a lot of useful macros
# use fat LTO objects for static libraries
CFLAGS+=' -ffat-lto-objects -g3'
CXXFLAGS+=' -ffat-lto-objects -g3'
CFLAGS+=" -DG_DISABLE_CAST_CHECKS"
artix-meson glib build \
--default-library both \
-D glib_debug=disabled \
-D selinux=disabled \
-D sysprof=enabled \
-D man=true \
-D gtk_doc=true
meson compile -C build
}
check() {
meson test -C build --no-suite flaky --no-suite slow --print-errorlogs
}
package_glib2() {
depends+=(
libffi.so
libmount.so
)
provides+=(libg{lib,io,module,object,thread}-2.0.so)
optdepends=(
'gvfs: most gio functionality'
'libelf: gresource inspection tool'
'python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report'
)
meson install -C build --destdir "$pkgdir"
install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
install -D gio-querymodules.script "$pkgdir/usr/share/libalpm/scripts/gio-querymodules"
python -m compileall -d /usr/share/glib-2.0/codegen \
"$pkgdir/usr/share/glib-2.0/codegen"
python -O -m compileall -d /usr/share/glib-2.0/codegen \
"$pkgdir/usr/share/glib-2.0/codegen"
# Split docs
mkdir -p docs/usr/share
mv {"$pkgdir",docs}/usr/share/gtk-doc
}
package_glib2-docs() {
pkgdesc="Documentation for GLib"
depends=()
license+=(custom)
mv -t "$pkgdir" docs/*
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 glib/docs/reference/COPYING
}
# vim:set sw=2 sts=-1 et:

@ -0,0 +1,12 @@
[Trigger]
Type = Path
Operation = Install
Operation = Upgrade
Operation = Remove
Target = usr/lib/gio/modules/
[Action]
Description = Updating GIO module cache...
When = PostTransaction
Exec = /usr/share/libalpm/scripts/gio-querymodules
NeedsTargets

@ -0,0 +1,7 @@
#!/bin/bash
while read -r d; do
[[ -d $d ]] || continue
gio-querymodules "$d"
rmdir --ignore-fail-on-non-empty "$d"
done

@ -0,0 +1,12 @@
[Trigger]
Type = Path
Operation = Install
Operation = Upgrade
Operation = Remove
Target = usr/share/glib-2.0/schemas/*.gschema.xml
Target = usr/share/glib-2.0/schemas/*.gschema.override
[Action]
Description = Compiling GSettings XML schema files...
When = PostTransaction
Exec = /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
Loading…
Cancel
Save