Update scim-chewing to 0.3.5.

What's New in SCIM-chewing 0.3.5
---------------------------------------------------------
* Gtk+ 3.x support
* Handle translated Chi-Eng mode switch properly
* Fix incorrect color cand problem
* Support THL (Taiwan Huayu Luomapinyin) and MPS2 Pinyin keyboard

4 files changed, 80 insertions, 8 deletions

diff --git a/inputmethod/scim-chewing/Makefile b/inputmethod/scim-chewing/Makefile
index 75f331175a7..a00fa99c720 100644
--- a/inputmethod/scim-chewing/Makefile
+++ b/inputmethod/scim-chewing/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2013/08/10 07:11:02 obache Exp $
+# $NetBSD: Makefile,v 1.23 2013/08/10 09:31:37 obache Exp $
 #
 
-DISTNAME=		scim-chewing-0.3.4
-PKGREVISION=		12
+DISTNAME=		scim-chewing-0.3.5
 CATEGORIES=		inputmethod
 MASTER_SITES=		http://chewing.googlecode.com/files/
 EXTRACT_SUFX=		.tar.bz2
@@ -21,7 +20,7 @@ GNU_CONFIGURE=		yes
 USE_SCIM_GTKUTILS=	yes
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libchewing+=	libchewing>=0.3.3
+BUILDLINK_API_DEPENDS.libchewing+=	libchewing>=0.3.4
 .include "../../inputmethod/libchewing/buildlink3.mk"
 .include "../../inputmethod/scim/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/scim-chewing/distinfo b/inputmethod/scim-chewing/distinfo
index f4eade23191..1e67b9b06a5 100644
--- a/inputmethod/scim-chewing/distinfo
+++ b/inputmethod/scim-chewing/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2011/10/08 08:25:10 obache Exp $
+$NetBSD: distinfo,v 1.3 2013/08/10 09:31:37 obache Exp $
 
-SHA1 (scim-chewing-0.3.4.tar.bz2) = f6c8d16f19f17449ee169f1ca787350353e93b05
-RMD160 (scim-chewing-0.3.4.tar.bz2) = 77fefe65d26c0f3369ed7dec0c46e6e986851ab2
-Size (scim-chewing-0.3.4.tar.bz2) = 374182 bytes
+SHA1 (scim-chewing-0.3.5.tar.bz2) = f26ced990f0c9e5d43e271cd6e77583de81a008d
+RMD160 (scim-chewing-0.3.5.tar.bz2) = e174c062d9f603ab08fcffb67d273821ee0ff06c
+Size (scim-chewing-0.3.5.tar.bz2) = 352975 bytes
+SHA1 (patch-configure) = bc99480445633ea0d0fd7e12d17185f1eaabad9c
+SHA1 (patch-configure.ac) = c699dfea2d256c38824c6ccd132a90f7de0ae751
diff --git a/inputmethod/scim-chewing/patches/patch-configure b/inputmethod/scim-chewing/patches/patch-configure
new file mode 100644
index 00000000000..be55ef45d66
--- /dev/null
+++ b/inputmethod/scim-chewing/patches/patch-configure
@@ -0,0 +1,56 @@
+$NetBSD: patch-configure,v 1.1 2013/08/10 09:31:37 obache Exp $
+
+* relax required chwing version
+
+--- configure.orig	2013-08-10 09:18:56.000000000 +0000
++++ configure
+@@ -19601,12 +19601,12 @@ if test -n "$CHEWING_CFLAGS"; then
+     pkg_cv_CHEWING_CFLAGS="$CHEWING_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"chewing = \$CHEWING_VERSION\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "chewing = $CHEWING_VERSION") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"chewing >= \$CHEWING_VERSION\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "chewing >= $CHEWING_VERSION") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_CHEWING_CFLAGS=`$PKG_CONFIG --cflags "chewing = $CHEWING_VERSION" 2>/dev/null`
++  pkg_cv_CHEWING_CFLAGS=`$PKG_CONFIG --cflags "chewing >= $CHEWING_VERSION" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -19618,12 +19618,12 @@ if test -n "$CHEWING_LIBS"; then
+     pkg_cv_CHEWING_LIBS="$CHEWING_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"chewing = \$CHEWING_VERSION\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "chewing = $CHEWING_VERSION") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"chewing >= \$CHEWING_VERSION\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "chewing >= $CHEWING_VERSION") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_CHEWING_LIBS=`$PKG_CONFIG --libs "chewing = $CHEWING_VERSION" 2>/dev/null`
++  pkg_cv_CHEWING_LIBS=`$PKG_CONFIG --libs "chewing >= $CHEWING_VERSION" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -19644,14 +19644,14 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        CHEWING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "chewing = $CHEWING_VERSION" 2>&1`
++	        CHEWING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "chewing >= $CHEWING_VERSION" 2>&1`
+         else
+-	        CHEWING_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "chewing = $CHEWING_VERSION" 2>&1`
++	        CHEWING_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "chewing >= $CHEWING_VERSION" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$CHEWING_PKG_ERRORS" >&5
+ 
+-	as_fn_error $? "Package requirements (chewing = $CHEWING_VERSION) were not met:
++	as_fn_error $? "Package requirements (chewing >= $CHEWING_VERSION) were not met:
+ 
+ $CHEWING_PKG_ERRORS
+ 
diff --git a/inputmethod/scim-chewing/patches/patch-configure.ac b/inputmethod/scim-chewing/patches/patch-configure.ac
new file mode 100644
index 00000000000..b25c3d913fc
--- /dev/null
+++ b/inputmethod/scim-chewing/patches/patch-configure.ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.ac,v 1.1 2013/08/10 09:31:37 obache Exp $
+
+* relax required chwing version
+
+--- configure.ac.orig	2012-12-31 05:55:13.000000000 +0000
++++ configure.ac
+@@ -59,7 +59,7 @@ PKG_CHECK_MODULES(SCIM_GTKUTILS,[scim-gt
+ 
+ AC_SUBST(SCIM_VERSION)
+ 
+-PKG_CHECK_MODULES(CHEWING, [chewing = $CHEWING_VERSION])
++PKG_CHECK_MODULES(CHEWING, [chewing >= $CHEWING_VERSION])
+ AC_SUBST(CHEWING_VERSION)
+ 
+ AM_CONDITIONAL(SCIM_BUILD_SETUP, [test "$SCIM_HAS_GTKUTILS" = "yes"])