diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk index b6c62d99f7..fe626f86a1 100644 --- a/packages/devel/glib/package.mk +++ b/packages/devel/glib/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="glib" -PKG_VERSION="2.61.1" -PKG_SHA256="f8d827955f0d8e197ff5c2105dd6ac4f6b63d15cd021eb1de66534c92a762161" +PKG_VERSION="2.63.4" +PKG_SHA256="d6ba2b0cde747367f43ad64751221d5beb95de1739a89856316df804e3447618" PKG_LICENSE="LGPL" PKG_SITE="http://www.gtk.org/" PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/$(get_pkg_version_maj_min)/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/devel/glib/patches/001_drop-build-tests.patch b/packages/devel/glib/patches/001_drop-build-tests.patch deleted file mode 100644 index dd0b5cb501..0000000000 --- a/packages/devel/glib/patches/001_drop-build-tests.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -Naur glib-2.61.1.org/gio/meson.build glib-2.61.1/gio/meson.build ---- glib-2.61.1.org/gio/meson.build 2019-05-24 19:00:33.000000000 +0200 -+++ glib-2.61.1/gio/meson.build 2019-08-26 09:21:14.893507207 +0200 -@@ -994,8 +994,3 @@ - endif - - subdir('fam') --# Don’t build the tests unless we can run them (either natively or in an exe wrapper) --build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) --if build_tests -- subdir('tests') --endif -\ Kein Zeilenumbruch am Dateiende. -diff -Naur glib-2.61.1.org/glib/meson.build glib-2.61.1/glib/meson.build ---- glib-2.61.1.org/glib/meson.build 2019-05-24 19:00:33.000000000 +0200 -+++ glib-2.61.1/glib/meson.build 2019-08-26 09:21:22.941561248 +0200 -@@ -459,8 +459,3 @@ - install : true) - endif - --# Don’t build the tests unless we can run them (either natively or in an exe wrapper) --build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) --if build_tests -- subdir('tests') --endif -\ Kein Zeilenumbruch am Dateiende. -diff -Naur glib-2.61.1.org/gobject/meson.build glib-2.61.1/gobject/meson.build ---- glib-2.61.1.org/gobject/meson.build 2019-05-24 19:00:33.000000000 +0200 -+++ glib-2.61.1/gobject/meson.build 2019-08-26 09:21:28.981601802 +0200 -@@ -166,8 +166,3 @@ - install : true) - endif - --# Don’t build the tests unless we can run them (either natively or in an exe wrapper) --build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) --if build_tests -- subdir('tests') --endif -\ Kein Zeilenumbruch am Dateiende. -diff -Naur glib-2.61.1.org/meson.build glib-2.61.1/meson.build ---- glib-2.61.1.org/meson.build 2019-05-24 19:00:33.000000000 +0200 -+++ glib-2.61.1/meson.build 2019-08-26 09:21:08.029461110 +0200 -@@ -2045,11 +2045,6 @@ - subdir('gmodule') - subdir('gio') - subdir('fuzzing') --# Don’t build the tests unless we can run them (either natively or in an exe wrapper) --build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) --if build_tests -- subdir('tests') --endif - - # xgettext is optional (on Windows for instance) - if find_program('xgettext', required : get_option('nls')).found() diff --git a/packages/devel/glib/patches/glib-001-drop-build-tests.patch b/packages/devel/glib/patches/glib-001-drop-build-tests.patch new file mode 100644 index 0000000000..0fb4db27e7 --- /dev/null +++ b/packages/devel/glib/patches/glib-001-drop-build-tests.patch @@ -0,0 +1,25 @@ +From 135f1c814b81b18d7546cb5d8b7246463e7704bd Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Sun, 26 Jan 2020 05:56:34 +0000 +Subject: [PATCH] tests are broken when cross-compiling so don't build them + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index cbacf0d..84d2c9e 100644 +--- a/meson.build ++++ b/meson.build +@@ -77,7 +77,7 @@ installed_tests_template = files('template.test.in') + installed_tests_template_tap = files('template-tap.test.in') + + # Don’t build the tests unless we can run them (either natively, in an exe wrapper, or by installing them for later use) +-build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) or installed_tests_enabled ++build_tests = false + + add_project_arguments('-D_GNU_SOURCE', language: 'c') + +-- +2.7.4 +