commit: 17ce5d869e6ffb48d32bb3177fd68effee9bc001 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed May 5 14:20:54 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed May 5 18:51:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ce5d86
app-il8n/xcin: Fix for slibtool Thanks-to: orbea <orbea <AT> riseup.net> Closes: https://bugs.gentoo.org/779103 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> app-i18n/xcin/files/xcin-2.5.3_pre3-slibtool.patch | 37 ++++++++++++++++++++++ app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild | 1 + 2 files changed, 38 insertions(+) diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-slibtool.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-slibtool.patch new file mode 100644 index 00000000000..747c8c5ca02 --- /dev/null +++ b/app-i18n/xcin/files/xcin-2.5.3_pre3-slibtool.patch @@ -0,0 +1,37 @@ +commit 376d5276758b7eb2ee2b5e11d60f2105aac263f2 +Author: orbea <or...@riseup.net> +Date: Sat Apr 10 16:40:33 2021 -0700 + + build: Fix linking with slibtool. + + Linking with the static libraries is not ideal, but since + that is what is provided... + +diff --git a/src/Makefile.in b/src/Makefile.in +index 62e6154..ac15131 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -6,8 +6,8 @@ top_srcdir = @top_srcdir@ + include $(top_srcdir)/Rules + + INC = ${xcininc} ${intl_inc} ${x_includes} -I${ximd_inc} +-LIB = ${xcinlib} -lXimd -lim_comm lib/libxcin.la \ +- ${x_libraries} ${locale_lib} ${dl_lib} ${intl_lib} -lm ++LIB = lib/libxcin.la lib/libim_comm.a lib/libXimd.a ${x_libraries} \ ++ ${locale_lib} ${dl_libs} ${intl_lib} -lm + + BIN = xcin + SRC = xcin_main.c module.c gui.c xim.c xim_IC.c fkey.c gui_main.c \ +diff --git a/src/util/cin2tab/Makefile.in b/src/util/cin2tab/Makefile.in +index a2ad6f8..0663c5e 100644 +--- a/src/util/cin2tab/Makefile.in ++++ b/src/util/cin2tab/Makefile.in +@@ -3,7 +3,7 @@ top_srcdir = @top_srcdir@ + include $(top_srcdir)/Rules + + INC = $(x_includes) $(xcininc) $(intl_inc) +-LIB = $(xcinlib) -lim_comm ../../lib/libxcin.la $(locale_lib) $(intl_lib) -lm ++LIB = ../../lib/libxcin.la ../../lib/libim_comm.a $(locale_lib) $(intl_lib) -lm + + BIN = cin2tab + SRC = cin2tab.c syscin.c gencin.c bimscin.c diff --git a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild index e71f3998511..9be714d2af2 100644 --- a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild +++ b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild @@ -34,6 +34,7 @@ PATCHES=( "${FILESDIR}"/${P}-glibc-2.10.patch "${FILESDIR}"/${P}-make.patch "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-slibtool.patch ) src_prepare() {
