glib: update to 2.70.0.
* patch out warning about deprecated schema paths
This commit is contained in:
parent
e5b3ed0d98
commit
efd60372ec
|
@ -79,11 +79,11 @@ libmagic.so.1 libmagic-5.12_1
|
|||
libbluetooth.so.3 libbluetooth-4.58_1
|
||||
libwmf-0.2.so.7 libwmf-0.2.8.4_1
|
||||
libwmflite-0.2.so.7 libwmf-0.2.8.4_1
|
||||
libgthread-2.0.so.0 glib-2.68.0_1
|
||||
libglib-2.0.so.0 glib-2.68.0_1
|
||||
libgmodule-2.0.so.0 glib-2.68.0_1
|
||||
libgio-2.0.so.0 glib-2.68.0_1
|
||||
libgobject-2.0.so.0 glib-2.68.0_1
|
||||
libgthread-2.0.so.0 glib-2.70.0_1
|
||||
libglib-2.0.so.0 glib-2.70.0_1
|
||||
libgmodule-2.0.so.0 glib-2.70.0_1
|
||||
libgio-2.0.so.0 glib-2.70.0_1
|
||||
libgobject-2.0.so.0 glib-2.70.0_1
|
||||
libatk-1.0.so.0 atk-1.26.0_1
|
||||
libpangocairo-1.0.so.0 pango-1.24.0_1
|
||||
libpangoft2-1.0.so.0 pango-1.24.0_1
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
diff --git gio/tests/meson.build gio/tests/meson.build
|
||||
index a926ae01a..c2093cf4e 100644
|
||||
--- a/gio/tests/meson.build
|
||||
+++ b/gio/tests/meson.build
|
||||
@@ -50,7 +50,6 @@ gio_tests = {
|
||||
|
@ -15,23 +13,33 @@ index a926ae01a..c2093cf4e 100644
|
|||
'network-monitor-race' : {},
|
||||
'permission' : {},
|
||||
- 'pollable' : {'dependencies' : [libdl_dep]},
|
||||
'power-profile-monitor' : {},
|
||||
'proxy-test' : {},
|
||||
'readwrite' : {},
|
||||
'simple-async-result' : {},
|
||||
@@ -567,7 +565,7 @@ if installed_tests_enabled
|
||||
endforeach
|
||||
@@ -151,7 +149,6 @@ endif
|
||||
# Test programs buildable on UNIX only
|
||||
if host_machine.system() != 'windows'
|
||||
gio_tests += {
|
||||
- 'file' : {},
|
||||
'gdbus-peer' : {
|
||||
'dependencies' : [libgdbus_example_objectmanager_dep],
|
||||
'install_rpath' : installed_tests_execdir
|
||||
@@ -737,12 +734,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
|
||||
test_resources_binary2,
|
||||
]
|
||||
endif
|
||||
-
|
||||
- gio_tests += {
|
||||
- 'resources' : {
|
||||
- 'extra_sources' : resources_extra_sources,
|
||||
- },
|
||||
- }
|
||||
endif
|
||||
|
||||
-if not meson.is_cross_build() or meson.has_exe_wrapper()
|
||||
+if false
|
||||
|
||||
plugin_resources_c = custom_target('plugin-resources.c',
|
||||
input : 'test4.gresource.xml',
|
||||
diff --git glib/tests/meson.build glib/tests/meson.build
|
||||
index c77ccdd14..b0dab692a 100644
|
||||
foreach test_name, extra_args : gio_tests
|
||||
--- a/glib/tests/meson.build
|
||||
+++ b/glib/tests/meson.build
|
||||
@@ -11,21 +11,13 @@ glib_tests = {
|
||||
@@ -11,21 +11,14 @@ glib_tests = {
|
||||
'cache' : {},
|
||||
'charset' : {},
|
||||
'checksum' : {},
|
||||
|
@ -46,14 +54,14 @@ index c77ccdd14..b0dab692a 100644
|
|||
'dir' : {},
|
||||
'environment' : {},
|
||||
- 'error' : {},
|
||||
- 'fileutils' : {},
|
||||
'fileutils' : {},
|
||||
- 'gdatetime' : {
|
||||
- 'suite' : ['slow'],
|
||||
- },
|
||||
'guuid' : {},
|
||||
'gvariant' : {
|
||||
'suite' : ['slow'],
|
||||
@@ -57,7 +49,6 @@ glib_tests = {
|
||||
@@ -57,7 +50,6 @@ glib_tests = {
|
||||
'mutex' : {},
|
||||
'node' : {},
|
||||
'once' : {},
|
||||
|
@ -61,6 +69,11 @@ index c77ccdd14..b0dab692a 100644
|
|||
'option-argv0' : {},
|
||||
'overflow' : {},
|
||||
'overflow-fallback' : {
|
||||
--
|
||||
2.31.0
|
||||
|
||||
@@ -102,7 +94,6 @@ glib_tests = {
|
||||
'thread' : {},
|
||||
'thread-pool' : {},
|
||||
'timeout' : {},
|
||||
- 'timer' : {},
|
||||
'tree' : {},
|
||||
'utf8-performance' : {},
|
||||
'utf8-pointer' : {},
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
--- a/gio/glib-compile-schemas.c
|
||||
+++ b/gio/glib-compile-schemas.c
|
||||
@@ -1232,19 +1232,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);
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'glib'
|
||||
pkgname=glib
|
||||
version=2.68.3
|
||||
revision=2
|
||||
version=2.70.0
|
||||
revision=1
|
||||
build_style=meson
|
||||
# static version is necessary for qemu-user-static;
|
||||
# also disable LTO, otherwise there are multiple failures when linking qemu
|
||||
|
@ -15,9 +15,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
|
|||
license="LGPL-2.1-or-later"
|
||||
homepage="https://wiki.gnome.org/Projects/GLib"
|
||||
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
|
||||
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-68/NEWS"
|
||||
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-70/NEWS"
|
||||
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
|
||||
checksum=e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138
|
||||
checksum=200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742
|
||||
|
||||
build_options="gtk_doc"
|
||||
desc_option_gtk_doc="Build GTK API docs"
|
||||
|
@ -31,7 +31,7 @@ do_check() {
|
|||
}
|
||||
|
||||
libglib-devel_package() {
|
||||
depends="${makedepends} glib>=${version}_${revision}"
|
||||
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
lib32files="/usr/lib/glib-2.0/include/glibconfig.h"
|
||||
pkg_install() {
|
||||
|
|
|
@ -1 +1 @@
|
|||
site="https://gitlab.gnome.org/GNOME/glib/-/tags"
|
||||
pattern="glib-[0-9]+\.[0-9]*[02468]\.[0-9]+"
|
||||
|
|
Loading…
Reference in a new issue