archrelease: copy trunk to testing-x86_64
git-svn-id: file:///srv/repos/svn-packages/svn@407622 eb2447ed-0c53-47e4-bac8-5bc4a241df78
This commit is contained in:
parent
baad8a45f7
commit
fd56d98b3a
|
@ -0,0 +1,28 @@
|
|||
From a149bf2f9030168051942124536e303af8ba6176 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
||||
Date: Sun, 7 Feb 2021 23:32:40 +0100
|
||||
Subject: [PATCH] giochannel: Fix length_size bounds check
|
||||
|
||||
The inverted condition is an obvious error introduced by ecdf91400e9a.
|
||||
|
||||
Fixes https://gitlab.gnome.org/GNOME/glib/-/issues/2323
|
||||
---
|
||||
glib/giochannel.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/glib/giochannel.c b/glib/giochannel.c
|
||||
index 4c5e081ed..8516c0b5e 100644
|
||||
--- a/glib/giochannel.c
|
||||
+++ b/glib/giochannel.c
|
||||
@@ -899,7 +899,7 @@ g_io_channel_set_line_term (GIOChannel *channel,
|
||||
{
|
||||
/* FIXME: We’re constrained by line_term_len being a guint here */
|
||||
gsize length_size = strlen (line_term);
|
||||
- g_return_if_fail (length_size > G_MAXUINT);
|
||||
+ g_return_if_fail (length_size <= G_MAXUINT);
|
||||
length_unsigned = (guint) length_size;
|
||||
}
|
||||
|
||||
--
|
||||
2.30.0
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
|
||||
# Contributor: Jan de Groot <jgc@archlinux.org>
|
||||
|
||||
pkgbase=glib2
|
||||
pkgname=(glib2 glib2-docs)
|
||||
pkgver=2.66.6
|
||||
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)
|
||||
_commit=d5ec4f360fb5a2ef0df1862999f970dc67fa352c # tags/2.66.6^0
|
||||
source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
|
||||
0001-giochannel-Fix-length_size-bounds-check.patch
|
||||
noisy-glib-compile-schemas.diff
|
||||
glib-compile-schemas.hook gio-querymodules.{hook,script})
|
||||
sha256sums=('SKIP'
|
||||
'd2dbc00679545cedb33d0179d69a9be5c12b3f00d426e227ca07687384f3407c'
|
||||
'81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531'
|
||||
'64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25'
|
||||
'2a9f9b8235f48e3b7d0f6cfcbc76cd2116c45f28692cac4bd61074c495bd5eb7'
|
||||
'92d08db5aa30bda276bc3d718e7ff9dd01dc40dcab45b359182dcc290054e24e')
|
||||
|
||||
pkgver() {
|
||||
cd glib
|
||||
git describe --tags | sed 's/-/+/g'
|
||||
}
|
||||
|
||||
prepare() {
|
||||
cd glib
|
||||
|
||||
# https://bugs.archlinux.org/task/69569
|
||||
git apply -3 ../0001-giochannel-Fix-length_size-bounds-check.patch
|
||||
|
||||
# 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 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:
|
|
@ -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
|
|
@ -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);
|
||||
|
Loading…
Reference in New Issue