user/glib: [PD] bump/take/fix tests/langdir gttiny

3 files changed, 23 insertions, 40 deletions

diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD
index 89a98754f..bab71659e 100644
--- a/user/glib/APKBUILD
+++ b/user/glib/APKBUILD
@@ -1,19 +1,19 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=glib
-pkgver=2.54.2
-pkgrel=1
+pkgver=2.56.1
+pkgrel=0
 pkgdesc="Common C routines used by Gtk+ and other libs"
 url="https://developer.gnome.org/glib/"
 arch="all"
-license="GPL"
+options="!checkroot"
+license="LGPL-2.1+"
 depends=
 triggers="$pkgname.trigger=/usr/share/glib-2.0/schemas:/usr/lib/gio/modules"
-depends_dev="perl python3 attr-dev gettext-dev zlib-dev bzip2-dev libffi-dev
-	util-linux-dev"
+depends_dev="perl python3 attr-dev zlib-dev bzip2-dev libffi-dev util-linux-dev"
 makedepends="$depends_dev pcre-dev xmlto"
-checkdepends="tzdata"
-options="!checkroot"
+checkdepends="tzdata shared-mime-info"
+langdir="/usr/lib/locale"
 source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
 	0001-gquark-fix-initialization-with-c-constructors.patch
 	broken-gio-tests.patch
@@ -24,7 +24,6 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve
 	thread-test-fix.patch
 	"
 subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev $pkgname-lang $pkgname-bash-completion:bashcomp:noarch"
-builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$builddir"
@@ -54,7 +53,8 @@ build() {
 
 check() {
 	cd "$builddir"
-	make check
+	# workaround if a user builds it on a computer running X11
+	DISPLAY= make check
 }
 
 package() {
@@ -79,7 +79,6 @@ dev() {
 
 static() {
 	pkgdesc="glib static libraries"
-	depends="gettext-static"
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
 }
@@ -93,11 +92,11 @@ bashcomp() {
 	[ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share
 }
 
-sha512sums="09ee6fa3a6f3f15af229bd789bef536e3570f36d1e4ce624a57e97c4040577f6baccd6ab5746257863ccf7173b558cfa753951d562a278f854e52604104ba7ee  glib-2.54.2.tar.xz
+sha512sums="7e96cc23f3fa42a41b1974ae8fa2a7b123449643f265763d464620afcb011668e2de013ed2a6e5f13b6bd1bf3ab8eab43c05bf4a8ee0d99b7808767ab4fa69f4  glib-2.56.1.tar.xz
 32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b  0001-gquark-fix-initialization-with-c-constructors.patch
-9bf99de4672765704759098c883cfc4d2747cf10d9d568ae97134806a089e4bebae57886bae45dcc53694e0190248abe6ae52cc38dc742cd754d352406ac0680  broken-gio-tests.patch
+5bb7ee99cd19bc10f49b64c5bb9d79a0ee5bd918852f6351261bd5b3f3d8486c593bac6285da7e227579af9bac2b27c47251e4a62fd3af6cabe21f6b111e5e7a  broken-gio-tests.patch
 0f0a98784aeed92f33cd9239d2f668bdc6c09b84ed020825ae88f6aacf6a922152dc3e1384c40d9f30f54c5ab78fe17e0ee5c42b268b297b595d2a6cde5b8998  fix-spawn.patch
 aa7444bbdf7b88798adc67c15cdb8b7459450c0b7357caea16b74462c5c9179ba80d4018b1e656e90a5e3be5b2e3c14e9b8c0ccbb2ee4d8c92dc8fa627518b84  i386-fpu-test.patch
-10d23961072e3d8c8bbe5ee9a6b6ad709734690485c7148f1f8a2081a3ecc06cc3e3ff02ea870e1b429cd8464df6ef6e9f266148010d889fd187f4e411f65bab  musl-no-locale.patch
+34129be883011d266074783b7283af5c6a45055b85026b5aab47a3a0dfa1316a0a6502aaf78ab172356f67493ea7c4867b53279c25967a8cc5bee9320dbff96a  musl-no-locale.patch
 56c10a0f64cbd8ce584d428f818e7e678fdeb40a32df792843208ddfa3135d362cc2077bc9fe3bfebe13ee6af0ecf6403a593ad727e0a92276074a17a9c7029c  ridiculous-strerror-nonconformance.patch
 0cebf9cbf87a92c3160054eb30189a827847f5820a8b90f4842b4ad5ab5cc343ba06e5f55214864bd0f0d5a21e55ec5e7f35c66207e77b1496142b7ee0c75567  thread-test-fix.patch"
diff --git a/user/glib/broken-gio-tests.patch b/user/glib/broken-gio-tests.patch
index d7006db87..4d365a0e8 100644
--- a/user/glib/broken-gio-tests.patch
+++ b/user/glib/broken-gio-tests.patch
@@ -12,32 +12,6 @@ Requires update-desktop-database
    g_test_add_func ("/appinfo/supported-types", test_supported_types);
  
 
-Requires shared-mime-info
---- glib-2.53.7/gio/tests/contenttype.c.old	2017-07-13 18:03:39.000000000 -0500
-+++ glib-2.53.7/gio/tests/contenttype.c	2017-09-05 21:41:46.312547646 -0500
-@@ -345,9 +345,9 @@
- 
-   g_test_bug_base ("http://bugzilla.gnome.org/");
- 
--  g_test_add_func ("/contenttype/guess", test_guess);
-+  //g_test_add_func ("/contenttype/guess", test_guess);
-   g_test_add_func ("/contenttype/unknown", test_unknown);
--  g_test_add_func ("/contenttype/subtype", test_subtype);
-+  /*g_test_add_func ("/contenttype/subtype", test_subtype);
-   g_test_add_func ("/contenttype/list", test_list);
-   g_test_add_func ("/contenttype/executable", test_executable);
-   g_test_add_func ("/contenttype/description", test_description);
-@@ -355,7 +355,7 @@
-   g_test_add_func ("/contenttype/symbolic-icon", test_symbolic_icon);
-   g_test_add_func ("/contenttype/tree", test_tree);
-   g_test_add_func ("/contenttype/test_type_is_a_special_case",
--                   test_type_is_a_special_case);
-+                   test_type_is_a_special_case);*/
- 
-   return g_test_run ();
- }
-
-
 Requires working iconv
 --- glib-2.52.1/gio/tests/converter-stream.c.old	2016-10-22 00:18:11.000000000 -0500
 +++ glib-2.52.1/gio/tests/converter-stream.c	2017-08-20 23:21:31.711358101 -0500
diff --git a/user/glib/musl-no-locale.patch b/user/glib/musl-no-locale.patch
index 4b36b0b2e..33b3c32df 100644
--- a/user/glib/musl-no-locale.patch
+++ b/user/glib/musl-no-locale.patch
@@ -53,3 +53,13 @@
  fail ()
  {
    echo "Test failed: $*"
+--- glib-2.56.1/glib/tests/gdatetime.c.old	2018-07-02 21:11:49.890000000 -0500
++++ glib-2.56.1/glib/tests/gdatetime.c	2018-07-02 21:19:30.340000000 -0500
+@@ -2329,7 +2329,6 @@
+   g_test_add_func ("/GDateTime/printf", test_GDateTime_printf);
+   g_test_add_func ("/GDateTime/non_utf8_printf", test_non_utf8_printf);
+   g_test_add_func ("/GDateTime/strftime", test_strftime);
+-  g_test_add_func ("/GDateTime/strftime/error_handling", test_GDateTime_strftime_error_handling);
+   g_test_add_func ("/GDateTime/modifiers", test_modifiers);
+   g_test_add_func ("/GDateTime/month_names", test_month_names);
+   g_test_add_func ("/GDateTime/to_local", test_GDateTime_to_local);