diff options
| author | Síle Ekaterin Liszka <sheila@vulpine.house> | 2023-11-04 22:37:42 -0700 |
|---|---|---|
| committer | Síle Ekaterin Liszka <sheila@vulpine.house> | 2023-11-08 16:33:29 -0800 |
| commit | c8258efb2c020437ad625dcd114a18c2721f9362 (patch) | |
| tree | 3001a7d3509814f21d07b6814aca57346401b89d | |
| parent | 7b92f1e5c97a566049b0c54856ac111392a7d708 (diff) | |
| download | packages-c8258efb2c020437ad625dcd114a18c2721f9362.tar.gz packages-c8258efb2c020437ad625dcd114a18c2721f9362.tar.bz2 packages-c8258efb2c020437ad625dcd114a18c2721f9362.tar.xz packages-c8258efb2c020437ad625dcd114a18c2721f9362.zip | |
user/glib: upgrade to 2.78.1
| -rw-r--r-- | user/glib/APKBUILD | 16 | ||||
| -rw-r--r-- | user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch | 11 |
2 files changed, 15 insertions, 12 deletions
diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD index 45d91ed79..735cb892d 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.72.4 +pkgver=2.78.1 pkgrel=0 pkgdesc="Common C routines used by Gtk+ and other libs" url="https://developer.gnome.org/glib/" @@ -11,7 +11,7 @@ license="LGPL-2.1+" depends="dbus" depends_dev="perl python3 attr-dev bzip2-dev libffi-dev util-linux-dev" checkdepends="tzdata shared-mime-info" -makedepends="$depends_dev dbus-dev meson ninja pcre-dev xmlto zlib-dev" +makedepends="$depends_dev dbus-dev meson ninja pcre2-dev xmlto zlib-dev" triggers="$pkgname.trigger=/usr/share/glib-2.0/schemas:/usr/lib/gio/modules" subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev $pkgname-lang $pkgname-bash-completion:bashcomp:noarch" @@ -29,20 +29,20 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve # - CVE-2019-12450 build() { - meson --default-library=both \ + meson setup --default-library=both \ -Dprefix=/usr \ -Dselinux=disabled \ -Dman=true build - ninja -C build + meson compile -C build } check() { # workaround if a user builds it on a computer running X11 - DISPLAY= ninja -C build test + DISPLAY= meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C build install + DESTDIR="$pkgdir" meson install -C build rm -rf "$pkgdir"/usr/lib/charset.alias } @@ -75,10 +75,10 @@ bashcomp() { [ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share } -sha512sums="b4e2e0985e2184ee9656c4f1b4e15d8d1264f3d23d31349bc43d92e8432cffa48e1685c40517efb08dc5b57b8285acf65f2747deeb50e50d9cacec7160e7edf8 glib-2.72.4.tar.xz +sha512sums="aa9ed9195951b00ac8221e958ea337fbda82621a862ef8f29dc2ea396a6253ce51c2a0a498dfa4e12642f1836f85f9564f09991979ae85c5ed4368355d857376 glib-2.78.1.tar.xz 32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch 48d367d21a740161431c6ea2e062415e403d1a7af40515c71c60f11a8784d8725595386dc5a801c351540d67dee4186fb4af875f0165d21d13fe1a5167e02099 broken-gio-tests.patch aa7444bbdf7b88798adc67c15cdb8b7459450c0b7357caea16b74462c5c9179ba80d4018b1e656e90a5e3be5b2e3c14e9b8c0ccbb2ee4d8c92dc8fa627518b84 i386-fpu-test.patch db9de1fbf953afe76df9047d878c405ceeb6bd674c4382a8437612d788ff1c65c78012831888b2c4916f8125dab6bda50f1bba040744563dc8dcad30aeb1dd4d musl-no-locale.patch 56c10a0f64cbd8ce584d428f818e7e678fdeb40a32df792843208ddfa3135d362cc2077bc9fe3bfebe13ee6af0ecf6403a593ad727e0a92276074a17a9c7029c ridiculous-strerror-nonconformance.patch -dc1f0232433f6fb2cb2edebc8f5e15b4dcca557191af0a0ca45ff5cc5d109362e1dde4a532b08423e74c6b716801a516ad4ea105435e1332cd1a42f8131df46b meson-sucks-and-i-hate-you-so-much-right-now.patch" +d6e5eabde4c87f5b8a4d1574ed7da3761764d6452431bc7daa2f1cd7b59f307e4227a977bca81c18a92a569e02d40d681364ff079dd04409b5d622947cd06dda 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 1e63ac0f4..c90acbd97 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,11 @@ ---- 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 -@@ -1,4 +1,5 @@ +diff '--color=auto' -Nurd glib-2.78.1/glib/libcharset/meson.build glib-2.78.1.new/glib/libcharset/meson.build +--- glib-2.78.1/glib/libcharset/meson.build 2023-10-25 04:33:59.000000000 -0700 ++++ glib-2.78.1.new/glib/libcharset/meson.build 2023-11-04 21:59:21.774822198 -0700 +@@ -1,6 +1,7 @@ charset_lib = static_library('charset', 'localcharset.c', include_directories : configinc, pic : true, + install : true, - c_args : [ '-DGLIB_CHARSETALIAS_DIR="@0@"'.format(glib_charsetaliasdir) ] + glib_hidden_visibility_args) + c_args : [ '-DGLIB_CHARSETALIAS_DIR="@0@"'.format(glib_charsetaliasdir) ], + gnu_symbol_visibility : 'hidden', + ) |