Date: Mon, 21 May 2018 15:36:13 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470554 - in head/chinese: gcin gcin-gtk3 gcin-qt4 gcin-qt5 gcin-qt5/files gcin/files Message-ID: <201805211536.w4LFaDFr038908@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Mon May 21 15:36:12 2018 New Revision: 470554 URL: https://svnweb.freebsd.org/changeset/ports/470554 Log: Update to 2.8.6. Added: head/chinese/gcin/files/patch-gtab-buf.cpp (contents, props changed) head/chinese/gcin/files/patch-table-update.cpp (contents, props changed) Modified: head/chinese/gcin-gtk3/Makefile head/chinese/gcin-gtk3/distinfo head/chinese/gcin-qt4/Makefile head/chinese/gcin-qt4/distinfo head/chinese/gcin-qt5/Makefile head/chinese/gcin-qt5/distinfo head/chinese/gcin-qt5/files/patch-Makefile head/chinese/gcin/Makefile head/chinese/gcin/distinfo head/chinese/gcin/files/patch-Makefile head/chinese/gcin/files/patch-configure head/chinese/gcin/pkg-plist Modified: head/chinese/gcin-gtk3/Makefile ============================================================================== --- head/chinese/gcin-gtk3/Makefile Mon May 21 15:20:18 2018 (r470553) +++ head/chinese/gcin-gtk3/Makefile Mon May 21 15:36:12 2018 (r470554) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcin -PORTVERSION= 2.8.5 +PORTVERSION= 2.8.6 CATEGORIES= chinese textproc gnome MASTER_SITES= http://hyperrate.com/gcin-source/ PKGNAMESUFFIX= -gtk3 Modified: head/chinese/gcin-gtk3/distinfo ============================================================================== --- head/chinese/gcin-gtk3/distinfo Mon May 21 15:20:18 2018 (r470553) +++ head/chinese/gcin-gtk3/distinfo Mon May 21 15:36:12 2018 (r470554) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488877345 -SHA256 (gcin-2.8.5.tar.xz) = 7a191f71136496e407b2554dd5b8775ebfde4389a37c8a4f3e153485760de93b -SIZE (gcin-2.8.5.tar.xz) = 4005548 +TIMESTAMP = 1526909579 +SHA256 (gcin-2.8.6.tar.xz) = b23432e6e60da45c129d53a0f503488b7933c7954ad5c65711b740c68c7afce0 +SIZE (gcin-2.8.6.tar.xz) = 4035688 Modified: head/chinese/gcin-qt4/Makefile ============================================================================== --- head/chinese/gcin-qt4/Makefile Mon May 21 15:20:18 2018 (r470553) +++ head/chinese/gcin-qt4/Makefile Mon May 21 15:36:12 2018 (r470554) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcin -PORTVERSION= 2.8.5 +PORTVERSION= 2.8.6 CATEGORIES= chinese textproc gnome MASTER_SITES= http://hyperrate.com/gcin-source/ PKGNAMESUFFIX= -qt4 Modified: head/chinese/gcin-qt4/distinfo ============================================================================== --- head/chinese/gcin-qt4/distinfo Mon May 21 15:20:18 2018 (r470553) +++ head/chinese/gcin-qt4/distinfo Mon May 21 15:36:12 2018 (r470554) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488877345 -SHA256 (gcin-2.8.5.tar.xz) = 7a191f71136496e407b2554dd5b8775ebfde4389a37c8a4f3e153485760de93b -SIZE (gcin-2.8.5.tar.xz) = 4005548 +TIMESTAMP = 1526911589 +SHA256 (gcin-2.8.6.tar.xz) = b23432e6e60da45c129d53a0f503488b7933c7954ad5c65711b740c68c7afce0 +SIZE (gcin-2.8.6.tar.xz) = 4035688 Modified: head/chinese/gcin-qt5/Makefile ============================================================================== --- head/chinese/gcin-qt5/Makefile Mon May 21 15:20:18 2018 (r470553) +++ head/chinese/gcin-qt5/Makefile Mon May 21 15:36:12 2018 (r470554) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcin -PORTVERSION= 2.8.5 +PORTVERSION= 2.8.6 CATEGORIES= chinese textproc gnome MASTER_SITES= http://hyperrate.com/gcin-source/ PKGNAMESUFFIX= -qt5 @@ -22,7 +22,7 @@ USE_CXXSTD= c++11 MAKE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ MKDIR="${MKDIR}" -PLIST_FILES= %%QT_PLUGINDIR%%/platforminputcontexts/libgcinplatforminputcontextplugin.so +PLIST_FILES= ${QT_PLUGINDIR}/platforminputcontexts/libgcinplatforminputcontextplugin.so post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g; \ Modified: head/chinese/gcin-qt5/distinfo ============================================================================== --- head/chinese/gcin-qt5/distinfo Mon May 21 15:20:18 2018 (r470553) +++ head/chinese/gcin-qt5/distinfo Mon May 21 15:36:12 2018 (r470554) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488877345 -SHA256 (gcin-2.8.5.tar.xz) = 7a191f71136496e407b2554dd5b8775ebfde4389a37c8a4f3e153485760de93b -SIZE (gcin-2.8.5.tar.xz) = 4005548 +TIMESTAMP = 1526913930 +SHA256 (gcin-2.8.6.tar.xz) = b23432e6e60da45c129d53a0f503488b7933c7954ad5c65711b740c68c7afce0 +SIZE (gcin-2.8.6.tar.xz) = 4035688 Modified: head/chinese/gcin-qt5/files/patch-Makefile ============================================================================== --- head/chinese/gcin-qt5/files/patch-Makefile Mon May 21 15:20:18 2018 (r470553) +++ head/chinese/gcin-qt5/files/patch-Makefile Mon May 21 15:36:12 2018 (r470554) @@ -1,34 +1,34 @@ ---- Makefile.orig 2015-10-17 02:08:40 UTC +--- Makefile.orig 2018-05-12 11:25:26 UTC +++ Makefile -@@ -1,18 +1,20 @@ +@@ -1,19 +1,22 @@ -include ../config.mak +#include ../config.mak -+prefix=/usr/local ++prefix=%%PREFIX%% +libdir=$(prefix)/lib QT=qt5 -+QT5_MOC=/usr/local/lib/qt5/bin/moc ++QT5_MOC=$(prefix)/lib/qt5/bin/moc QTIM=$(QT)/plugins/platforminputcontexts -IMMODULES=$(libdir)/$(DEB_BUILD_MULTIARCH)/$(QTIM) +IMMODULES=$(libdir)/$(QTIM) --INCS=-I../im-client -I/usr/include/X11 `pkg-config Qt5Core Qt5Gui Qt5PlatformSupport QtDBus --cflags` -+INCS=-I../im-client -I$(prefix)/include -I$(prefix)/include/qt5 `pkg-config Qt5Core Qt5Gui Qt5DBus --cflags` +-INCS=-I../im-client -I/usr/include/X11 `pkg-config Qt5Core Qt5Gui --cflags` ++INCS=-I../im-client -I$(prefix)/include/X11 -I$(prefix)/include/qt5 `pkg-config Qt5Core Qt5Gui --cflags` MODVERSION=`pkg-config --modversion Qt5Gui` - QTINC=`pkg-config --variable=includedir Qt5Gui` --INCS+=-I$(QTINC)/QtGui/$(MODVERSION)/QtGui --#INCS+=-I/usr/include/i386-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui -+INCS+=-I$(QTINC)/QtGui/$(MODVERSION) -I$(QTINC)/QtGui/$(MODVERSION)/QtGui -I$(QTINC)/QtCore/$(MODVERSION) + INCS+=-I`pkg-config --variable=includedir Qt5Core`/QtCore/$(MODVERSION) + INCS+=-I`pkg-config --variable=includedir Qt5Gui`/QtGui/$(MODVERSION) + INCS+=-I`pkg-config --variable=includedir Qt5Gui`/QtGui/$(MODVERSION)/QtGui + #INCS+=-I/usr/include/i386-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui -CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC -DQT5 -DQT_SHARED -DQT_IMMODULE -DPIC -DDEBUG="0$(GCIN_DEBUG)" -+CXXFLAGS+=$(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC -DQT5 -DQT_SHARED -DQT_IMMODULE -DPIC -DDEBUG="0$(GCIN_DEBUG)" ++CXXFLAGS=$(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC -DQT5 -DQT_SHARED -DQT_IMMODULE -DPIC -DDEBUG="0$(GCIN_DEBUG)" OBJS= moc_gcin-qt5.o gcin-qt5.o gcin-imcontext-qt5.o moc_qgcinplatforminputcontext.o .SUFFIXES: .c .cpp .a .so .E .h --LDFLAGS=-L../im-client -lgcin-im-client `pkg-config Qt5Core Qt5Gui Qt5PlatformSupport --libs` +-LDFLAGS=-L../im-client -lgcin-im-client `pkg-config Qt5Core Qt5Gui --libs` +LDFLAGS=-L$(prefix)/lib -L$(prefix)/lib/gcin -lgcin-im-client `pkg-config Qt5Core Qt5Gui --libs` GCIN_QT5 = libgcinplatforminputcontextplugin.so -@@ -32,17 +34,13 @@ $(GCIN_QT5): $(OBJS) +@@ -33,17 +36,11 @@ $(GCIN_QT5): $(OBJS) $(CXX) $(gcc_ld_run_path) -fno-exceptions -shared -o $@ $(OBJS) $(LDFLAGS) rm -f core.* install: @@ -47,6 +47,5 @@ .depend: $(CXX) $(CXXFLAGS) -MM *.cpp > $@ - +- -include .depend -+#include .depend Modified: head/chinese/gcin/Makefile ============================================================================== --- head/chinese/gcin/Makefile Mon May 21 15:20:18 2018 (r470553) +++ head/chinese/gcin/Makefile Mon May 21 15:36:12 2018 (r470554) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gcin -PORTVERSION= 2.8.5 -PORTREVISION= 1 +PORTVERSION= 2.8.6 CATEGORIES= chinese textproc gnome MASTER_SITES= http://hyperrate.com/gcin-source/ EXTRACT_ONLY= gcin-${PORTVERSION}.tar.xz @@ -13,15 +12,17 @@ COMMENT= Traditional Chinese input utility in X LICENSE= LGPL21 +LIB_DEPENDS= libcurl.so:ftp/curl + +USES= gmake pkgconfig tar:xz HAS_CONFIGURE= YES CONFIGURE_ARGS+= --use_gtk3=N --use_qt3=N --use_qt4=N --use_qt5=N USE_GNOME= gtk20 -USES= gmake pkgconfig tar:xz USE_XORG= x11 xtst xext INSTALLS_ICONS= YES USE_LDCONFIG= ${PREFIX}/lib/gcin -OPTIONS_DEFINE= ANTHY DOCS +OPTIONS_DEFINE= ANTHY OPTIONS_SUB= yes ANTHY_DESC= Japanese anthy IM module @@ -39,7 +40,6 @@ post-patch: @${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,; \ s,%%PREFIX%%,${PREFIX},;' \ ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e '94 s/gcin/gcin-setup/' ${WRKSRC}/gcin-common.cpp @${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \ ${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile @${REINPLACE_CMD} -e 's,modify-XIM ,,; 8,10 d' \ @@ -60,9 +60,6 @@ post-patch: ${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-patch-DOCS-off: - @${REINPLACE_CMD} '/install.*DOC_DIR/d' ${WRKSRC}/Makefile post-build: .if !defined(DEBUG_FLAGS) Modified: head/chinese/gcin/distinfo ============================================================================== --- head/chinese/gcin/distinfo Mon May 21 15:20:18 2018 (r470553) +++ head/chinese/gcin/distinfo Mon May 21 15:36:12 2018 (r470554) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488877345 -SHA256 (gcin-2.8.5.tar.xz) = 7a191f71136496e407b2554dd5b8775ebfde4389a37c8a4f3e153485760de93b -SIZE (gcin-2.8.5.tar.xz) = 4005548 +TIMESTAMP = 1526826237 +SHA256 (gcin-2.8.6.tar.xz) = b23432e6e60da45c129d53a0f503488b7933c7954ad5c65711b740c68c7afce0 +SIZE (gcin-2.8.6.tar.xz) = 4035688 Modified: head/chinese/gcin/files/patch-Makefile ============================================================================== --- head/chinese/gcin/files/patch-Makefile Mon May 21 15:20:18 2018 (r470553) +++ head/chinese/gcin/files/patch-Makefile Mon May 21 15:36:12 2018 (r470554) @@ -1,4 +1,4 @@ ---- Makefile.orig 2016-10-20 22:43:16 UTC +--- Makefile.orig 2017-11-18 04:48:43 UTC +++ Makefile @@ -4,8 +4,11 @@ include config.mak include suffixes-rule @@ -12,19 +12,20 @@ GCIN_SO= gcin1.so gcin2.so -@@ -14,7 +17,11 @@ OBJS=gcin.o eve.o util.o gcin-conf.o gci +@@ -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 -- + 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 ++ 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 all: $(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) gcin.spec gcin-fedora.spec $(MAKE) -C data @@ -34,18 +35,18 @@ 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 +@@ -113,18 +120,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%%PREFIX%%/$(LIB) ++ $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(GCIN_LDFLAGS) -L/usr/local/$(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%%PREFIX%%/$(LIB) ++ $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/local/$(LIB) rm -f core.* -tslearn: $(OBJS_TSLEARN) @@ -54,7 +55,7 @@ -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 $(LDFLAGS) + $(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) @@ -78,7 +79,7 @@ $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_message) -L./im-client -lgcin-im-client $(LDFLAGS) pin-juyin: $(OBJS_pin_juyin) -@@ -229,13 +236,13 @@ install: +@@ -229,23 +236,19 @@ install: $(MAKE) -C data install $(MAKE) -C im-client install $(MAKE) -C gtk-im install @@ -90,22 +91,32 @@ 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 -d $(DOC_DIR); \ - install -m 644 README.html Changelog.html $(DOC_DIR); \ install $(PROGS) $(bindir); \ -@@ -253,6 +260,7 @@ install: + 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: + 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 -@@ -287,4 +295,4 @@ gcin-fedora.spec: gcin-fedora.spec.in VE +@@ -286,5 +290,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 -+#include .depend Modified: head/chinese/gcin/files/patch-configure ============================================================================== --- head/chinese/gcin/files/patch-configure Mon May 21 15:20:18 2018 (r470553) +++ head/chinese/gcin/files/patch-configure Mon May 21 15:36:12 2018 (r470554) @@ -1,11 +1,20 @@ ---- configure.orig 2017-03-07 17:41:15.493370000 +0800 -+++ configure 2017-03-07 17:48:14.458037000 +0800 +--- configure.orig 2018-05-12 11:15:17 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" @@ -33,28 +42,43 @@ 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 + do +- [ ! -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%% /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 ++ [ ! -x $i ] continue QT4_MOC=$i echo "QT4_MOC=$QT4_MOC" break -@@ -347,7 +347,7 @@ else +@@ -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 /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 ++ [ ! -x $i ] continue QT5_MOC=$i echo "QT5_MOC=$QT5_MOC" break -@@ -356,7 +356,7 @@ fi +@@ -362,7 +362,7 @@ fi BUILD_MODULE='Y' @@ -63,7 +87,7 @@ BUILD_MODULE='Y' fi -@@ -382,7 +382,7 @@ echo "datadir_r=$datadir" >> config.mak +@@ -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 @@ -72,7 +96,18 @@ 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 -@@ -429,9 +429,15 @@ echo "USE_INDICATOR=$USE_INDICATOR" >> c +@@ -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 @@ -89,5 +124,7 @@ + echo "QT_MOC=$QT_MOC" >> config.mak +fi - echo "GCIN_DEBUG=0" >> config.mak +-echo "GCIN_DEBUG=0" >> config.mak if [ $prefix = /usr/local ]; then + echo "gcin_ld_run_path=$PWD:$PWD/im-client:\$(gcinlibdir)" >> config.mak + else Added: head/chinese/gcin/files/patch-gtab-buf.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/gcin/files/patch-gtab-buf.cpp Mon May 21 15:36:12 2018 (r470554) @@ -0,0 +1,11 @@ +--- gtab-buf.cpp.orig 2018-05-21 12:35:13 UTC ++++ gtab-buf.cpp +@@ -1242,7 +1242,7 @@ gboolean gtab_pre_select_shift(KeySym key, int kbstate + // If the key(123) is not defined as gtab keys, the shift keys(!@#) should be used for punc, not preselect + int c; + char *p; +- if (p=strchr(cur_inmd->selkey, key)) { ++ if ((p=strchr(cur_inmd->selkey, key))) { + c = p - cur_inmd->selkey; + return gtab_pre_select_idx(c); + } else Added: head/chinese/gcin/files/patch-table-update.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/gcin/files/patch-table-update.cpp Mon May 21 15:36:12 2018 (r470554) @@ -0,0 +1,11 @@ +--- table-update.cpp.orig 2018-05-21 12:32:01 UTC ++++ table-update.cpp +@@ -1,7 +1,7 @@ + #include "gcin.h" + #include <sys/stat.h> + #if UNIX +-#include <linux/limits.h> ++#include <sys/limits.h> + #endif + + void update_table_file(char *name, int version) Modified: head/chinese/gcin/pkg-plist ============================================================================== --- head/chinese/gcin/pkg-plist Mon May 21 15:20:18 2018 (r470553) +++ head/chinese/gcin/pkg-plist Mon May 21 15:36:12 2018 (r470554) @@ -45,8 +45,6 @@ man/man1/ts-edit.1.gz man/man1/tsa2d32.1.gz man/man1/tslearn.1.gz share/applications/gcin-tools.desktop -%%PORTDOCS%%%%DOCSDIR%%/Changelog.html -%%PORTDOCS%%%%DOCSDIR%%/README.html %%DATADIR%%/script/gcin-user-setup %%DATADIR%%/script/gtab.append_prepare %%DATADIR%%/script/html-browser
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805211536.w4LFaDFr038908>