Date: Mon, 20 Jul 2020 13:09:52 +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: r542631 - in head/chinese/gcin: . files Message-ID: <202007201309.06KD9qC3065554@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Mon Jul 20 13:09:51 2020 New Revision: 542631 URL: https://svnweb.freebsd.org/changeset/ports/542631 Log: Update to 2.9.0. Modified: head/chinese/gcin/Makefile head/chinese/gcin/distinfo head/chinese/gcin/files/patch-Makefile head/chinese/gcin/files/patch-configure head/chinese/gcin/files/patch-gtab-buf.cpp Modified: head/chinese/gcin/Makefile ============================================================================== --- head/chinese/gcin/Makefile Mon Jul 20 12:59:03 2020 (r542630) +++ head/chinese/gcin/Makefile Mon Jul 20 13:09:51 2020 (r542631) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcin -PORTVERSION= 2.8.9 +PORTVERSION= 2.9.0 CATEGORIES= chinese textproc gnome MASTER_SITES= http://hyperrate.com/gcin-source/ EXTRACT_ONLY= gcin-${PORTVERSION}.tar.xz Modified: head/chinese/gcin/distinfo ============================================================================== --- head/chinese/gcin/distinfo Mon Jul 20 12:59:03 2020 (r542630) +++ head/chinese/gcin/distinfo Mon Jul 20 13:09:51 2020 (r542631) @@ -1,3 +1,3 @@ -TIMESTAMP = 1552571155 -SHA256 (gcin-2.8.9.tar.xz) = e08426cc85c5932392ebf73ac7d140cd778862517c3ea0cf8953aaab6c14d078 -SIZE (gcin-2.8.9.tar.xz) = 4033152 +TIMESTAMP = 1593822948 +SHA256 (gcin-2.9.0.tar.xz) = 8ae41fb35911112989a9388d66b678d142e05afe3e09063c9ef6fd5746127e60 +SIZE (gcin-2.9.0.tar.xz) = 4050656 Modified: head/chinese/gcin/files/patch-Makefile ============================================================================== --- head/chinese/gcin/files/patch-Makefile Mon Jul 20 12:59:03 2020 (r542630) +++ head/chinese/gcin/files/patch-Makefile Mon Jul 20 13:09:51 2020 (r542631) @@ -1,4 +1,4 @@ ---- Makefile.orig 2019-03-07 09:07:52 UTC +--- Makefile.orig 2020-05-15 23:04:33 UTC +++ Makefile @@ -4,8 +4,11 @@ include config.mak include suffixes-rule Modified: head/chinese/gcin/files/patch-configure ============================================================================== --- head/chinese/gcin/files/patch-configure Mon Jul 20 12:59:03 2020 (r542630) +++ head/chinese/gcin/files/patch-configure Mon Jul 20 13:09:51 2020 (r542631) @@ -1,8 +1,8 @@ ---- configure.orig 2019-02-01 23:11:02 UTC +--- configure.orig 2019-09-05 05:24:10 UTC +++ configure @@ -1,4 +1,4 @@ -##!/bin/bash -+##!/bin/sh ++#!/bin/sh if [ "$1" = "-h" -o "$1" = "--help" -o "$1" = "-help" ]; then @@ -15,15 +15,6 @@ 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 @@ -50,7 +41,7 @@ + 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; @@ -62,7 +53,7 @@ + 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 @@ -71,10 +62,10 @@ 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 ++ for i in $prefix/share/qt6/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 @@ -115,13 +106,13 @@ -[ $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 ++ echo "QT5_MOC=$QT5_MOC" >> config.mak +fi +if [ $QT4_IM = 'Y' ]; then -+ echo "QT4_MOC=$QT4_MOC" >> config.mak ++ echo "QT4_MOC=$QT4_MOC" >> config.mak +fi +if [ $QT_IM = 'Y' ]; then -+ echo "QT_MOC=$QT_MOC" >> config.mak ++ echo "QT_MOC=$QT_MOC" >> config.mak +fi -echo "GCIN_DEBUG=0" >> config.mak Modified: head/chinese/gcin/files/patch-gtab-buf.cpp ============================================================================== --- head/chinese/gcin/files/patch-gtab-buf.cpp Mon Jul 20 12:59:03 2020 (r542630) +++ head/chinese/gcin/files/patch-gtab-buf.cpp Mon Jul 20 13:09:51 2020 (r542631) @@ -1,6 +1,6 @@ ---- gtab-buf.cpp.orig 2018-05-21 12:35:13 UTC +--- gtab-buf.cpp.orig 2020-03-14 07:23:09 UTC +++ gtab-buf.cpp -@@ -1242,7 +1242,7 @@ gboolean gtab_pre_select_shift(KeySym key, int kbstate +@@ -1253,7 +1253,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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007201309.06KD9qC3065554>