Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/
Date: Sat, 23 Oct 2021 14:32:12
Message-Id: 1634999511.33bdfd975f239c6d6433bc1587991cf9e3d31a64.hattya@gentoo
1 commit: 33bdfd975f239c6d6433bc1587991cf9e3d31a64
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 23 14:21:57 2021 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 23 14:31:51 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33bdfd97
7
8 app-i18n/uim: fix build with Clang
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
12
13 app-i18n/uim/files/uim-1.8.8-c++11.patch | 23 +++++++++++++++++++++++
14 app-i18n/uim/uim-1.8.8-r2.ebuild | 1 +
15 2 files changed, 24 insertions(+)
16
17 diff --git a/app-i18n/uim/files/uim-1.8.8-c++11.patch b/app-i18n/uim/files/uim-1.8.8-c++11.patch
18 new file mode 100644
19 index 00000000000..07e08284096
20 --- /dev/null
21 +++ b/app-i18n/uim/files/uim-1.8.8-c++11.patch
22 @@ -0,0 +1,23 @@
23 +From bb25aac568359efbfb68e52dd8d9ee85e65d754b Mon Sep 17 00:00:00 2001
24 +From: Haelwenn Monnier <lanodan@××××××××××××××××××××.com>
25 +Date: Thu, 25 Oct 2018 09:10:16 +0200
26 +Subject: [PATCH] xim/main.cpp: FIx build against clang
27 +
28 +main.cpp:68:55: error: invalid suffix on literal; C++11 requires a space between literal and identifier
29 +---
30 + xim/main.cpp | 2 +-
31 + 1 file changed, 1 insertion(+), 1 deletion(-)
32 +
33 +diff --git a/xim/main.cpp b/xim/main.cpp
34 +index a0b0beceb..c5818ca4a 100644
35 +--- a/xim/main.cpp
36 ++++ b/xim/main.cpp
37 +@@ -65,7 +65,7 @@ int g_option_mask;
38 + int scr_width, scr_height;
39 + int host_byte_order;
40 +
41 +-#define VERSION_NAME "uim-xim under the way! Version "PACKAGE_VERSION"\n"
42 ++#define VERSION_NAME "uim-xim under the way! Version " PACKAGE_VERSION "\n"
43 + const char *version_name=VERSION_NAME;
44 + const char *usage=
45 + "--help , --version :Show usage or version\n"
46
47 diff --git a/app-i18n/uim/uim-1.8.8-r2.ebuild b/app-i18n/uim/uim-1.8.8-r2.ebuild
48 index 99ed8908464..3e0f4c05b07 100644
49 --- a/app-i18n/uim/uim-1.8.8-r2.ebuild
50 +++ b/app-i18n/uim/uim-1.8.8-r2.ebuild
51 @@ -80,6 +80,7 @@ PATCHES=(
52 "${FILESDIR}"/${PN}-tinfo.patch
53 "${FILESDIR}"/${PN}-xkb.patch
54 "${FILESDIR}"/${PN}-zh-TW.patch
55 + "${FILESDIR}"/${P}-c++11.patch
56 "${FILESDIR}"/${P}-desktop.patch
57 "${FILESDIR}"/${P}-fno-common.patch
58 )