summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--user/glib/APKBUILD16
-rw-r--r--user/glib/broken-gio-tests.patch13
2 files changed, 9 insertions, 20 deletions
diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD
index f4fb51fd9..fe75d5aa8 100644
--- a/user/glib/APKBUILD
+++ b/user/glib/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=glib
-pkgver=2.58.1
+pkgver=2.60.0
pkgrel=0
pkgdesc="Common C routines used by Gtk+ and other libs"
url="https://developer.gnome.org/glib/"
@@ -9,9 +9,9 @@ arch="all"
options="!check" # Now requires D-Bus running.
license="LGPL-2.1+"
depends=""
-depends_dev="perl python3 attr-dev zlib-dev bzip2-dev libffi-dev util-linux-dev"
+depends_dev="perl python3 attr-dev bzip2-dev libffi-dev util-linux-dev"
checkdepends="tzdata shared-mime-info"
-makedepends="$depends_dev meson ninja pcre-dev xmlto"
+makedepends="$depends_dev meson ninja pcre-dev xmlto zlib-dev"
triggers="$pkgname.trigger=/usr/share/glib-2.0/schemas:/usr/lib/gio/modules"
source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
0001-gquark-fix-initialization-with-c-constructors.patch
@@ -25,7 +25,6 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve
subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev $pkgname-lang $pkgname-bash-completion:bashcomp:noarch"
prepare() {
- cd "$builddir"
default_prepare
mkdir -p dumb_meson
@@ -33,7 +32,10 @@ prepare() {
build() {
cd "$builddir"/dumb_meson
- meson --default-library=both -Dprefix=/usr -Dselinux=false -Dman=true ..
+ meson --default-library=both \
+ -Dprefix=/usr \
+ -Dselinux=disabled \
+ -Dman=true ..
ninja
}
@@ -78,9 +80,9 @@ bashcomp() {
[ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share
}
-sha512sums="115b74fcd43241e3c4b4babfb8170453b2a002ff02d5996f3c097876199cadccc1cf67b017c10c14c0d2a1bb4228027b743f4926bda0ef7d74012ed712ccd155 glib-2.58.1.tar.xz
+sha512sums="8184371aa5a8936ef86e578ee66307dadc351203ad0773c7669ab6d3f6bca49e7391ccafeb624d7bfe67f0d9aafe72799defee4660f254c3a3013c752e897e6c glib-2.60.0.tar.xz
32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch
-5bb7ee99cd19bc10f49b64c5bb9d79a0ee5bd918852f6351261bd5b3f3d8486c593bac6285da7e227579af9bac2b27c47251e4a62fd3af6cabe21f6b111e5e7a broken-gio-tests.patch
+657d3fdf7f8ac7edd5bae572d00497f2236fbe5a91a577f3cb7ceb2ccf067f2944918b2b90308fc1061f45daf3d4910067b98642383ce8761da2a1faff6e9b4f broken-gio-tests.patch
0f0a98784aeed92f33cd9239d2f668bdc6c09b84ed020825ae88f6aacf6a922152dc3e1384c40d9f30f54c5ab78fe17e0ee5c42b268b297b595d2a6cde5b8998 fix-spawn.patch
aa7444bbdf7b88798adc67c15cdb8b7459450c0b7357caea16b74462c5c9179ba80d4018b1e656e90a5e3be5b2e3c14e9b8c0ccbb2ee4d8c92dc8fa627518b84 i386-fpu-test.patch
34129be883011d266074783b7283af5c6a45055b85026b5aab47a3a0dfa1316a0a6502aaf78ab172356f67493ea7c4867b53279c25967a8cc5bee9320dbff96a musl-no-locale.patch
diff --git a/user/glib/broken-gio-tests.patch b/user/glib/broken-gio-tests.patch
index 4d365a0e8..0c1e3acb5 100644
--- a/user/glib/broken-gio-tests.patch
+++ b/user/glib/broken-gio-tests.patch
@@ -41,19 +41,6 @@ Requires dconf
Requires update-desktop-database
---- glib-2.52.1/gio/tests/desktop-app-info.c.old 2016-10-22 00:17:55.000000000 -0500
-+++ glib-2.52.1/gio/tests/desktop-app-info.c 2017-08-20 23:38:16.840439686 -0500
-@@ -761,6 +761,8 @@
- {
- gint result;
-
-+ printf("1..0\n");
-+ return 0;
- g_test_init (&argc, &argv, NULL);
-
- basedir = g_get_current_dir ();
-
-
--- glib-2.52.1/gio/tests/resources.c.old 2016-10-22 00:18:12.000000000 -0500
+++ glib-2.52.1/gio/tests/resources.c 2017-08-20 23:39:47.127025718 -0500
@@ -426,6 +426,7 @@