diff options
| author | Síle Ekaterin Liszka <sheila@vulpine.house> | 2024-05-28 14:57:42 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2024-06-11 14:04:01 -0500 |
| commit | e41546065add213df8cd1b1fe9d2bdb44942abff (patch) | |
| tree | 8a5c4a86a9db44b01fec01c19224be97f3308826 | |
| parent | d2cef75cbe94932d9edf0a60bb58f7721e283738 (diff) | |
| download | packages-e41546065add213df8cd1b1fe9d2bdb44942abff.tar.gz packages-e41546065add213df8cd1b1fe9d2bdb44942abff.tar.bz2 packages-e41546065add213df8cd1b1fe9d2bdb44942abff.tar.xz packages-e41546065add213df8cd1b1fe9d2bdb44942abff.zip | |
user/vte: Fix build on modern GCC
| -rw-r--r-- | user/vte/APKBUILD | 6 | ||||
| -rw-r--r-- | user/vte/gcc-volatile.patch | 45 |
2 files changed, 49 insertions, 2 deletions
diff --git a/user/vte/APKBUILD b/user/vte/APKBUILD index a5539de34..dd9f87785 100644 --- a/user/vte/APKBUILD +++ b/user/vte/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=vte pkgver=0.62.0 -pkgrel=0 +pkgrel=1 pkgdesc="Virtual terminal emulator library for Gnome" url="https://www.gnome.org" arch="all" @@ -12,6 +12,7 @@ makedepends="gnutls-dev gtk+3.0-dev gnutls-dev gobject-introspection-dev subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/vte/${pkgver%.*}/vte-$pkgver.tar.xz exitcode.patch + gcc-volatile.patch " build() { @@ -28,4 +29,5 @@ package() { } sha512sums="8942809d20ff845142dce8cf48b4eb6f9e4f333dc2647cceb0538112d5e10096ff836f24da1f0c34cc4bbee4f6c585c3feab33934c257887a82d6c67bce11402 vte-0.62.0.tar.xz -4987254439a136f66a7b7be1300f5efbf85db74bdb64fdd8d0c9a555173a172b4fd519174f932e73d58a2618ef37273e82fe681bb129891f2792a414025f6c61 exitcode.patch" +4987254439a136f66a7b7be1300f5efbf85db74bdb64fdd8d0c9a555173a172b4fd519174f932e73d58a2618ef37273e82fe681bb129891f2792a414025f6c61 exitcode.patch +8d45f85a451868ec49fc263e60a1ab943ecea172ec32091ac9e2b85f0e9c7091423313eb4bbe037eac2b75086cd8c9d307bd0c37d58d4051742d9e2c579340a4 gcc-volatile.patch" diff --git a/user/vte/gcc-volatile.patch b/user/vte/gcc-volatile.patch new file mode 100644 index 000000000..924d4e16b --- /dev/null +++ b/user/vte/gcc-volatile.patch @@ -0,0 +1,45 @@ +From 89e9230dc1a27b89cca16de32e903918a27b8e42 Mon Sep 17 00:00:00 2001 +From: Christian Persch <chpe@src.gnome.org> +Date: Mon, 16 Nov 2020 20:27:48 +0100 +Subject: [PATCH] lib: Drop wrong use of volatile + +--- + src/vtetypebuiltins.cc.template | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/vtetypebuiltins.cc.template b/src/vtetypebuiltins.cc.template +index dade41de7..3a50d4011 100644 +--- a/src/vtetypebuiltins.cc.template ++++ b/src/vtetypebuiltins.cc.template +@@ -11,9 +11,9 @@ + GType + @enum_name@_get_type (void) + { +- static volatile gsize g_define_type_id__volatile = 0; ++ static gsize g_define_type_id = 0; + +- if (g_once_init_enter (&g_define_type_id__volatile)) { ++ if (g_once_init_enter (&g_define_type_id)) { + static const G@Type@Value values[] = { + /*** END value-header ***/ + +@@ -24,13 +24,13 @@ GType + /*** BEGIN value-tail ***/ + { 0, NULL, NULL } + }; +- GType g_define_type_id = \ ++ GType type_id = \ + g_@type@_register_static (g_intern_static_string ("@EnumName@"), values); + +- g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); ++ g_once_init_leave (&g_define_type_id, type_id); + } + +- return g_define_type_id__volatile; ++ return g_define_type_id; + } + + /*** END value-tail ***/ +-- +GitLab + |