diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-05-06 19:36:00 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-05-06 19:36:00 +0000 |
| commit | bbcfbb2837243b567861c0f37961bec1cb3cb17e (patch) | |
| tree | 56b8d499bce8d31aa2b32adfb8c21274d008fedd | |
| parent | bb819466454cd0e628da5edc60264f43a77fd4f7 (diff) | |
| download | packages-bbcfbb2837243b567861c0f37961bec1cb3cb17e.tar.gz packages-bbcfbb2837243b567861c0f37961bec1cb3cb17e.tar.bz2 packages-bbcfbb2837243b567861c0f37961bec1cb3cb17e.tar.xz packages-bbcfbb2837243b567861c0f37961bec1cb3cb17e.zip | |
user/glib: bump to 2.60.2, fix meson builddir crap
| -rw-r--r-- | user/glib/APKBUILD | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD index 03962e6b8..52a6a4c3c 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.60.1 +pkgver=2.60.2 pkgrel=0 pkgdesc="Common C routines used by Gtk+ and other libs" url="https://developer.gnome.org/glib/" @@ -24,30 +24,21 @@ 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() { - default_prepare - - mkdir -p dumb_meson -} - build() { - cd "$builddir"/dumb_meson meson --default-library=both \ -Dprefix=/usr \ -Dselinux=disabled \ - -Dman=true .. - ninja + -Dman=true build + ninja -C build } check() { - cd "$builddir"/dumb_meson # workaround if a user builds it on a computer running X11 - DISPLAY= ninja test + DISPLAY= ninja -C build test } package() { - cd "$builddir"/dumb_meson - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install rm -rf "$pkgdir"/usr/lib/charset.alias } @@ -80,7 +71,7 @@ bashcomp() { [ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share } -sha512sums="bcbc9fa04b56b4c54ceed5cef992f55852d8e0fe1a0d20830fa87f574b49d5bf6796a7241e3b246a1c5d1a958bef194eb96fb8e0ee054e6abcf3dced844269d2 glib-2.60.1.tar.xz +sha512sums="38479c8e48fda5adaa5f7ac8e1f09c184be48adf38ab614eb69f8e11301a1b0235767abf556e09fd4d5df345822db5b3dc85d1c53d05fdba1c1b40f75b61777b glib-2.60.2.tar.xz 32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch 657d3fdf7f8ac7edd5bae572d00497f2236fbe5a91a577f3cb7ceb2ccf067f2944918b2b90308fc1061f45daf3d4910067b98642383ce8761da2a1faff6e9b4f broken-gio-tests.patch 0f0a98784aeed92f33cd9239d2f668bdc6c09b84ed020825ae88f6aacf6a922152dc3e1384c40d9f30f54c5ab78fe17e0ee5c42b268b297b595d2a6cde5b8998 fix-spawn.patch |