From ffc043b6e1b3ff6ab92526136be61ecc6b7de736 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Mon, 10 Sep 2018 03:43:47 +0000 Subject: user/glib: die in a *fire*, meson --- user/glib/APKBUILD | 4 +++- user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch (limited to 'user/glib') diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD index e97685a20..c4a7c087f 100644 --- a/user/glib/APKBUILD +++ b/user/glib/APKBUILD @@ -20,6 +20,7 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve i386-fpu-test.patch musl-no-locale.patch ridiculous-strerror-nonconformance.patch + meson-sucks-and-i-hate-you-so-much-right-now.patch " subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev $pkgname-lang $pkgname-bash-completion:bashcomp:noarch" @@ -83,4 +84,5 @@ sha512sums="eedf65ec8e2fb5b9c6c7f96c69fe162db1b00a2b407a64219ba6c070a608804f361a 0f0a98784aeed92f33cd9239d2f668bdc6c09b84ed020825ae88f6aacf6a922152dc3e1384c40d9f30f54c5ab78fe17e0ee5c42b268b297b595d2a6cde5b8998 fix-spawn.patch aa7444bbdf7b88798adc67c15cdb8b7459450c0b7357caea16b74462c5c9179ba80d4018b1e656e90a5e3be5b2e3c14e9b8c0ccbb2ee4d8c92dc8fa627518b84 i386-fpu-test.patch 34129be883011d266074783b7283af5c6a45055b85026b5aab47a3a0dfa1316a0a6502aaf78ab172356f67493ea7c4867b53279c25967a8cc5bee9320dbff96a musl-no-locale.patch -56c10a0f64cbd8ce584d428f818e7e678fdeb40a32df792843208ddfa3135d362cc2077bc9fe3bfebe13ee6af0ecf6403a593ad727e0a92276074a17a9c7029c ridiculous-strerror-nonconformance.patch" +56c10a0f64cbd8ce584d428f818e7e678fdeb40a32df792843208ddfa3135d362cc2077bc9fe3bfebe13ee6af0ecf6403a593ad727e0a92276074a17a9c7029c ridiculous-strerror-nonconformance.patch +d788005bc92ed1510235b77a9a26eecd78840a3e915a64e53e1e93cd1efaaeb1b9b5edb115f41352fcbdab10006b91b4aae7af20184c904e869a0d6893080368 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 new file mode 100644 index 000000000..ba38bdec2 --- /dev/null +++ b/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch @@ -0,0 +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 @@ + 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) -- cgit v1.2.3-70-g09d2