commit: 9d5b709e98f3b20f9cbde21f8c739730e6725de9 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Mar 24 19:38:39 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Mar 24 19:39:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d5b709e
app-i18n/scim: fix build with slibtool Thanks-to: orbea <orbea <AT> riseup.net> Closes: https://bugs.gentoo.org/777297 Signed-off-by: Sam James <sam <AT> gentoo.org> app-i18n/scim/files/scim-1.4.18-slibtool.patch | 36 ++++++++++++++++++++++++++ app-i18n/scim/scim-1.4.18.ebuild | 6 ++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/app-i18n/scim/files/scim-1.4.18-slibtool.patch b/app-i18n/scim/files/scim-1.4.18-slibtool.patch new file mode 100644 index 00000000000..b80db440dfd --- /dev/null +++ b/app-i18n/scim/files/scim-1.4.18-slibtool.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/777297 + +From dea50ce8e57aeb99034b880ee20ed91103e44555 Mon Sep 17 00:00:00 2001 +From: orbea <or...@riseup.net> +Date: Fri, 19 Mar 2021 10:05:37 -0700 +Subject: [PATCH] build: Fix undefined X11 references. + +--- + extras/immodules/client-gtk/gtk2/Makefile.am | 1 + + extras/immodules/client-gtk/gtk3/Makefile.am | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/extras/immodules/client-gtk/gtk2/Makefile.am b/extras/immodules/client-gtk/gtk2/Makefile.am +index 8192f08..e7a7937 100644 +--- a/extras/immodules/client-gtk/gtk2/Makefile.am ++++ b/extras/immodules/client-gtk/gtk2/Makefile.am +@@ -41,6 +41,7 @@ im_scim_la_CFLAGS =@GTK2_CFLAGS@ + im_scim_la_LDFLAGS = -rpath $(moduledir) \ + -avoid-version -no-undefined \ + -module \ ++ @X_LIBS@ \ + @GTK2_LIBS@ + + im_scim_la_LIBADD = $(top_builddir)/extras/immodules/common/libscimbridgecommon.la \ +diff --git a/extras/immodules/client-gtk/gtk3/Makefile.am b/extras/immodules/client-gtk/gtk3/Makefile.am +index b868c80..d6f656d 100644 +--- a/extras/immodules/client-gtk/gtk3/Makefile.am ++++ b/extras/immodules/client-gtk/gtk3/Makefile.am +@@ -41,6 +41,7 @@ im_scim_la_CFLAGS =@GTK3_CFLAGS@ + im_scim_la_LDFLAGS = -rpath $(moduledir) \ + -avoid-version -no-undefined \ + -module \ ++ @X_LIBS@ \ + @GTK3_LIBS@ + + im_scim_la_LIBADD = $(top_builddir)/extras/immodules/common/libscimbridgecommon.la \ diff --git a/app-i18n/scim/scim-1.4.18.ebuild b/app-i18n/scim/scim-1.4.18.ebuild index 80693dc30bb..55f287f6902 100644 --- a/app-i18n/scim/scim-1.4.18.ebuild +++ b/app-i18n/scim/scim-1.4.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -35,6 +35,10 @@ DOCS=( docs/scim.cfg ) +PATCHES=( + "${FILESDIR}"/${PN}-1.4.18-slibtool.patch +) + src_prepare() { default eautoreconf
