# svn status M distinfo D files D files/patch-src-IBusChewingEngine-input-events.c D files/patch-src-IBusChewingEngine.gob M pkg-plist M Makefile Index: distinfo =================================================================== --- distinfo (revision 304413) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (ibus-chewing-1.3.10-Source.tar.gz) = 171402a7d6d141d485454493e097746d73da7cef172d2ab5ec1a2c593a2ee1c8 -SIZE (ibus-chewing-1.3.10-Source.tar.gz) = 75365 +SHA256 (ibus-chewing-1.4.2-Source.tar.gz) = 857f479ebd85ecc217550573f80e1bff91b6e9bca4d1c9189f790fa6a9e3f75f +SIZE (ibus-chewing-1.4.2-Source.tar.gz) = 84351 Index: files/patch-src-IBusChewingEngine-input-events.c =================================================================== --- files/patch-src-IBusChewingEngine-input-events.c (revision 304413) +++ files/patch-src-IBusChewingEngine-input-events.c (working copy) @@ -1,27 +0,0 @@ -http://bugs.gentoo.org/407695 - ---- src/IBusChewingEngine-input-events.c -+++ src/IBusChewingEngine-input-events.c -@@ -291,12 +291,21 @@ - /* Toggle Full <-> Half */ - chewing_set_ShapeMode(self->context, !chewing_get_ShapeMode(self->context)); - }else if (strcmp(prop_name,"chewing_settings_prop")==0){ -- if (self->settings_prop->state==PROP_STATE_UNCHECKED){ -+#if IBUS_CHECK_VERSION(1, 4, 0) -+ if (ibus_property_get_state(self->settings_prop)==PROP_STATE_UNCHECKED) -+#else -+ if (self->settings_prop->state==PROP_STATE_UNCHECKED) -+#endif -+ { - if (gtk_dialog_run(GTK_DIALOG(self->setting_dialog))==GTK_RESPONSE_OK){ - self_save_config_all(self); - } - gtk_widget_hide(self->setting_dialog); -+#if IBUS_CHECK_VERSION(1, 4, 0) -+ ibus_property_set_state(self->settings_prop,PROP_STATE_UNCHECKED); -+#else - self->settings_prop->state=PROP_STATE_UNCHECKED; -+#endif - } - }else{ - G_DEBUG_MSG(3,"[I3] property_activate(-, %s, %u) not recognized",prop_name, prop_state); Index: files/patch-src-IBusChewingEngine.gob =================================================================== --- files/patch-src-IBusChewingEngine.gob (revision 304413) +++ files/patch-src-IBusChewingEngine.gob (working copy) @@ -1,27 +0,0 @@ -http://bugs.gentoo.org/407695 - ---- src/IBusChewingEngine.gob -+++ src/IBusChewingEngine.gob -@@ -1041,12 +1041,21 @@ - /* Toggle Full <-> Half */ - chewing_set_ShapeMode(self->context, !chewing_get_ShapeMode(self->context)); - }else if (strcmp(prop_name,"chewing_settings_prop")==0){ -- if (self->settings_prop->state==PROP_STATE_UNCHECKED){ -+#if IBUS_CHECK_VERSION(1, 4, 0) -+ if (ibus_property_get_state(self->settings_prop)==PROP_STATE_UNCHECKED) -+#else -+ if (self->settings_prop->state==PROP_STATE_UNCHECKED) -+#endif -+ { - if (gtk_dialog_run(GTK_DIALOG(self->setting_dialog))==GTK_RESPONSE_OK){ - self_save_config_all(self); - } - gtk_widget_hide(self->setting_dialog); -+#if IBUS_CHECK_VERSION(1, 4, 0) -+ ibus_property_set_state(self->settings_prop,PROP_STATE_UNCHECKED); -+#else - self->settings_prop->state=PROP_STATE_UNCHECKED; -+#endif - } - }else{ - G_DEBUG_MSG(3,"[I3] property_activate(-, %s, %u) not recognized",prop_name, prop_state); Index: pkg-plist =================================================================== --- pkg-plist (revision 304413) +++ pkg-plist (working copy) @@ -1,4 +1,4 @@ -libexec/ibus-engine-chewing +lib/ibus-engine-chewing %%DOCSDIR%%-%%PORTVERSION%%/AUTHORS %%DOCSDIR%%-%%PORTVERSION%%/COPYING %%DOCSDIR%%-%%PORTVERSION%%/ChangeLog Index: Makefile =================================================================== --- Makefile (revision 304413) +++ Makefile (working copy) @@ -1,13 +1,8 @@ -# New ports collection makefile for: zh-ibus-chewing -# Date created: 24 December 2009 -# Whom: Eric L. Chen -# +# Created By: Eric L. Chen # $FreeBSD$ -# PORTNAME= ibus-chewing -PORTVERSION= 1.3.10 -PORTREVISION= 2 +PORTVERSION= 1.4.2 CATEGORIES= chinese MASTER_SITES= GOOGLE_CODE DISTNAME= ${PORTNAME}-${PORTVERSION}-Source @@ -15,13 +10,16 @@ MAINTAINER= lihong@ieee.org COMMENT= Chewing engine for IBus +LICENSE= GPLv2 + BUILD_DEPENDS= gob2:${PORTSDIR}/devel/gob2 \ ${LOCALBASE}/share/cmake/Modules/ManageEnvironment.cmake:${PORTSDIR}/devel/cmake-fedora \ ibus-daemon:${PORTSDIR}/textproc/ibus RUN_DEPENDS= ibus-daemon:${PORTSDIR}/textproc/ibus -LIB_DEPENDS= chewing.3:${PORTSDIR}/chinese/libchewing +LIB_DEPENDS= chewing:${PORTSDIR}/chinese/libchewing -CMAKE_ARGS+= -DSYSCONF_INSTALL_DIR=${PREFIX}/etc +CMAKE_ARGS+= -DSYSCONF_INSTALL_DIR=${PREFIX}/etc \ + -DLIB_DIR=${PREFIX}/lib GCONF_SCHEMAS= ${PORTNAME}.schemas USE_CMAKE= yes USE_GETTEXT= yes