Index: head/chinese/gcin/Makefile =================================================================== --- head/chinese/gcin/Makefile (revision 499845) +++ head/chinese/gcin/Makefile (revision 499846) @@ -1,78 +1,76 @@ # Created by: Shen Chuan-Hsing # $FreeBSD$ PORTNAME= gcin -PORTVERSION= 2.8.8 +PORTVERSION= 2.8.9 CATEGORIES= chinese textproc gnome MASTER_SITES= http://hyperrate.com/gcin-source/ EXTRACT_ONLY= gcin-${PORTVERSION}.tar.xz MAINTAINER= vanilla@FreeBSD.org COMMENT= Traditional Chinese input utility in X LICENSE= LGPL21 BROKEN_powerpc64= fails to build: gmake[3]: *** [Makefile:30: en-american] Error 255 LIB_DEPENDS= libcurl.so:ftp/curl -USES= gmake pkgconfig tar:xz +USES= gmake gnome pkgconfig tar:xz HAS_CONFIGURE= YES -CONFIGURE_ARGS+= --use_gtk3=N --use_qt3=N --use_qt4=N --use_qt5=N -USE_GNOME= gtk20 +CONFIGURE_ARGS+= --use_gtk3=N --use_qt5=N +USE_GNOME= gtk30 USE_XORG= x11 xtst xext INSTALLS_ICONS= YES USE_LDCONFIG= ${PREFIX}/lib/gcin OPTIONS_DEFINE= ANTHY OPTIONS_SUB= yes ANTHY_DESC= Japanese anthy IM module ANTHY_BUILD_DEPENDS= ${LOCALBASE}/include/anthy/anthy.h:japanese/anthy ANTHY_LIB_DEPENDS= libanthy.so:japanese/anthy ANTHY_CONFIGURE_OFF= --use_anthy=N post-patch: @${REINPLACE_CMD} -e 's,&,,; 1 s,##!/bin/bash,#!/bin/sh,; \ s,-ldl,,; \ s,mandir=$$datadir,mandir=$$prefix,; \ s,/usr/share,$$prefix/share,; \ 1, 300 s,gcc,$$CC,; s,gcin-$$GCIN_VERSION,gcin,; \ /GCIN_DEBUG/ d' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,; \ s,%%PREFIX%%,${PREFIX},;' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \ - ${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile + ${WRKSRC}/menu/Makefile @${REINPLACE_CMD} -e 's,modify-XIM ,,; 8,10 d' \ ${WRKSRC}/scripts/Makefile @${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${LOCALBASE},;' \ ${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup \ ${WRKSRC}/scripts/gtab.append_prepare \ ${WRKSRC}/scripts/tsin-gtab-import \ ${WRKSRC}/scripts/tsin-gtab-edit @${REINPLACE_CMD} -e 's,bash,sh,; s/&//; 12,13 s/=/ /; \ s/export/setenv/; s/$$UTF8ED/xdg-open/' \ ${WRKSRC}/scripts/html-browser - @${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,;' \ - ${WRKSRC}/gtk-im/gtkimcontextgcin.c @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \ ${WRKSRC}/IMdkit/lib/Makefile ${WRKSRC}/Makefile \ ${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \ ${WRKSRC}/scripts/utf8-edit @${REINPLACE_CMD} -e '/make/ d' ${WRKSRC}/IMdkit/lib/Makefile @${REINPLACE_CMD} -e 's,/usr/X11R6/lib,${LOCALBASE}/lib,' ${WRKSRC}/im-client/Makefile post-build: .if !defined(DEBUG_FLAGS) @${FIND} ${WRKSRC} -name "*.so*" | ${XARGS} ${STRIP_CMD} .endif post-install: .if !defined(DEBUG_FLAGS) .for f in gcin* gtab-merge juyin-learn phoa2* sim2trad trad2sim ts-edit tsa2d32 tsd2a32 tsin2gtab-phrase tslearn @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} .endfor .endif .include Index: head/chinese/gcin/distinfo =================================================================== --- head/chinese/gcin/distinfo (revision 499845) +++ head/chinese/gcin/distinfo (revision 499846) @@ -1,3 +1,3 @@ -TIMESTAMP = 1545093618 -SHA256 (gcin-2.8.8.tar.xz) = 22b64d519a28ac82e662f6107dbb8c829a80b07a216a8b00e64103feacb031f3 -SIZE (gcin-2.8.8.tar.xz) = 4035876 +TIMESTAMP = 1552571155 +SHA256 (gcin-2.8.9.tar.xz) = e08426cc85c5932392ebf73ac7d140cd778862517c3ea0cf8953aaab6c14d078 +SIZE (gcin-2.8.9.tar.xz) = 4033152 Index: head/chinese/gcin/files/patch-Makefile =================================================================== --- head/chinese/gcin/files/patch-Makefile (revision 499845) +++ head/chinese/gcin/files/patch-Makefile (revision 499846) @@ -1,122 +1,132 @@ ---- Makefile.orig 2017-11-18 04:48:43 UTC +--- Makefile.orig 2019-03-07 09:07:52 UTC +++ Makefile @@ -4,8 +4,11 @@ include config.mak include suffixes-rule gcin_tsin_o = tsin.o tsin-util.o win0.o win1.o tsin-parse.o +SOURCES_gcin_tsin = tsin.cpp tsin-util.cpp win0.cpp win1.cpp tsin-parse.cpp gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o +SOURCES_gcin_pho = win-pho.cpp pho.cpp pho-util.cpp pho-sym.cpp table-update.cpp pho-dbg.cpp gcin_gtab_o = gtab.o win-gtab.o gtab-util.o gtab-list.o gtab-buf.o +SOURCES_gcin_gtab = gtab.cpp win-gtab.cpp gtab-util.cpp gtab-list.cpp gtab-buf.cpp GCIN_SO= gcin1.so gcin2.so @@ -14,8 +17,12 @@ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o l $(gcin_pho_o) $(gcin_gtab_o) gcin-common.o phrase.o t2s-lookup.o gtab-use-count.o \ win-save-phrase.o unix-exec.o pho-kbm-name.o statistic.o tsin-scan.o gcin-module.o lang.o \ gcin-module-cb.o gtab-init.o fullchar.o gtab-tsin-fname.o win-screen-status.o en-miss-cand.o +SOURCES=gcin.cpp eve.cpp util.cpp gcin-conf.cpp gcin-settings.cpp locale.cpp gcin-icon.cpp about.cpp html-browser.cpp \ + gcin-exec-script.cpp pho-play.cpp cache.cpp gtk_bug_fix.c phrase-save-menu.cpp \ + $(SOURCES_gcin_pho) $(SOURCES_gcin_gtab) gcin-common.cpp phrase.cpp t2s-lookup.cpp gtab-use-count.cpp \ + win-save-phrase.cpp unix-exec.cpp pho-kbm-name.cpp statistic.cpp tsin-scan.cpp gcin-module.cpp lang.cpp \ + gcin-module-cb.o gtab-init.o fullchar.o gtab-tsin-fname.o win-screen-status.cpp en-miss-cand.cpp - OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \ table-update.o locale.o gcin-settings.o gcin-common.o gcin-icon.o pho-dbg.o \ pho2pinyin.o pinyin.o lang.o gtab-list.o gtab-init.o fullchar.o \ -@@ -103,7 +110,7 @@ PROGS_CV=kbmcv pin-juyin +@@ -102,8 +109,7 @@ PROGS_CV=kbmcv pin-juyin + all: $(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) gcin.spec gcin-fedora.spec $(MAKE) -C data - $(MAKE) -C gtk-im +- $(MAKE) -C gtk-im - if [ $(BUILD_MODULE) = 'Y' ]; then $(MAKE) -C modules; fi + $(MAKE) -C modules if [ $(USE_I18N) = 'Y' ]; then $(MAKE) -C po; fi if [ $(GTK3_IM) = 'Y' ]; then $(MAKE) -C gtk3-im; fi if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi -@@ -113,18 +120,18 @@ all: $(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) +@@ -113,18 +119,18 @@ all: $(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) #gcc_ld_run_path=-Wl,-rpath,$(gcin_ld_run_path) gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) - $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(GCIN_LDFLAGS) -L/usr/X11R6/$(LIB) -+ $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(GCIN_LDFLAGS) -L/usr/local/$(LIB) ++ $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(GCIN_LDFLAGS) -L%%PREFIX%%/$(LIB) rm -f core.* vgcore.* ln -sf $@ $@.test gcin-nocur: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) - $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB) -+ $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/local/$(LIB) ++ $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L%%PREFIX%%/$(LIB) rm -f core.* -tslearn: $(OBJS_TSLEARN) +tslearn: $(OBJS_TSLEARN) im-client/libgcin-im-client.so $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TSLEARN) -L./im-client -lgcin-im-client $(LDFLAGS) -ts-edit: $(OBJS_TS_EDIT) +ts-edit: $(OBJS_TS_EDIT) im-client/libgcin-im-client.so $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TS_EDIT) -L./im-client -lgcin-im-client -lcurl $(LDFLAGS) ts-contribute: ts-edit -@@ -171,16 +178,16 @@ gtab-merge: $(OBJS_gtab_merge) +@@ -171,16 +177,16 @@ gtab-merge: $(OBJS_gtab_merge) kbmcv: $(OBJS_kbmcv) $(CCLD) -o $@ $(OBJS_kbmcv) $(LDFLAGS) -gcin-gb-toggle: $(OBJS_gcin_gb_toggle) +gcin-gb-toggle: $(OBJS_gcin_gb_toggle) im-client/libgcin-im-client.so $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_gb_toggle) -L./im-client -lgcin-im-client $(LDFLAGS) -gcin-kbm-toggle: $(OBJS_gcin_kbm_toggle) +gcin-kbm-toggle: $(OBJS_gcin_kbm_toggle) im-client/libgcin-im-client.so $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_kbm_toggle) -L./im-client -lgcin-im-client $(LDFLAGS) -gcin-exit: $(OBJS_gcin_exit) +gcin-exit: $(OBJS_gcin_exit) im-client/libgcin-im-client.so $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_exit) -L./im-client -lgcin-im-client $(LDFLAGS) -gcin-message: $(OBJS_gcin_message) +gcin-message: $(OBJS_gcin_message) im-client/libgcin-im-client.so $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_message) -L./im-client -lgcin-im-client $(LDFLAGS) pin-juyin: $(OBJS_pin_juyin) -@@ -229,23 +236,19 @@ install: +@@ -228,24 +234,19 @@ install: + install -d $(bindir) $(MAKE) -C data install $(MAKE) -C im-client install - $(MAKE) -C gtk-im install +- $(MAKE) -C gtk-im install - if [ $(BUILD_MODULE) = 'Y' ]; then $(MAKE) -C modules install; fi + $(MAKE) -C modules install if [ $(GTK3_IM) = 'Y' ]; then $(MAKE) -C gtk3-im install; fi if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im install; fi if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im install; fi if [ $(QT5_IM) = 'Y' ]; then $(MAKE) -C qt5-im install; fi - if [ $(prefix) = /usr/local ]; then \ - install -m 644 gcin.png /usr/share/icons/hicolor/64x64/apps; \ - install -d $(DOC_DIR); \ - install -m 644 README.html Changelog.html $(DOC_DIR); \ + if [ $(prefix) = /nonstaged ]; then \ + install -m 644 gcin.png $(prefix)/share/icons/hicolor/64x64/apps; \ install $(PROGS) $(bindir); \ rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \ rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \ rm -f $(bindir)/ts-contribute-en; ln -sf ts-edit $(bindir)/ts-contribute-en; \ rm -f $(bindir)/ts-edit-en; ln -sf ts-edit $(bindir)/ts-edit-en; \ else \ - install -d $(DOC_DIR_i); \ - install -m 644 README.html Changelog.html $(DOC_DIR_i); \ install -s $(PROGS) $(bindir); \ rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \ rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \ -@@ -253,6 +256,7 @@ install: +@@ -253,6 +254,7 @@ install: rm -f $(bindir)/ts-edit-en; ln -sf ts-edit $(bindir)/ts-edit-en; \ fi $(MAKE) -C scripts install + $(MAKE) -C man install $(MAKE) -C menu install if [ $(USE_I18N) = 'Y' ]; then $(MAKE) -C po install; fi -@@ -286,5 +290,3 @@ gcin.spec: gcin.spec.in +@@ -261,7 +263,6 @@ clean: + $(MAKE) -C data clean + $(MAKE) -C scripts clean + $(MAKE) -C im-client clean +- $(MAKE) -C gtk-im clean + $(MAKE) -C modules clean + if [ $(GTK3_IM) = 'Y' ]; then $(MAKE) -C gtk3-im clean; fi + $(MAKE) -C qt-im clean +@@ -286,5 +287,3 @@ gcin.spec: gcin.spec.in gcin-fedora.spec: gcin-fedora.spec.in VERSION.gcin rm -f $@ sed -e "s/__gcin_version__/$(GCIN_VERSION)/" < $< > $@ - -include .depend Index: head/chinese/gcin/files/patch-configure =================================================================== --- head/chinese/gcin/files/patch-configure (revision 499845) +++ head/chinese/gcin/files/patch-configure (revision 499846) @@ -1,130 +1,130 @@ ---- configure.orig 2018-05-12 11:15:17 UTC +--- configure.orig 2019-02-01 23:11:02 UTC +++ configure @@ -1,4 +1,4 @@ -##!/bin/bash +##!/bin/sh if [ "$1" = "-h" -o "$1" = "--help" -o "$1" = "-help" ]; then @@ -16,7 +16,7 @@ if [ "$1" = "-h" -o "$1" = "--help" -o "$1" = "-help" echo " --use_qt5=N : disable Qt5 immodule" echo " --use_gtk3=N : disable GTK+ 3.x immodule" echo " --gcinlibdir=dir : runtime path of gcin's *.so" - echo " --doc_version_dir=N : doc path use /usr/share/doc/gcin instead of /doc/gcin-x.x.x" + echo " --doc_version_dir=N : doc path use $prefix/share/doc/gcin instead of /doc/gcin-x.x.x" exit fi @@ -129,7 +129,7 @@ if [ -z $GTK ]; then echo "According to pkg-config, GTK 2.0 or 3.0 WAS NOT FOUND." echo "please install rpm/package libgtk+2.0_0-devel or libgtk+3.0_0-devel" rm -f config.mak - exits + exit fi echo "$GTK will be used." @@ -232,7 +232,7 @@ fi QT4_IM='N' -QT4_IM_DIR=/usr/$LIB/qt4/plugins/inputmethods +QT4_IM_DIR=$prefix/$LIB/qt4/plugins/inputmethods echo "testing if you have qt4 support" pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null if [ $? = 0 ]; then @@ -291,7 +291,7 @@ fi bindir=$prefix/bin datadir=$prefix/share -mandir=$datadir/man +mandir=$prefix/man libdir=$prefix/$LIB includedir=$prefix/include optdir=/opt @@ -306,9 +306,9 @@ if [ $QT_IM = 'N' ]; then mv gcin.spec gcin.spec.tmp grep -v qt3/plugins/inputmethods gcin.spec.tmp > gcin.spec else - for i in /usr/share/qt/bin/moc /usr/lib/qt/bin/moc /usr/lib64/qt/bin/moc /usr/lib/qt3/bin/moc /usr/share/qt3/bin/moc /usr/lib64/qt3/bin/moc -+ for i in $prefix/share/qt/bin/moc /usr/lib/qt/bin/moc /usr/lib64/qt/bin/moc /usr/lib/qt3/bin/moc /usr/share/qt3/bin/moc /usr/lib64/qt3/bin/moc ++ for i in $prefix/share/qt/bin/moc /usr/lib/qt/bin/moc /usr/lib64/qt/bin/moc /usr/lib/qt3/bin/moc $prefix/share/qt3/bin/moc /usr/lib64/qt3/bin/moc do - [ ! -x $i ] && continue -+ [ ! -x $i ] & continue ++ [ ! -x $i ] continue QT_MOC=$i echo "QT_MOC=$QT_MOC" break; @@ -322,9 +322,9 @@ if [ $QT4_IM = 'N' ]; then mv gcin.spec gcin.spec.tmp grep -v qt4/plugins/inputmethods gcin.spec.tmp > gcin.spec else - for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc /usr/bin/moc + for i in %%MOC%% $prefix/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc /usr/bin/moc do - [ ! -x $i ] && continue + [ ! -x $i ] continue QT4_MOC=$i echo "QT4_MOC=$QT4_MOC" break @@ -351,9 +351,9 @@ else cp gcin-qt5.h.in gcin-qt5.h fi cd .. - for i in /usr/share/qt5/bin/moc /usr/lib/qt5/bin/moc /usr/lib/x86_64-linux-gnu/qt5/bin/moc /usr/lib/i386-linux-gnu/qt5/bin/moc /usr/lib64/qt5/bin/moc /usr/bin/moc + for i in $prefix/share/qt5/bin/moc /usr/lib/qt5/bin/moc /usr/lib/x86_64-linux-gnu/qt5/bin/moc /usr/lib/i386-linux-gnu/qt5/bin/moc /usr/lib64/qt5/bin/moc /usr/bin/moc do - [ ! -x $i ] && continue + [ ! -x $i ] continue QT5_MOC=$i echo "QT5_MOC=$QT5_MOC" break @@ -362,7 +362,7 @@ fi BUILD_MODULE='Y' -if [ $USE_ANTHY = 'Y' ] || [ $USE_CHEWING = 'Y' ]; then +if [ $USE_ANTHY = 'Y' ]; then BUILD_MODULE='Y' fi @@ -388,7 +388,7 @@ echo "datadir_r=$datadir" >> config.mak echo "libdir=\$(DESTDIR)$libdir" >> config.mak echo "gcinlibdir=\$(DESTDIR)$gcinlibdir" >> config.mak echo "includedir=\$(DESTDIR)$includedir" >> config.mak -echo "LDFLAGS=-Wl,--as-needed $GTKLDFLAGS -lX11 -ldl -lm" >> config.mak +echo "LDFLAGS=-Wl,--as-needed $GTKLDFLAGS -lX11 -lm" >> config.mak echo "GCIN_VERSION=$GCIN_VERSION" >> config.mak echo "GCIN_TABLE_DIR=\$(datadir_r)/gcin/table" >> config.mak echo "GCIN_OGG_DIR=\$(datadir_r)/gcin/ogg" >> config.mak @@ -406,8 +406,8 @@ if [ "$doc_version_dir" = 'N' ]; then echo "DOC_DIR=\$(datadir_r)/doc/gcin" >> config.mak echo "DOC_DIR_i=\$(datadir)/doc/gcin" >> config.mak else - echo "DOC_DIR=\$(datadir_r)/doc/gcin-$GCIN_VERSION" >> config.mak - echo "DOC_DIR_i=\$(datadir)/doc/gcin-$GCIN_VERSION" >> config.mak + echo "DOC_DIR=\$(datadir_r)/doc/gcin" >> config.mak + echo "DOC_DIR_i=\$(datadir)/doc/gcin" >> config.mak fi echo "GCIN_ICON_DIR=\$(datadir_r)/icons/gcin" >> config.mak @@ -435,11 +435,16 @@ echo "USE_INDICATOR=$USE_INDICATOR" >> config.mak echo "USE_GCB=$use_gcb" >> config.mak echo "BUILD_MODULE=$BUILD_MODULE" >> config.mak echo "GTK_QUERY_IM_64=$GTK_QUERY_IM_64" >> config.mak -[ $QT5_IM = 'Y' ] && echo "QT5_MOC=$QT5_MOC" >> config.mak -[ $QT4_IM = 'Y' ] && echo "QT4_MOC=$QT4_MOC" >> config.mak -[ $QT_IM = 'Y' ] && echo "QT_MOC=$QT_MOC" >> config.mak +if [ $QT5_IM = 'Y' ]; then + echo "QT5_MOC=$QT5_MOC" >> config.mak +fi +if [ $QT4_IM = 'Y' ]; then + echo "QT4_MOC=$QT4_MOC" >> config.mak +fi +if [ $QT_IM = 'Y' ]; then + echo "QT_MOC=$QT_MOC" >> config.mak +fi -echo "GCIN_DEBUG=0" >> config.mak if [ $prefix = /usr/local ]; then echo "gcin_ld_run_path=$PWD:$PWD/im-client:\$(gcinlibdir)" >> config.mak else Index: head/chinese/gcin/files/patch-gcb.cpp =================================================================== --- head/chinese/gcin/files/patch-gcb.cpp (revision 499845) +++ head/chinese/gcin/files/patch-gcb.cpp (revision 499846) @@ -1,21 +1,24 @@ ---- gcb.cpp.orig 2015-11-22 23:15:12 UTC +--- gcb.cpp.orig 2019-03-06 00:33:25 UTC +++ gcb.cpp @@ -1,3 +1,4 @@ +#if USE_GCB #include #include "os-dep.h" #include @@ -6,6 +7,7 @@ #include "gcin.h" #include "gcin-conf.h" +void free_gcb(); static GtkWidget *mainwin; static GtkClipboard *pclipboard_clipboard, *pclipboard_primary; static GtkWidget **buttonArr; -@@ -529,4 +531,4 @@ void free_gcb() { - g_free(buttonStr); buttonStr = NULL; +@@ -256,7 +258,7 @@ static void get_mouse_button( GtkWidget *widget,GdkEve + } } - +#endif + static void hist_get_mouse_button( GtkWidget *widget,GdkEventButton *event, gpointer data) + { + int i; Index: head/chinese/gcin/files/patch-im-client_Makefile =================================================================== --- head/chinese/gcin/files/patch-im-client_Makefile (nonexistent) +++ head/chinese/gcin/files/patch-im-client_Makefile (revision 499846) @@ -0,0 +1,14 @@ +--- im-client/Makefile.orig 2011-12-17 06:16:17 UTC ++++ im-client/Makefile +@@ -20,10 +20,9 @@ OBJS = gcin-im-client.o im-addr.o gcin-conf.o util.o g + $(CC) -x c -c $(CFLAGS) $< + + $(SOFILEVER): $(OBJS) +- $(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -lX11 -o $@ -L/usr/X11R6/lib ++ $(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -lX11 -o $@ -L/usr/local/lib + ln -sf $(SOFILEVER) $(SOFILE) + ln -sf $(SOFILEVER) $(SOFILE).1 +- $(MAKE) -C ../gtk-im + + LOCALLIB=/usr/local/$(LIB) + Property changes on: head/chinese/gcin/files/patch-im-client_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/chinese/gcin/pkg-message =================================================================== --- head/chinese/gcin/pkg-message (revision 499845) +++ head/chinese/gcin/pkg-message (revision 499846) @@ -1,10 +1,10 @@ =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= Remember to set these environment varibles (such as your ~/.xinitrc): export XMODIFIERS='@im=gcin' - export GTK_IM_MODULE=xim + export GTK_IM_MODULE=gcin # Finally, to start the GCIN input method daemon, use command: exec gcin & =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= Index: head/chinese/gcin/pkg-plist =================================================================== --- head/chinese/gcin/pkg-plist (revision 499845) +++ head/chinese/gcin/pkg-plist (revision 499846) @@ -1,171 +1,168 @@ bin/gcin bin/gcin-exit bin/gcin-gb-toggle bin/gcin-kbm-toggle bin/gcin-message bin/gcin-tools bin/gcin2tab bin/gtab-db-gen bin/gtab-merge bin/juyin-learn bin/phoa2d bin/phod2a bin/sim2trad bin/trad2sim bin/ts-contribute bin/ts-contribute-en bin/ts-edit bin/ts-edit-en bin/tsa2d32 bin/tsd2a32 bin/tsin2gtab-phrase bin/tslearn bin/txt2gtab-phrase %%ANTHY%%lib/gcin/anthy-module.so lib/gcin/gcin1.so lib/gcin/gcin2.so lib/gcin/intcode-module.so lib/gcin/libgcin-im-client.so lib/gcin/libgcin-im-client.so.1 lib/gcin/libgcin-im-client.so.1.2.5 -lib/gtk-2.0/immodules/im-gcin.so man/man1/gcin-exit.1.gz man/man1/gcin-gb-toggle.1.gz man/man1/gcin-kbm-toggle.1.gz man/man1/gcin-message.1.gz man/man1/gcin-tools.1.gz man/man1/gcin.1.gz man/man1/gcin2tab.1.gz man/man1/gtab-merge.1.gz man/man1/juyin-learn.1.gz man/man1/phoa2d.1.gz man/man1/sim2trad.1.gz man/man1/ts-contribute.1.gz man/man1/ts-edit.1.gz man/man1/tsa2d32.1.gz man/man1/tslearn.1.gz share/applications/gcin-tools.desktop %%DATADIR%%/script/gcin-user-setup %%DATADIR%%/script/gtab.append_prepare %%DATADIR%%/script/html-browser %%DATADIR%%/script/tsin-gtab-edit %%DATADIR%%/script/tsin-gtab-import %%DATADIR%%/script/utf8-edit %%DATADIR%%/table/NewCJ3.gtab %%DATADIR%%/table/ar30-big.gtab %%DATADIR%%/table/ar30.gtab %%DATADIR%%/table/ar33.gtab %%DATADIR%%/table/array-symbols.gtab %%DATADIR%%/table/array10a.gtab %%DATADIR%%/table/cj-punc.gtab %%DATADIR%%/table/cj.gtab %%DATADIR%%/table/cj5.gtab %%DATADIR%%/table/cj543.gtab %%DATADIR%%/table/colemak.kbm %%DATADIR%%/table/dayi3.gtab %%DATADIR%%/table/dvorak.kbm %%DATADIR%%/table/en-american %%DATADIR%%/table/en-american.idx %%DATADIR%%/table/et.kbm %%DATADIR%%/table/et26.kbm %%DATADIR%%/table/german.gtab %%DATADIR%%/table/greek.gtab %%DATADIR%%/table/gtab.list %%DATADIR%%/table/hangul-phrase.txt %%DATADIR%%/table/hangul.gtab %%DATADIR%%/table/hsu.kbm %%DATADIR%%/table/ibm.kbm %%DATADIR%%/table/jyutping.gtab %%DATADIR%%/table/latin-letters.gtab %%DATADIR%%/table/mitac.kbm %%DATADIR%%/table/pho-char.gtab %%DATADIR%%/table/pho-huge.tab2 %%DATADIR%%/table/pho.tab2 %%DATADIR%%/table/phrase-ctrl.table %%DATADIR%%/table/phrase.table %%DATADIR%%/table/pin-juyin.xlt %%DATADIR%%/table/pinyin-no-tone.kbm %%DATADIR%%/table/pinyin.gtab %%DATADIR%%/table/pinyin.kbm %%DATADIR%%/table/russian.gtab %%DATADIR%%/table/s-pho-huge.tab2 %%DATADIR%%/table/s-pho.tab2 %%DATADIR%%/table/s-tsin32 %%DATADIR%%/table/s-tsin32.idx %%DATADIR%%/table/s2t.dat %%DATADIR%%/table/simplex-punc.gtab %%DATADIR%%/table/simplex.gtab %%DATADIR%%/table/symbol-table %%DATADIR%%/table/symbols.gtab %%DATADIR%%/table/t2s.dat %%DATADIR%%/table/tsin-1.src %%DATADIR%%/table/tsin32 %%DATADIR%%/table/tsin32.idx %%DATADIR%%/table/vims.gtab %%DATADIR%%/table/zo.kbm share/icons/gcin/4corner.png share/icons/gcin/NewCJ3.png share/icons/gcin/amis-gcin.png share/icons/gcin/ar30-big.png share/icons/gcin/ar30.png share/icons/gcin/ar33.png share/icons/gcin/array-symbols.png share/icons/gcin/chewing.png share/icons/gcin/cj-punc.png share/icons/gcin/cj.png share/icons/gcin/cj5.png share/icons/gcin/cj543.png share/icons/gcin/dayi3.png share/icons/gcin/en-gcin-A.png share/icons/gcin/en-gcin.png share/icons/gcin/en-gtab-A.png share/icons/gcin/en-gtab.png share/icons/gcin/en-kana-nippon.png share/icons/gcin/en-tsin-A.png share/icons/gcin/en-tsin.png share/icons/gcin/erbi.png share/icons/gcin/ez.png share/icons/gcin/fcitx-qxm.png share/icons/gcin/fcitx-wanfeng.png share/icons/gcin/full-simp.png share/icons/gcin/full-trad.png share/icons/gcin/gcb.png share/icons/gcin/gcin_tray.png share/icons/gcin/gdayi3.png share/icons/gcin/german.png share/icons/gcin/greek.png share/icons/gcin/hakka.png share/icons/gcin/half-simp.png share/icons/gcin/half-trad.png share/icons/gcin/halfwidth-kana.png share/icons/gcin/hangul.png share/icons/gcin/intcode.png share/icons/gcin/jtcj_gb.png share/icons/gcin/juyin.png share/icons/gcin/jyutping.png share/icons/gcin/kana-nippon.png share/icons/gcin/latin-letters.png share/icons/gcin/newcj.png share/icons/gcin/noseeing.png share/icons/gcin/paiwan-gcin.png share/icons/gcin/pho-char.png share/icons/gcin/pinyin.png share/icons/gcin/russian.png share/icons/gcin/sakura.png share/icons/gcin/scj.png share/icons/gcin/shuangpin.png share/icons/gcin/simplex-punc.png share/icons/gcin/simplex.png share/icons/gcin/symbol_table.png share/icons/gcin/symbols.png share/icons/gcin/taiwan.png share/icons/gcin/telecode.png share/icons/gcin/tsin.png share/icons/gcin/tsou-gcin.png share/icons/gcin/vietnam.png share/icons/gcin/vocabulary.png share/icons/gcin/wm2.png share/icons/gcin/wubi.png share/icons/hicolor/64x64/apps/gcin.png -@postexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache -@postunexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache