Fix undefined symbol of im-uim.so.

Submitted by:	Wolfgang Jenkner <wjenkner@inode.at>
This commit is contained in:
MANTANI Nobutaka 2011-05-30 15:37:40 +00:00
parent 677d02ea27
commit d75bc95d93
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=274814
2 changed files with 12 additions and 9 deletions

View file

@ -5,6 +5,7 @@
# $FreeBSD$
#
PORTREVISION= 1
PKGNAMESUFFIX= -gtk
COMMENT= GTK+ modules of uim input method
@ -26,7 +27,7 @@ IGNORE= requires X11
.endif
do-build:
(cd ${WRKSRC}/uim && ${GMAKE} libuim-x-util.la)
(cd ${WRKSRC}/uim && ${GMAKE} libuim-x-util.la libuim-counted-init.la)
(cd ${WRKSRC}/gtk && ${GMAKE})
(cd ${WRKSRC}/helper && ${GMAKE})

View file

@ -1,25 +1,27 @@
--- gtk/Makefile.in.orig 2011-05-17 13:16:12.000000000 +0900
+++ gtk/Makefile.in 2011-05-29 02:29:01.000000000 +0900
@@ -82,10 +82,6 @@
--- ./gtk/Makefile.in.orig 2011-05-17 06:16:12.000000000 +0200
+++ ./gtk/Makefile.in 2011-05-30 01:30:45.000000000 +0200
@@ -81,11 +81,9 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(moduledir)"
LTLIBRARIES = $(module_LTLIBRARIES)
-LTLIBRARIES = $(module_LTLIBRARIES)
-@GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \
-@GTK2_TRUE@ $(am__append_1)
+@GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-counted-init.la \
@GTK2_TRUE@ $(am__append_1)
+LTLIBRARIES = $(module_LTLIBRARIES)
am__im_uim_la_SOURCES_DIST = gtk-im-uim.c gtk-im-uim.h key-util-gtk.c \
key-util-gtk.h uim-cand-win-gtk.c uim-cand-win-gtk.h \
uim-cand-win-tbl-gtk.c uim-cand-win-tbl-gtk.h \
@@ -443,9 +439,8 @@
@@ -443,8 +441,8 @@
@GTK2_TRUE@module_LTLIBRARIES = $(im_uim_la)
@GTK2_TRUE@im_uim_la_SOURCES = $(IM_UIM_SOURCES)
@GTK2_TRUE@im_uim_la_LDFLAGS = -module -avoid-version @GTK2_LIBS@
-@GTK2_TRUE@im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \
+@GTK2_TRUE@im_uim_la_LIBADD = -luim-scm \
+@GTK2_TRUE@ -luim \
@GTK2_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \
@GTK2_TRUE@ $(am__append_1)
@GTK2_TRUE@IM_UIM_SOURCES = \
@GTK2_TRUE@ gtk-im-uim.c gtk-im-uim.h key-util-gtk.c key-util-gtk.h \