diff options
| author | psykose <alice@ayaya.dev> | 2023-01-20 09:06:06 +0000 |
|---|---|---|
| committer | psykose <alice@ayaya.dev> | 2023-01-20 10:06:06 +0100 |
| commit | 013b2dc8eb98224bbcd5118e3b96441b92d0535a (patch) | |
| tree | 196874c83d8e94cec2c5ba9a618cb3f52c24a456 | |
| parent | eb6308c3c0da11a2000181950b7f8426d50aa66d (diff) | |
| download | aports-013b2dc8eb98224bbcd5118e3b96441b92d0535a.tar.gz aports-013b2dc8eb98224bbcd5118e3b96441b92d0535a.tar.bz2 aports-013b2dc8eb98224bbcd5118e3b96441b92d0535a.tar.xz | |
main/glib: upgrade to 2.74.5
| -rw-r--r-- | main/glib/32-bit-errno.patch | 30 | ||||
| -rw-r--r-- | main/glib/APKBUILD | 6 |
2 files changed, 2 insertions, 34 deletions
diff --git a/main/glib/32-bit-errno.patch b/main/glib/32-bit-errno.patch deleted file mode 100644 index d5b1527a81f..00000000000 --- a/main/glib/32-bit-errno.patch +++ /dev/null @@ -1,30 +0,0 @@ -Patch-Source: https://gitlab.gnome.org/GNOME/glib/-/commit/6626765a79f125cf0ec9cdaefa51ceef718d41e7 -From 6626765a79f125cf0ec9cdaefa51ceef718d41e7 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <mcatanzaro@redhat.com> -Date: Tue, 20 Dec 2022 17:10:41 -0600 -Subject: [PATCH] gthread-posix: need to #include <errno.h> - -a79c6af23eff5ee978db62e048828c9a992a1261 uses errno without the required -header. - - -(cherry picked from commit 03cb4261e00cf505790f4fd4e69f97b2ef4fcccd) ---- - glib/gthreadprivate.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h -index 6eaf422753..f34368a7c2 100644 ---- a/glib/gthreadprivate.h -+++ b/glib/gthreadprivate.h -@@ -41,6 +41,7 @@ struct _GRealThread - /* system thread implementation (gthread-posix.c, gthread-win32.c) */ - - #if defined(HAVE_FUTEX) || defined(HAVE_FUTEX_TIME64) -+#include <errno.h> - #include <linux/futex.h> - #include <sys/syscall.h> - #include <unistd.h> --- -GitLab - diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD index bd684de47dc..1738af7903f 100644 --- a/main/glib/APKBUILD +++ b/main/glib/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=glib -pkgver=2.74.4 +pkgver=2.74.5 pkgrel=0 pkgdesc="Common C routines used by Gtk+ and other libs" url="https://developer.gnome.org/glib/" @@ -25,7 +25,6 @@ source="https://download.gnome.org/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz 0001-gquark-fix-initialization-with-c-constructors.patch deprecated-no-warn.patch 0001-gslice-remove-slice-allocator.patch - 32-bit-errno.patch " options="!check" # don't like to be run without first being installed @@ -70,9 +69,8 @@ static() { } sha512sums=" -912f6b0559fcb5ad55fa36837a348228b8e2498c490271204ced9f2e4a9eab804de4745f3ec439a198eb275d7263f18bc670f45460e2be55a2cbe45466b02fc6 glib-2.74.4.tar.xz +2716e0fe984cc5d0714e91fe0de47ee71a8bd0b4c85caee337ddb7e02ac2fb3c8c007ccc1207b29cf901c30a7ec8e3bcca75d69c6fab2a32a8cf14bff974e614 glib-2.74.5.tar.xz 32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch 744239ea2afb47e15d5d0214c37d7c798edac53797ca3ac14d515aee4cc3999ef9716ba744c64c40198fb259edc922559f77c9051104a568fc8ee4fc790810b1 deprecated-no-warn.patch b47f1330d1747aac74eec5cf670f43084471acebc2f455e1c3374e3d642e7cdf415e11fc6c3910681f4c422d9bfff66f0aa96935c28d282c3a38faaf4271da68 0001-gslice-remove-slice-allocator.patch -fb4e9572d62f97cb654e074e6fcbdae2a7e10bda7cff8b175f600012e2145c1ae0dfc1832afd8871533d08bd494f75f3ff4f5bb4f48538a7a6595c801cf4c9ce 32-bit-errno.patch " |