mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-07 23:53:51 +02:00
glib: update to 2.66.1, update broken tests.
Most test failures here are related to musl's support for locale. All these failures are brought up with upstream in https://gitlab.gnome.org/GNOME/glib/-/issues/2220
This commit is contained in:
parent
b1cf3d5b7f
commit
dbead43e3f
3 changed files with 42 additions and 57 deletions
|
@ -1,13 +0,0 @@
|
||||||
Since we ship gtk-doc patches from Debian, we can do this.
|
|
||||||
|
|
||||||
--- docs/reference/meson.build
|
|
||||||
+++ docs/reference/meson.build
|
|
||||||
@@ -52,7 +52,7 @@ if get_option('gtk_doc')
|
|
||||||
endif
|
|
||||||
# Check we have the minimum gtk-doc version required. Older versions won't
|
|
||||||
# generate correct documentation.
|
|
||||||
- dependency('gtk-doc', version : '>=1.32.1',
|
|
||||||
+ dependency('gtk-doc', version : '>=1.32',
|
|
||||||
fallback : ['gtk-doc', 'dummy_dep'],
|
|
||||||
default_options : ['tests=false'])
|
|
||||||
endif
|
|
|
@ -1,49 +1,38 @@
|
||||||
From 8020c2f669d45dd71b7e79bb088f87970b191001 Mon Sep 17 00:00:00 2001
|
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
|
||||||
From: Daniel Kolesa <daniel@octaforge.org>
|
index d8ebd56..be72f5c 100644
|
||||||
Date: Sun, 16 Aug 2020 05:13:18 +0200
|
|
||||||
Subject: [PATCH] disable broken tests
|
|
||||||
|
|
||||||
---
|
|
||||||
gio/tests/meson.build | 6 ------
|
|
||||||
glib/tests/meson.build | 3 ---
|
|
||||||
2 files changed, 9 deletions(-)
|
|
||||||
|
|
||||||
diff --git gio/tests/meson.build gio/tests/meson.build
|
|
||||||
index d8ebd56..ef06158 100644
|
|
||||||
--- gio/tests/meson.build
|
--- gio/tests/meson.build
|
||||||
+++ gio/tests/meson.build
|
+++ gio/tests/meson.build
|
||||||
@@ -39,7 +39,6 @@ gio_tests = {
|
@@ -35,7 +35,6 @@ gio_tests = {
|
||||||
|
'cancellable' : {},
|
||||||
|
'contexts' : {},
|
||||||
|
'contenttype' : {},
|
||||||
|
- 'converter-stream' : {},
|
||||||
'credentials' : {},
|
'credentials' : {},
|
||||||
'data-input-stream' : {},
|
'data-input-stream' : {},
|
||||||
'data-output-stream' : {},
|
'data-output-stream' : {},
|
||||||
- 'defaultvalue' : {'extra_sources' : [giotypefuncs_inc]},
|
@@ -550,7 +549,7 @@ if installed_tests_enabled
|
||||||
'fileattributematcher' : {},
|
endforeach
|
||||||
'filter-streams' : {},
|
endif
|
||||||
'giomodule' : {},
|
|
||||||
@@ -79,7 +78,6 @@ gio_tests = {
|
|
||||||
'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
|
|
||||||
'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']},
|
|
||||||
'tls-bindings' : {'extra_sources' : ['gtesttlsbackend.c']},
|
|
||||||
- 'gdbus-address-get-session' : {},
|
|
||||||
'win32-appinfo' : {},
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -136,10 +134,6 @@ endif
|
-if not meson.is_cross_build() or meson.has_exe_wrapper()
|
||||||
if host_machine.system() != 'windows'
|
+if false
|
||||||
gio_tests += {
|
|
||||||
'file' : {},
|
plugin_resources_c = custom_target('plugin-resources.c',
|
||||||
- 'gdbus-peer' : {
|
input : 'test4.gresource.xml',
|
||||||
- 'dependencies' : [libgdbus_example_objectmanager_dep],
|
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
|
||||||
- 'install_rpath' : installed_tests_execdir
|
index 6eb23e8..59807ff 100644
|
||||||
- },
|
|
||||||
'gdbus-peer-object-manager' : {},
|
|
||||||
'live-g-file' : {},
|
|
||||||
'socket-address' : {},
|
|
||||||
diff --git glib/tests/meson.build glib/tests/meson.build
|
|
||||||
index 6eb23e8..1f8cd5c 100644
|
|
||||||
--- glib/tests/meson.build
|
--- glib/tests/meson.build
|
||||||
+++ glib/tests/meson.build
|
+++ glib/tests/meson.build
|
||||||
@@ -20,9 +20,6 @@ glib_tests = {
|
@@ -11,18 +11,12 @@ glib_tests = {
|
||||||
|
'cache' : {},
|
||||||
|
'charset' : {},
|
||||||
|
'checksum' : {},
|
||||||
|
- 'collate' : {},
|
||||||
|
'cond' : {},
|
||||||
|
- 'convert' : {},
|
||||||
|
'dataset' : {},
|
||||||
|
- 'date' : {},
|
||||||
|
'dir' : {},
|
||||||
'environment' : {},
|
'environment' : {},
|
||||||
'error' : {},
|
'error' : {},
|
||||||
'fileutils' : {},
|
'fileutils' : {},
|
||||||
|
@ -53,6 +42,11 @@ index 6eb23e8..1f8cd5c 100644
|
||||||
'guuid' : {},
|
'guuid' : {},
|
||||||
'gvariant' : {
|
'gvariant' : {
|
||||||
'suite' : ['slow'],
|
'suite' : ['slow'],
|
||||||
--
|
@@ -54,7 +48,6 @@ glib_tests = {
|
||||||
2.28.0
|
'mutex' : {},
|
||||||
|
'node' : {},
|
||||||
|
'once' : {},
|
||||||
|
- 'option-context' : {},
|
||||||
|
'option-argv0' : {},
|
||||||
|
'overflow' : {},
|
||||||
|
'overflow-fallback' : {
|
||||||
|
|
|
@ -1,20 +1,20 @@
|
||||||
# Template file for 'glib'
|
# Template file for 'glib'
|
||||||
pkgname=glib
|
pkgname=glib
|
||||||
version=2.66.0
|
version=2.66.1
|
||||||
revision=1
|
revision=1
|
||||||
build_style=meson
|
build_style=meson
|
||||||
configure_args="-Dfam=false -Dman=true -Dselinux=disabled
|
configure_args="-Dfam=false -Dman=true -Dselinux=disabled
|
||||||
$(vopt_bool gtk_doc gtk_doc)"
|
$(vopt_bool gtk_doc gtk_doc)"
|
||||||
hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
|
hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
|
||||||
makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
|
makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
|
||||||
checkdepends="desktop-file-utils shared-mime-info tzdata"
|
checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
|
||||||
short_desc="GNU library of C routines"
|
short_desc="GNU library of C routines"
|
||||||
maintainer="Enno Boland <gottox@voidlinux.org>"
|
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||||
license="LGPL-2.1-or-later"
|
license="LGPL-2.1-or-later"
|
||||||
homepage="https://wiki.gnome.org/Projects/GLib"
|
homepage="https://wiki.gnome.org/Projects/GLib"
|
||||||
changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
|
changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
|
||||||
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
|
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
|
||||||
checksum=c5a66bf143065648c135da4c943d2ac23cce15690fc91c358013b2889111156c
|
checksum=a269ffe69fbcc3a21ff1acb1b6146b2a5723499d6e2de33ae16ccb6d2438ef60
|
||||||
|
|
||||||
build_options="gtk_doc"
|
build_options="gtk_doc"
|
||||||
desc_option_gtk_doc="Build GTK API docs"
|
desc_option_gtk_doc="Build GTK API docs"
|
||||||
|
@ -23,6 +23,10 @@ if [ -z "$CROSS_BUILD" ]; then
|
||||||
build_options_default+=" gtk_doc"
|
build_options_default+=" gtk_doc"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
do_check() {
|
||||||
|
dbus-run-session ninja -C build test
|
||||||
|
}
|
||||||
|
|
||||||
libglib-devel_package() {
|
libglib-devel_package() {
|
||||||
depends="${makedepends} glib>=${version}_${revision}"
|
depends="${makedepends} glib>=${version}_${revision}"
|
||||||
short_desc+=" - development files"
|
short_desc+=" - development files"
|
||||||
|
|
Loading…
Add table
Reference in a new issue