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/, app-i18n/uim/files/
Date: Sat, 23 Oct 2021 14:32:11
Message-Id: 1634999512.8f4f71bddbe323cc16c9580725a95ec1c2ec3eba.hattya@gentoo
1 commit: 8f4f71bddbe323cc16c9580725a95ec1c2ec3eba
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 23 14:23:57 2021 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 23 14:31:52 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f4f71bd
7
8 app-i18n/uim: fix build with sys-devel/slibtool
9
10 Closes: https://bugs.gentoo.org/792198
11 Package-Manager: Portage-3.0.20, Repoman-3.0.3
12 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
13
14 app-i18n/uim/files/uim-slibtool.patch | 14 ++++++++++++++
15 app-i18n/uim/uim-1.8.8-r2.ebuild | 1 +
16 2 files changed, 15 insertions(+)
17
18 diff --git a/app-i18n/uim/files/uim-slibtool.patch b/app-i18n/uim/files/uim-slibtool.patch
19 new file mode 100644
20 index 00000000000..51560d439e2
21 --- /dev/null
22 +++ b/app-i18n/uim/files/uim-slibtool.patch
23 @@ -0,0 +1,14 @@
24 +--- a/qt4/common.pro.in
25 ++++ b/qt4/common.pro.in
26 +@@ -4,8 +4,9 @@
27 + @abs_top_srcdir@ @abs_top_srcdir@/uim \
28 + @abs_top_srcdir@/replace
29 + QMAKE_LIBDIR += @abs_top_builddir@/uim @abs_top_builddir@/replace \
30 +- @abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs
31 +-LIBS += -lreplace -luim -luim-scm
32 ++ @abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs \
33 ++ @abs_top_builddir@/sigscheme/libgcroots/.libs
34 ++LIBS += -lreplace -luim -luim-scm -lgcroots
35 + !win32:!embedded:!mac {
36 + LIBS += -luim-x-util
37 + }
38
39 diff --git a/app-i18n/uim/uim-1.8.8-r2.ebuild b/app-i18n/uim/uim-1.8.8-r2.ebuild
40 index 3e0f4c05b07..dd5bb5fe65e 100644
41 --- a/app-i18n/uim/uim-1.8.8-r2.ebuild
42 +++ b/app-i18n/uim/uim-1.8.8-r2.ebuild
43 @@ -77,6 +77,7 @@ BDEPEND="dev-util/intltool
44
45 PATCHES=(
46 "${FILESDIR}"/${PN}-gentoo.patch
47 + "${FILESDIR}"/${PN}-slibtool.patch
48 "${FILESDIR}"/${PN}-tinfo.patch
49 "${FILESDIR}"/${PN}-xkb.patch
50 "${FILESDIR}"/${PN}-zh-TW.patch