Sophie

Sophie

distrib > Mageia > 9 > armv7hl > media > core-release-src > by-pkgid > 1c85592b61d40f1a362d33ca395a997b > files > 5

scim-1.4.18-7.mga9.src.rpm

From 2e670b878b81e2e7354102ed250c593830b797ea Mon Sep 17 00:00:00 2001
From: orbea <orbea@riseup.net>
Date: Fri, 19 Mar 2021 10:05:37 -0700
Subject: [PATCH 5/7] build: Fix undefined X11 references.

---
 extras/immodules/client-gtk/gtk2/Makefile.am | 7 ++++---
 extras/immodules/client-gtk/gtk3/Makefile.am | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/extras/immodules/client-gtk/gtk2/Makefile.am b/extras/immodules/client-gtk/gtk2/Makefile.am
index 8192f08..cfe95bc 100644
--- a/extras/immodules/client-gtk/gtk2/Makefile.am
+++ b/extras/immodules/client-gtk/gtk2/Makefile.am
@@ -40,11 +40,12 @@ im_scim_la_CFLAGS  =@GTK2_CFLAGS@
 
 im_scim_la_LDFLAGS = -rpath $(moduledir) \
 		     -avoid-version -no-undefined \
-		     -module \
-		     @GTK2_LIBS@
+		     -module
 
 im_scim_la_LIBADD  = $(top_builddir)/extras/immodules/common/libscimbridgecommon.la \
-					$(top_builddir)/extras/immodules/client-common/libscimbridgeclientcommon.la
+		     $(top_builddir)/extras/immodules/client-common/libscimbridgeclientcommon.la \
+		     @X_LIBS@ \
+		     @GTK2_LIBS@
 
 endif
 
diff --git a/extras/immodules/client-gtk/gtk3/Makefile.am b/extras/immodules/client-gtk/gtk3/Makefile.am
index b868c80..d9bdd4e 100644
--- a/extras/immodules/client-gtk/gtk3/Makefile.am
+++ b/extras/immodules/client-gtk/gtk3/Makefile.am
@@ -40,11 +40,12 @@ im_scim_la_CFLAGS  =@GTK3_CFLAGS@
 
 im_scim_la_LDFLAGS = -rpath $(moduledir) \
 		     -avoid-version -no-undefined \
-		     -module \
-		     @GTK3_LIBS@
+		     -module
 
 im_scim_la_LIBADD  = $(top_builddir)/extras/immodules/common/libscimbridgecommon.la \
-					$(top_builddir)/extras/immodules/client-common/libscimbridgeclientcommon.la
+		     $(top_builddir)/extras/immodules/client-common/libscimbridgeclientcommon.la \
+		     @X_LIBS@ \
+		     @GTK3_LIBS@
 
 endif
 
-- 
2.37.3