glib: Bump to 2.74.1

This commit is contained in:
Tee KOBAYASHI 2022-10-26 03:45:28 +09:00 committed by xtkoba
parent 7183af04a0
commit 4e4ac55c3d
2 changed files with 10 additions and 29 deletions

View File

@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Library providing core building blocks for libraries and
TERMUX_PKG_LICENSE="LGPL-2.1"
TERMUX_PKG_MAINTAINER="@termux"
_MAJOR_VERSION=2.74
TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0
TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1
TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/glib/${_MAJOR_VERSION}/glib-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
TERMUX_PKG_SHA256=0ab981618d1db47845e56417b0d7c123f81a3427b2b9c93f5a46ff5bbb964964
TERMUX_PKG_DEPENDS="libffi, libiconv, pcre2, libandroid-support, zlib"
TERMUX_PKG_BREAKS="glib-dev"
TERMUX_PKG_REPLACES="glib-dev"

View File

@ -1,30 +1,11 @@
--- ./glib/tests/meson.build.orig 2021-12-10 15:51:33.481723233 +0530
+++ ./glib/tests/meson.build 2021-12-10 15:52:09.931723220 +0530
@@ -158,27 +158,6 @@
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
@@ -204,7 +204,7 @@
'include' : {},
'unix' : {},
}
- if have_rtld_next
- glib_tests += {
- 'gutils-user-database' : {
- 'depends' : [
- shared_library('getpwuid-preload',
- 'getpwuid-preload.c',
- name_prefix : '',
- dependencies: libdl_dep,
- install_dir : installed_tests_execdir,
- install: installed_tests_enabled,
- ),
- ],
- 'env' : {
- 'LD_PRELOAD': '@0@/getpwuid-preload.so'.format(meson.current_build_dir()),
- },
- 'installed_tests_env' : {
- 'LD_PRELOAD': '@0@/getpwuid-preload.so'.format(installed_tests_execdir),
- },
- },
- }
- endif
endif
if installed_tests_enabled
- if have_rtld_next and get_option('default_library') != 'static'
+ if false
glib_tests += {
'gutils-user-database' : {
'depends' : [