From d79ab35b7ac170babebe8bc151fe5d037c16285c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 22 Sep 2022 17:28:08 +0100 Subject: gentoo auto-resync : 22:09:2022 - 17:28:08 --- dev-libs/glib/Manifest | 3 ++- dev-libs/glib/files/glib-2.74.0-clang-build.patch | 26 +++++++++++++++++++++++ dev-libs/glib/glib-2.74.0.ebuild | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 dev-libs/glib/files/glib-2.74.0-clang-build.patch (limited to 'dev-libs/glib') diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 072d30a36d9f..b8e6defa96ab 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,6 +1,7 @@ AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116 +AUX glib-2.74.0-clang-build.patch 1038 BLAKE2B 3340b6403a351d00d7c26813a09f286177136db8cacdb3010b4f37db37e8ecb24a445cf082b204e94a9e80cf00c8f0ad3d2502fea21bfa2f07f62e0c28fea1df SHA512 115de517a25d4559a964cd0a06ee839601294d26db485cc48089c4f547e325556d258196bcd1bccd89be2986be33db5899442ca3c51e3d40fd22a8d862adf8b9 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638 DIST glib-2.74.0.tar.xz 5183072 BLAKE2B b21e5a72e2ce3390cbf13601aa902104f1ac1cfbd75181d30cd340f24b5875753f898b229f99c71d47d499be86cddb0191a0072c0c2decc82956a46c16255905 SHA512 5cdadd2f4568c0c3d45083b4d39699abf651e42e020f7bc880cce3ff33d28943118388d17a0632777e843f48009c1f97d5634fde3cb8c69c7c7f35b278ac8225 EBUILD glib-2.72.3.ebuild 10244 BLAKE2B 3f37fd728f89fabc8bba3a09946a069cf3220d14637089300cac575a1fafc667d9e04a4592552db64db2144c80f9ae697f0597a5110175cdb0fb3c74e95d71e2 SHA512 ad314b8967042ad94110d0c582bb08bdb4df84dbef60f6184223604abdaf311fe1eb056103df0ec19d7fda010b8e90f2054df86ca817f451e0dc6e6b695a530f -EBUILD glib-2.74.0.ebuild 10203 BLAKE2B 1362092be238567e2a2b38c2ee3c0a3e21927c2e7598398d313c9ed95da06aaf495523dbd1e6f6237c508f76d5ebb103e961712c3c0689c57085ecdf8887c271 SHA512 a16bb3d46579e5c2a53fb5957562a7989847194b0debf31cf85c112f9a2c3821bf414023c788d4c27cbef72f7150d3a55ac6b3c87a5de8cde6a6099791525c13 +EBUILD glib-2.74.0.ebuild 10241 BLAKE2B 633ebf99a48d83f308a78957dc44d1933a92ad6256e5ad18d4fa4345f6fd60baee745607446be4375f0540c19a8791a806297164b3d6a784f7835f654368eeef SHA512 3745f84fd8b2ca71d7f12ef366a5a9a877cc5c2286912b51598cd9bb3a71d8f85d6506317e6015757b20c5bd950ecf6174d70f440417615ae6bf19870c69a5e5 MISC metadata.xml 1221 BLAKE2B 517c6f9ee14ccac7192d7c1189773ec6e034bc638a8acd28081a604f8516ee639f43c82ca3233d513dbfd06db714358e396f2c4cd906715bb0950f130974ab9e SHA512 0c4203b3c9d8b91eebe4ee54f34d1aae26e5efa4c791760559b18b58d90b508936ead62ee8df81e6777ad8e0cb0e9c68d504d0f24ecd5903d4e3df89c6cc0bdf diff --git a/dev-libs/glib/files/glib-2.74.0-clang-build.patch b/dev-libs/glib/files/glib-2.74.0-clang-build.patch new file mode 100644 index 000000000000..23bb0630d028 --- /dev/null +++ b/dev-libs/glib/files/glib-2.74.0-clang-build.patch @@ -0,0 +1,26 @@ +https://gitlab.gnome.org/GNOME/glib/-/commit/37dba1c425f6c3254e9ce72f1c4b7d0f95c2be3e +https://bugs.gentoo.org/871174 + +From: Kjell Ahlstedt +Date: Thu, 15 Sep 2022 12:55:18 +0200 +Subject: [PATCH] gio-launch-desktop: Fix the G_STATIC_ASSERT expressions for + clang + +The clang compiler requires the static_assert expression to be an integral +constant expression. `"text"` is not, but `sizeof "text"` is. + +Fixes #2740 +--- a/gio/gio-launch-desktop.c ++++ b/gio/gio-launch-desktop.c +@@ -121,8 +121,8 @@ journal_stream_fd (const char *identifier, + /* Arbitrary large size for the sending buffer, from systemd */ + int large_buffer_size = 8 * 1024 * 1024; + +- G_STATIC_ASSERT (LOG_EMERG == 0 && "Linux ABI defines LOG_EMERG"); +- G_STATIC_ASSERT (LOG_DEBUG == 7 && "Linux ABI defines LOG_DEBUG"); ++ G_STATIC_ASSERT (LOG_EMERG == 0 && sizeof "Linux ABI defines LOG_EMERG"); ++ G_STATIC_ASSERT (LOG_DEBUG == 7 && sizeof "Linux ABI defines LOG_DEBUG"); + + fd = socket (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); + +GitLab diff --git a/dev-libs/glib/glib-2.74.0.ebuild b/dev-libs/glib/glib-2.74.0.ebuild index db17ff43554c..2afacc7da2a4 100644 --- a/dev-libs/glib/glib-2.74.0.ebuild +++ b/dev-libs/glib/glib-2.74.0.ebuild @@ -69,6 +69,7 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch + "${FILESDIR}"/${P}-clang-build.patch ) pkg_setup() { -- cgit v1.2.3