summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-02-26 02:11:48 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-02-26 02:11:48 +0000
commitd122ae9a2815d838ebcb16644a28141ebff20b15 (patch)
treec49b3f4572e86d4981cc4b4a34ececbc14daf943 /user
parent3b36a910e823af1a92dfca8ac95c363adc8c235f (diff)
downloadpackages-d122ae9a2815d838ebcb16644a28141ebff20b15.tar.gz
packages-d122ae9a2815d838ebcb16644a28141ebff20b15.tar.bz2
packages-d122ae9a2815d838ebcb16644a28141ebff20b15.tar.xz
packages-d122ae9a2815d838ebcb16644a28141ebff20b15.zip
user/glib: Bump to 2.62.5
Diffstat (limited to 'user')
-rw-r--r--user/glib/APKBUILD6
-rw-r--r--user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch4
2 files changed, 5 insertions, 5 deletions
diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD
index c5cf7bece..f0c35dca1 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.62.4
+pkgver=2.62.5
pkgrel=0
pkgdesc="Common C routines used by Gtk+ and other libs"
url="https://developer.gnome.org/glib/"
@@ -75,11 +75,11 @@ bashcomp() {
[ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share
}
-sha512sums="d54411c664281bb6770f57e58c69ac28d1eb76802cb73e9a2bca94b9d5d62441d80cf78d19d1124dadddcce385d3dff3824c019dc00ed2b10af48a69006766fa glib-2.62.4.tar.xz
+sha512sums="2f99422ff8245524aabdb52f5d388ef4bde0fc075eab24499b4023f6ca143b80a74e265117b9e7a9de68a347b0c7eaa8655c836d7bbb63d54cad5c6dda630371 glib-2.62.5.tar.xz
32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch
657d3fdf7f8ac7edd5bae572d00497f2236fbe5a91a577f3cb7ceb2ccf067f2944918b2b90308fc1061f45daf3d4910067b98642383ce8761da2a1faff6e9b4f broken-gio-tests.patch
0f0a98784aeed92f33cd9239d2f668bdc6c09b84ed020825ae88f6aacf6a922152dc3e1384c40d9f30f54c5ab78fe17e0ee5c42b268b297b595d2a6cde5b8998 fix-spawn.patch
aa7444bbdf7b88798adc67c15cdb8b7459450c0b7357caea16b74462c5c9179ba80d4018b1e656e90a5e3be5b2e3c14e9b8c0ccbb2ee4d8c92dc8fa627518b84 i386-fpu-test.patch
34129be883011d266074783b7283af5c6a45055b85026b5aab47a3a0dfa1316a0a6502aaf78ab172356f67493ea7c4867b53279c25967a8cc5bee9320dbff96a musl-no-locale.patch
56c10a0f64cbd8ce584d428f818e7e678fdeb40a32df792843208ddfa3135d362cc2077bc9fe3bfebe13ee6af0ecf6403a593ad727e0a92276074a17a9c7029c ridiculous-strerror-nonconformance.patch
-d788005bc92ed1510235b77a9a26eecd78840a3e915a64e53e1e93cd1efaaeb1b9b5edb115f41352fcbdab10006b91b4aae7af20184c904e869a0d6893080368 meson-sucks-and-i-hate-you-so-much-right-now.patch"
+dc1f0232433f6fb2cb2edebc8f5e15b4dcca557191af0a0ca45ff5cc5d109362e1dde4a532b08423e74c6b716801a516ad4ea105435e1332cd1a42f8131df46b meson-sucks-and-i-hate-you-so-much-right-now.patch"
diff --git a/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch b/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch
index ba38bdec2..1e63ac0f4 100644
--- a/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch
+++ b/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch
@@ -1,8 +1,8 @@
--- glib-2.58.0/glib/libcharset/meson.build.old 2018-08-30 17:12:09.000000000 +0000
+++ glib-2.58.0/glib/libcharset/meson.build 2018-09-10 03:42:01.930000000 +0000
-@@ -6,4 +6,5 @@
+@@ -1,4 +1,5 @@
charset_lib = static_library('charset', 'localcharset.c',
include_directories : configinc,
pic : true,
+ install : true,
- c_args : [ '-DGLIB_CHARSETALIAS_DIR="@0@"'.format(charsetalias_dir) ] + glib_hidden_visibility_args)
+ c_args : [ '-DGLIB_CHARSETALIAS_DIR="@0@"'.format(glib_charsetaliasdir) ] + glib_hidden_visibility_args)