summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-03-24 19:38:39 +0000
committerSam James <sam@gentoo.org>2021-03-24 19:39:08 +0000
commit9d5b709e98f3b20f9cbde21f8c739730e6725de9 (patch)
tree08ed3f77708c79b9d7608725d0691f61b5e8730f /app-i18n
parentx11-misc/gigolo: Bump to 0.5.2 (diff)
downloadgentoo-9d5b709e98f3b20f9cbde21f8c739730e6725de9.tar.gz
gentoo-9d5b709e98f3b20f9cbde21f8c739730e6725de9.tar.bz2
gentoo-9d5b709e98f3b20f9cbde21f8c739730e6725de9.zip
app-i18n/scim: fix build with slibtool
Thanks-to: orbea <orbea@riseup.net> Closes: https://bugs.gentoo.org/777297 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-i18n')
-rw-r--r--app-i18n/scim/files/scim-1.4.18-slibtool.patch36
-rw-r--r--app-i18n/scim/scim-1.4.18.ebuild6
2 files changed, 41 insertions, 1 deletions
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 000000000000..b80db440dfd1
--- /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 <orbea@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 80693dc30bb9..55f287f69021 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