Date: Thursday, March 18, 2021 @ 17:35:04 Author: heftig Revision: 410239
archrelease: copy trunk to testing-x86_64 Added: glib2/repos/testing-x86_64/PKGBUILD (from rev 410238, glib2/trunk/PKGBUILD) glib2/repos/testing-x86_64/gio-querymodules.hook (from rev 410238, glib2/trunk/gio-querymodules.hook) glib2/repos/testing-x86_64/gio-querymodules.script (from rev 410238, glib2/trunk/gio-querymodules.script) glib2/repos/testing-x86_64/glib-compile-schemas.hook (from rev 410238, glib2/trunk/glib-compile-schemas.hook) glib2/repos/testing-x86_64/noisy-glib-compile-schemas.diff (from rev 410238, glib2/trunk/noisy-glib-compile-schemas.diff) Deleted: glib2/repos/testing-x86_64/PKGBUILD glib2/repos/testing-x86_64/gio-querymodules.hook glib2/repos/testing-x86_64/gio-querymodules.script glib2/repos/testing-x86_64/glib-compile-schemas.hook glib2/repos/testing-x86_64/noisy-glib-compile-schemas.diff ---------------------------------+ PKGBUILD | 175 +++++++++++++++++++------------------- gio-querymodules.hook | 24 ++--- gio-querymodules.script | 14 +-- glib-compile-schemas.hook | 24 ++--- noisy-glib-compile-schemas.diff | 48 +++++----- 5 files changed, 143 insertions(+), 142 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-03-18 17:34:49 UTC (rev 410238) +++ PKGBUILD 2021-03-18 17:35:04 UTC (rev 410239) @@ -1,87 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> -# Contributor: Jan de Groot <j...@archlinux.org> - -pkgbase=glib2 -pkgname=(glib2 glib2-docs) -pkgver=2.68.0 -pkgrel=1 -pkgdesc="Low level core library" -url="https://wiki.gnome.org/Projects/GLib" -license=(LGPL) -arch=(x86_64) -depends=(pcre libffi util-linux-libs zlib) -makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux - meson dbus sysprof) -checkdepends=(desktop-file-utils) -source=("git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=$pkgver" - noisy-glib-compile-schemas.diff - glib-compile-schemas.hook gio-querymodules.{hook,script}) -sha256sums=('SKIP' - '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531' - '64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25' - '2a9f9b8235f48e3b7d0f6cfcbc76cd2116c45f28692cac4bd61074c495bd5eb7' - '92d08db5aa30bda276bc3d718e7ff9dd01dc40dcab45b359182dcc290054e24e') - -pkgver() { - cd glib - git describe --tags | sed 's/-/+/g' -} - -prepare() { - cd glib - - # Suppress noise from glib-compile-schemas.hook - git apply -3 ../noisy-glib-compile-schemas.diff -} - -build() { - CFLAGS+=" -DG_DISABLE_CAST_CHECKS" - arch-meson glib build \ - -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+=(libmount.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') - - DESTDIR="$pkgdir" meson install -C build - - install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook - install -D gio-querymodules.script "$pkgdir/usr/share/libalpm/scripts/gio-querymodules" - - # Avoid a dep on sysprof - sed -i 's/, sysprof-capture-4//' "$pkgdir"/usr/lib/pkgconfig/*.pc - - export PYTHONHASHSEED=0 - 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 et: Copied: glib2/repos/testing-x86_64/PKGBUILD (from rev 410238, glib2/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-03-18 17:35:04 UTC (rev 410239) @@ -0,0 +1,88 @@ +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> +# Contributor: Jan de Groot <j...@archlinux.org> + +pkgbase=glib2 +pkgname=(glib2 glib2-docs) +pkgver=2.68.0 +pkgrel=2 +pkgdesc="Low level core library" +url="https://wiki.gnome.org/Projects/GLib" +license=(LGPL) +arch=(x86_64) +depends=(pcre libffi util-linux-libs zlib) +makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux + meson dbus sysprof) +checkdepends=(desktop-file-utils) +source=("git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=$pkgver" + noisy-glib-compile-schemas.diff + glib-compile-schemas.hook gio-querymodules.{hook,script}) +sha256sums=('SKIP' + '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531' + '64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25' + '2a9f9b8235f48e3b7d0f6cfcbc76cd2116c45f28692cac4bd61074c495bd5eb7' + '92d08db5aa30bda276bc3d718e7ff9dd01dc40dcab45b359182dcc290054e24e') + +pkgver() { + cd glib + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd glib + + # Suppress noise from glib-compile-schemas.hook + git apply -3 ../noisy-glib-compile-schemas.diff +} + +build() { + CFLAGS+=" -DG_DISABLE_CAST_CHECKS" + arch-meson glib build \ + -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+=(libmount.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') + + DESTDIR="$pkgdir" meson install -C build + + install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook + install -D gio-querymodules.script "$pkgdir/usr/share/libalpm/scripts/gio-querymodules" + + # Avoid a dep on sysprof + sed -re '/^Requires\.private:/s/,? *sysprof-capture-[^,]*(,|$)/\1/' \ + -i "$pkgdir"/usr/lib/pkgconfig/*.pc + + export PYTHONHASHSEED=0 + 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 et: Deleted: gio-querymodules.hook =================================================================== --- gio-querymodules.hook 2021-03-18 17:34:49 UTC (rev 410238) +++ gio-querymodules.hook 2021-03-18 17:35:04 UTC (rev 410239) @@ -1,12 +0,0 @@ -[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 Copied: glib2/repos/testing-x86_64/gio-querymodules.hook (from rev 410238, glib2/trunk/gio-querymodules.hook) =================================================================== --- gio-querymodules.hook (rev 0) +++ gio-querymodules.hook 2021-03-18 17:35:04 UTC (rev 410239) @@ -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 Deleted: gio-querymodules.script =================================================================== --- gio-querymodules.script 2021-03-18 17:34:49 UTC (rev 410238) +++ gio-querymodules.script 2021-03-18 17:35:04 UTC (rev 410239) @@ -1,7 +0,0 @@ -#!/bin/bash - -while read -r d; do - [[ -d $d ]] || continue - gio-querymodules "$d" - rmdir --ignore-fail-on-non-empty "$d" -done Copied: glib2/repos/testing-x86_64/gio-querymodules.script (from rev 410238, glib2/trunk/gio-querymodules.script) =================================================================== --- gio-querymodules.script (rev 0) +++ gio-querymodules.script 2021-03-18 17:35:04 UTC (rev 410239) @@ -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 Deleted: glib-compile-schemas.hook =================================================================== --- glib-compile-schemas.hook 2021-03-18 17:34:49 UTC (rev 410238) +++ glib-compile-schemas.hook 2021-03-18 17:35:04 UTC (rev 410239) @@ -1,12 +0,0 @@ -[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 Copied: glib2/repos/testing-x86_64/glib-compile-schemas.hook (from rev 410238, glib2/trunk/glib-compile-schemas.hook) =================================================================== --- glib-compile-schemas.hook (rev 0) +++ glib-compile-schemas.hook 2021-03-18 17:35:04 UTC (rev 410239) @@ -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 Deleted: noisy-glib-compile-schemas.diff =================================================================== --- noisy-glib-compile-schemas.diff 2021-03-18 17:34:49 UTC (rev 410238) +++ noisy-glib-compile-schemas.diff 2021-03-18 17:35:04 UTC (rev 410239) @@ -1,24 +0,0 @@ -diff --git i/gio/glib-compile-schemas.c w/gio/glib-compile-schemas.c -index b8de0907248f6860..130f89b1728f7932 100644 ---- i/gio/glib-compile-schemas.c -+++ w/gio/glib-compile-schemas.c -@@ -1219,19 +1219,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); - Copied: glib2/repos/testing-x86_64/noisy-glib-compile-schemas.diff (from rev 410238, glib2/trunk/noisy-glib-compile-schemas.diff) =================================================================== --- noisy-glib-compile-schemas.diff (rev 0) +++ noisy-glib-compile-schemas.diff 2021-03-18 17:35:04 UTC (rev 410239) @@ -0,0 +1,24 @@ +diff --git i/gio/glib-compile-schemas.c w/gio/glib-compile-schemas.c +index b8de0907248f6860..130f89b1728f7932 100644 +--- i/gio/glib-compile-schemas.c ++++ w/gio/glib-compile-schemas.c +@@ -1219,19 +1219,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); +