mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-26 23:42:57 +02:00
glib: update to 2.66.6.
- build static libraries. - remove LTO from build to avoid issues when linking qemu-user-static. Thanks to leah for finding the fix. - disable fileutils tests, broken on container where user is root.
This commit is contained in:
parent
fa073932ad
commit
d17da50ead
2 changed files with 12 additions and 9 deletions
|
@ -1,4 +1,4 @@
|
||||||
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
|
diff --git gio/tests/meson.build gio/tests/meson.build
|
||||||
index d8ebd56..be72f5c 100644
|
index d8ebd56..be72f5c 100644
|
||||||
--- gio/tests/meson.build
|
--- gio/tests/meson.build
|
||||||
+++ gio/tests/meson.build
|
+++ gio/tests/meson.build
|
||||||
|
@ -19,11 +19,11 @@ index d8ebd56..be72f5c 100644
|
||||||
|
|
||||||
plugin_resources_c = custom_target('plugin-resources.c',
|
plugin_resources_c = custom_target('plugin-resources.c',
|
||||||
input : 'test4.gresource.xml',
|
input : 'test4.gresource.xml',
|
||||||
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
|
diff --git glib/tests/meson.build glib/tests/meson.build
|
||||||
index 6eb23e8..59807ff 100644
|
index 6eb23e8..d7aacfa 100644
|
||||||
--- glib/tests/meson.build
|
--- glib/tests/meson.build
|
||||||
+++ glib/tests/meson.build
|
+++ glib/tests/meson.build
|
||||||
@@ -11,18 +11,12 @@ glib_tests = {
|
@@ -11,18 +11,11 @@ glib_tests = {
|
||||||
'cache' : {},
|
'cache' : {},
|
||||||
'charset' : {},
|
'charset' : {},
|
||||||
'checksum' : {},
|
'checksum' : {},
|
||||||
|
@ -35,14 +35,14 @@ index 6eb23e8..59807ff 100644
|
||||||
'dir' : {},
|
'dir' : {},
|
||||||
'environment' : {},
|
'environment' : {},
|
||||||
'error' : {},
|
'error' : {},
|
||||||
'fileutils' : {},
|
- 'fileutils' : {},
|
||||||
- 'gdatetime' : {
|
- 'gdatetime' : {
|
||||||
- 'suite' : ['slow'],
|
- 'suite' : ['slow'],
|
||||||
- },
|
- },
|
||||||
'guuid' : {},
|
'guuid' : {},
|
||||||
'gvariant' : {
|
'gvariant' : {
|
||||||
'suite' : ['slow'],
|
'suite' : ['slow'],
|
||||||
@@ -54,7 +48,6 @@ glib_tests = {
|
@@ -54,7 +47,6 @@ glib_tests = {
|
||||||
'mutex' : {},
|
'mutex' : {},
|
||||||
'node' : {},
|
'node' : {},
|
||||||
'once' : {},
|
'once' : {},
|
||||||
|
|
|
@ -1,10 +1,12 @@
|
||||||
# Template file for 'glib'
|
# Template file for 'glib'
|
||||||
pkgname=glib
|
pkgname=glib
|
||||||
version=2.66.2
|
version=2.66.6
|
||||||
revision=1
|
revision=1
|
||||||
build_style=meson
|
build_style=meson
|
||||||
|
# static version is necessary for qemu-user-static;
|
||||||
|
# also disable LTO, otherwise there are multiple failures when linking qemu
|
||||||
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) --default-library=both -Db_lto=false"
|
||||||
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 dbus"
|
checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
|
||||||
|
@ -14,7 +16,7 @@ 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=ec390bed4e8dd0f89e918f385e8d4cfd7470b1ef7c1ce93ec5c4fc6e3c6a17c4
|
checksum=80fff9c63d2725834328071c42003c311f77f91caf2285195c587c62f5638329
|
||||||
|
|
||||||
build_options="gtk_doc"
|
build_options="gtk_doc"
|
||||||
desc_option_gtk_doc="Build GTK API docs"
|
desc_option_gtk_doc="Build GTK API docs"
|
||||||
|
@ -36,6 +38,7 @@ libglib-devel_package() {
|
||||||
vmove usr/lib/glib-2.0
|
vmove usr/lib/glib-2.0
|
||||||
vmove usr/lib/pkgconfig
|
vmove usr/lib/pkgconfig
|
||||||
vmove "usr/lib/*.so"
|
vmove "usr/lib/*.so"
|
||||||
|
vmove "usr/lib/*.a"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue