mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 14:43:52 +02:00
gobject-introspection: update to 1.80.0.
This commit is contained in:
parent
d12aff729e
commit
9f590b2416
2 changed files with 7 additions and 51 deletions
|
@ -1,46 +0,0 @@
|
||||||
From bf96a92ef263820d40e233814a46932cae00db41 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Xavier Claessens <xavier.claessens@collabora.com>
|
|
||||||
Date: Tue, 18 Jul 2023 11:07:59 -0400
|
|
||||||
Subject: [PATCH] gdump: Fix leaked io streams
|
|
||||||
|
|
||||||
This makes Meson unit test fail:
|
|
||||||
https://github.com/mesonbuild/meson/issues/11754
|
|
||||||
---
|
|
||||||
|
|
||||||
MR: https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/411
|
|
||||||
|
|
||||||
girepository/gdump.c | 10 ++++++----
|
|
||||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/girepository/gdump.c b/girepository/gdump.c
|
|
||||||
index 055a8b8c1..449b260a4 100644
|
|
||||||
--- a/girepository/gdump.c
|
|
||||||
+++ b/girepository/gdump.c
|
|
||||||
@@ -594,6 +594,7 @@ g_irepository_dump (const char *arg, GError **error)
|
|
||||||
if (output == NULL)
|
|
||||||
{
|
|
||||||
g_input_stream_close (G_INPUT_STREAM (input), NULL, NULL);
|
|
||||||
+ g_object_unref (input);
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -674,11 +675,12 @@ g_irepository_dump (const char *arg, GError **error)
|
|
||||||
ioerror = NULL;
|
|
||||||
else
|
|
||||||
ioerror = error;
|
|
||||||
- if (!g_input_stream_close (G_INPUT_STREAM (in), NULL, ioerror))
|
|
||||||
- return FALSE;
|
|
||||||
- if (!g_output_stream_close (G_OUTPUT_STREAM (output), NULL, ioerror))
|
|
||||||
- return FALSE;
|
|
||||||
+ caught_error |= !g_input_stream_close (G_INPUT_STREAM (in), NULL, ioerror);
|
|
||||||
+ caught_error |= !g_output_stream_close (G_OUTPUT_STREAM (output), NULL, ioerror);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ g_object_unref (in);
|
|
||||||
+ g_object_unref (output);
|
|
||||||
+
|
|
||||||
return !caught_error;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
# Template file for 'gobject-introspection'
|
# Template file for 'gobject-introspection'
|
||||||
|
# keep in sync with gobject-introspection-bootstrap
|
||||||
pkgname=gobject-introspection
|
pkgname=gobject-introspection
|
||||||
version=1.76.1
|
version=1.80.1
|
||||||
revision=3
|
revision=1
|
||||||
build_style=meson
|
build_style=meson
|
||||||
pycompile_dirs="usr/lib/${pkgname}/giscanner"
|
pycompile_dirs="usr/lib/gobject-introspection/giscanner"
|
||||||
hostmakedepends="flex pkg-config"
|
hostmakedepends="flex pkg-config"
|
||||||
# won't run tests with cairo to avoid cyclical deps
|
# won't run tests with cairo to avoid cyclical deps
|
||||||
makedepends="libffi-devel libglib-devel python3-devel python3-Mako
|
makedepends="libffi-devel libglib-devel python3-devel python3-Mako
|
||||||
|
@ -13,8 +14,9 @@ short_desc="Introspection system for GObject-based libraries"
|
||||||
maintainer="Enno Boland <gottox@voidlinux.org>"
|
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||||
license="GPL-2.0-or-later, LGPL-2.1-or-later"
|
license="GPL-2.0-or-later, LGPL-2.1-or-later"
|
||||||
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
|
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
|
||||||
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
|
changelog="https://gitlab.gnome.org/GNOME/gobject-introspection/-/raw/main/NEWS"
|
||||||
checksum=196178bf64345501dcdc4d8469b36aa6fe80489354efe71cb7cb8ab82a3738bf
|
distfiles="${GNOME_SITE}/gobject-introspection/${version%.*}/gobject-introspection-${version}.tar.xz"
|
||||||
|
checksum=a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8
|
||||||
python_version=3
|
python_version=3
|
||||||
|
|
||||||
if [ "$CROSS_BUILD" ]; then
|
if [ "$CROSS_BUILD" ]; then
|
||||||
|
|
Loading…
Add table
Reference in a new issue