diff options
Diffstat (limited to 'x11-libs/libgxim')
| -rw-r--r-- | x11-libs/libgxim/Manifest | 3 | ||||
| -rw-r--r-- | x11-libs/libgxim/files/libgxim-0.5.0-gcc14.patch | 40 | ||||
| -rw-r--r-- | x11-libs/libgxim/libgxim-0.5.0-r1.ebuild (renamed from x11-libs/libgxim/libgxim-0.5.0.ebuild) | 6 |
3 files changed, 48 insertions, 1 deletions
diff --git a/x11-libs/libgxim/Manifest b/x11-libs/libgxim/Manifest index 1aac682ed29e..7216b038cc7c 100644 --- a/x11-libs/libgxim/Manifest +++ b/x11-libs/libgxim/Manifest @@ -1,3 +1,4 @@ +AUX libgxim-0.5.0-gcc14.patch 1255 BLAKE2B c52309c711b0e6ebe1d38fa780203188d516f38e70f9df4deb5906ac3a1b0d61b935c1320cf16636ba8bf1b242ceae7ef8badd0e2b702a86135b9239cbfea252 SHA512 d9eb9bd7f84e9d3a2040c57f3f934cd8e6a6f5777995c82d15646aa430a4da39aa0579eab8b215730e18220c770b4088800c4bfa5caf7ac3f7da1ee5dd9e644e DIST libgxim-0.5.0.tar.bz2 469547 BLAKE2B 183ea514b990b93efcf41a56704385e8b84b18d1f4f992ddaa8f7481a74b132f05b56322450258d53bc1fbcaf42d2528d297922ae042f5831010d58540974982 SHA512 ca143e16e8ddd8e3cea01cc0857cb0e665f9cf397462e2fd9ed714b825eaa06056dae4115aacd117f8113e815f11184d9dd9f239259a1eee691d0b120db580f7 -EBUILD libgxim-0.5.0.ebuild 1340 BLAKE2B e2f0a4657e5216850a62d12ea4610f5f1108612906b2dca500ce131040c145ddcc182e1b80fde811ee7ba2af7f221c77b7d71d4bb34fd169a0d0c8144f7ecfcc SHA512 69efea58125e6c89b8329776d8f3c8b50f313de307b914eb6dd9156afaecb603d3b8f083106495bc7cdfd5f15a727ce6fdbaf05ced7a57c195fbb531ed8204a3 +EBUILD libgxim-0.5.0-r1.ebuild 1522 BLAKE2B c25401dd49173482f41d4a2e5ed978d46fb1a73f69df479ebf8fce369da519daecdfa3dd35487b500e2b431280c94c6aca39a4404b1f8a57f188bf26b05fbf7f SHA512 3411049d68af540e931b15058a7a299ecebc92b8b4480f4f903ecd27ee12e9f4f6e155f6976ff2f3c8ae1a454fa9d42129d9ffb31fdeae4456ba8be4df771db9 MISC metadata.xml 316 BLAKE2B c6389aed019cb4f4667f4d452f72634648dedac018e25c520805c761d8f2d161d0b63ef698b4229db3d619495dfa031ac4ec7a74d77d399c47ac2e603aa830c0 SHA512 1e797b6c97a0fe8a4cb0dedc6688a36b63a37b0ca11ea1e5b52ef43c84433eb9b4dd0951a7ebbff6aa10201af18fdeb404f7e6241b69814bbf245c218e60a51a diff --git a/x11-libs/libgxim/files/libgxim-0.5.0-gcc14.patch b/x11-libs/libgxim/files/libgxim-0.5.0-gcc14.patch new file mode 100644 index 000000000000..36e62471d591 --- /dev/null +++ b/x11-libs/libgxim/files/libgxim-0.5.0-gcc14.patch @@ -0,0 +1,40 @@ +From 274976ff39d9142169a18655f5013e66233ac9c8 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH <akira@tagoh.org> +Date: Wed, 14 Feb 2018 13:20:40 +0900 +Subject: [PATCH] Fix a build fail + +--- + libgxim/gximcore.c | 2 -- + libgxim/gximprotocol10.c | 2 +- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/libgxim/gximcore.c b/libgxim/gximcore.c +index a92c413..3955d01 100644 +--- a/libgxim/gximcore.c ++++ b/libgxim/gximcore.c +@@ -26,9 +26,7 @@ + #endif + + #include <glib/gi18n-lib.h> +-#ifdef GNOME_ENABLE_DEBUG + #include <gdk/gdkx.h> +-#endif /* GNOME_ENABLE_DEBUG */ + #include "gximacc.h" + #include "gximconnection.h" + #include "gximmarshal.h" +diff --git a/libgxim/gximprotocol10.c b/libgxim/gximprotocol10.c +index 04887a5..65bd4df 100644 +--- a/libgxim/gximprotocol10.c ++++ b/libgxim/gximprotocol10.c +@@ -2073,7 +2073,7 @@ g_xim_protocol10_closure_real_parser_error(GXimProtocol *proto, + msg = g_strdup_printf("Unable to parse the protocol %s properly", + g_xim_protocol_name(major_opcode)); + +- g_xim_messages_error(G_XIM_PROTOCOL_GET_IFACE (proto)->message, msg); ++ g_xim_messages_error(G_XIM_PROTOCOL_GET_IFACE (proto)->message, "%s", msg); + switch (major_opcode) { + case G_XIM_CONNECT: + case G_XIM_AUTH_REQUIRED: +-- +2.45.0 + diff --git a/x11-libs/libgxim/libgxim-0.5.0.ebuild b/x11-libs/libgxim/libgxim-0.5.0-r1.ebuild index 3a0811f9cd0d..f7a149908a9b 100644 --- a/x11-libs/libgxim/libgxim-0.5.0.ebuild +++ b/x11-libs/libgxim/libgxim-0.5.0-r1.ebuild @@ -33,6 +33,12 @@ BDEPEND="${RUBY_DEPS} AT_M4DIR="m4macros" +PATCHES=( + # backport upstream fix for gcc 14 implicit function declarations and by + # extension, LTO type mismatches. Also fixes format-security. + "${FILESDIR}"/${P}-gcc14.patch +) + src_prepare() { sed -i \ -e "/PKG_CHECK_MODULES/s/\(check\)/$(usex test '\1' _)/" \ |