Skip to content

Commit

Permalink
app-i18n/scim: fix build with slibtool
Browse files Browse the repository at this point in the history
Thanks-to: orbea <[email protected]>
Closes: https://bugs.gentoo.org/777297
Signed-off-by: Sam James <[email protected]>
  • Loading branch information
thesamesam committed Mar 24, 2021
1 parent 2667685 commit 9d5b709
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 1 deletion.
36 changes: 36 additions & 0 deletions app-i18n/scim/files/scim-1.4.18-slibtool.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
https://bugs.gentoo.org/777297

From dea50ce8e57aeb99034b880ee20ed91103e44555 Mon Sep 17 00:00:00 2001
From: orbea <[email protected]>
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 \
6 changes: 5 additions & 1 deletion app-i18n/scim/scim-1.4.18.ebuild
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -35,6 +35,10 @@ DOCS=(
docs/scim.cfg
)

PATCHES=(
"${FILESDIR}"/${PN}-1.4.18-slibtool.patch
)

src_prepare() {
default
eautoreconf
Expand Down

0 comments on commit 9d5b709

Please sign in to comment.