mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-07 23:53:51 +02:00
glib: update to 2.70.0.
* patch out warning about deprecated schema paths
This commit is contained in:
parent
e5b3ed0d98
commit
efd60372ec
5 changed files with 64 additions and 29 deletions
|
@ -79,11 +79,11 @@ libmagic.so.1 libmagic-5.12_1
|
||||||
libbluetooth.so.3 libbluetooth-4.58_1
|
libbluetooth.so.3 libbluetooth-4.58_1
|
||||||
libwmf-0.2.so.7 libwmf-0.2.8.4_1
|
libwmf-0.2.so.7 libwmf-0.2.8.4_1
|
||||||
libwmflite-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
|
libgthread-2.0.so.0 glib-2.70.0_1
|
||||||
libglib-2.0.so.0 glib-2.68.0_1
|
libglib-2.0.so.0 glib-2.70.0_1
|
||||||
libgmodule-2.0.so.0 glib-2.68.0_1
|
libgmodule-2.0.so.0 glib-2.70.0_1
|
||||||
libgio-2.0.so.0 glib-2.68.0_1
|
libgio-2.0.so.0 glib-2.70.0_1
|
||||||
libgobject-2.0.so.0 glib-2.68.0_1
|
libgobject-2.0.so.0 glib-2.70.0_1
|
||||||
libatk-1.0.so.0 atk-1.26.0_1
|
libatk-1.0.so.0 atk-1.26.0_1
|
||||||
libpangocairo-1.0.so.0 pango-1.24.0_1
|
libpangocairo-1.0.so.0 pango-1.24.0_1
|
||||||
libpangoft2-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
|
--- a/gio/tests/meson.build
|
||||||
+++ b/gio/tests/meson.build
|
+++ b/gio/tests/meson.build
|
||||||
@@ -50,7 +50,6 @@ gio_tests = {
|
@@ -50,7 +50,6 @@ gio_tests = {
|
||||||
|
@ -15,23 +13,33 @@ index a926ae01a..c2093cf4e 100644
|
||||||
'network-monitor-race' : {},
|
'network-monitor-race' : {},
|
||||||
'permission' : {},
|
'permission' : {},
|
||||||
- 'pollable' : {'dependencies' : [libdl_dep]},
|
- 'pollable' : {'dependencies' : [libdl_dep]},
|
||||||
|
'power-profile-monitor' : {},
|
||||||
'proxy-test' : {},
|
'proxy-test' : {},
|
||||||
'readwrite' : {},
|
'readwrite' : {},
|
||||||
'simple-async-result' : {},
|
@@ -151,7 +149,6 @@ endif
|
||||||
@@ -567,7 +565,7 @@ if installed_tests_enabled
|
# Test programs buildable on UNIX only
|
||||||
endforeach
|
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
|
endif
|
||||||
|
|
||||||
-if not meson.is_cross_build() or meson.has_exe_wrapper()
|
foreach test_name, extra_args : gio_tests
|
||||||
+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
|
|
||||||
--- a/glib/tests/meson.build
|
--- a/glib/tests/meson.build
|
||||||
+++ b/glib/tests/meson.build
|
+++ b/glib/tests/meson.build
|
||||||
@@ -11,21 +11,13 @@ glib_tests = {
|
@@ -11,21 +11,14 @@ glib_tests = {
|
||||||
'cache' : {},
|
'cache' : {},
|
||||||
'charset' : {},
|
'charset' : {},
|
||||||
'checksum' : {},
|
'checksum' : {},
|
||||||
|
@ -46,14 +54,14 @@ index c77ccdd14..b0dab692a 100644
|
||||||
'dir' : {},
|
'dir' : {},
|
||||||
'environment' : {},
|
'environment' : {},
|
||||||
- 'error' : {},
|
- 'error' : {},
|
||||||
- 'fileutils' : {},
|
'fileutils' : {},
|
||||||
- 'gdatetime' : {
|
- 'gdatetime' : {
|
||||||
- 'suite' : ['slow'],
|
- 'suite' : ['slow'],
|
||||||
- },
|
- },
|
||||||
'guuid' : {},
|
'guuid' : {},
|
||||||
'gvariant' : {
|
'gvariant' : {
|
||||||
'suite' : ['slow'],
|
'suite' : ['slow'],
|
||||||
@@ -57,7 +49,6 @@ glib_tests = {
|
@@ -57,7 +50,6 @@ glib_tests = {
|
||||||
'mutex' : {},
|
'mutex' : {},
|
||||||
'node' : {},
|
'node' : {},
|
||||||
'once' : {},
|
'once' : {},
|
||||||
|
@ -61,6 +69,11 @@ index c77ccdd14..b0dab692a 100644
|
||||||
'option-argv0' : {},
|
'option-argv0' : {},
|
||||||
'overflow' : {},
|
'overflow' : {},
|
||||||
'overflow-fallback' : {
|
'overflow-fallback' : {
|
||||||
--
|
@@ -102,7 +94,6 @@ glib_tests = {
|
||||||
2.31.0
|
'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'
|
# Template file for 'glib'
|
||||||
pkgname=glib
|
pkgname=glib
|
||||||
version=2.68.3
|
version=2.70.0
|
||||||
revision=2
|
revision=1
|
||||||
build_style=meson
|
build_style=meson
|
||||||
# static version is necessary for qemu-user-static;
|
# static version is necessary for qemu-user-static;
|
||||||
# also disable LTO, otherwise there are multiple failures when linking qemu
|
# 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"
|
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/main/NEWS"
|
#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"
|
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
|
||||||
checksum=e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138
|
checksum=200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742
|
||||||
|
|
||||||
build_options="gtk_doc"
|
build_options="gtk_doc"
|
||||||
desc_option_gtk_doc="Build GTK API docs"
|
desc_option_gtk_doc="Build GTK API docs"
|
||||||
|
@ -31,7 +31,7 @@ do_check() {
|
||||||
}
|
}
|
||||||
|
|
||||||
libglib-devel_package() {
|
libglib-devel_package() {
|
||||||
depends="${makedepends} glib>=${version}_${revision}"
|
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
|
||||||
short_desc+=" - development files"
|
short_desc+=" - development files"
|
||||||
lib32files="/usr/lib/glib-2.0/include/glibconfig.h"
|
lib32files="/usr/lib/glib-2.0/include/glibconfig.h"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
site="https://gitlab.gnome.org/GNOME/glib/-/tags"
|
pattern="glib-[0-9]+\.[0-9]*[02468]\.[0-9]+"
|
||||||
|
|
Loading…
Add table
Reference in a new issue