Date: Mon, 15 Oct 2012 11:48:16 -0700 (PDT) From: Zhihao Yuan <lichray@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172727: [UPDATE] Update fcitx to 4.2.6.1 Message-ID: <507c5a70.e700320a.5557.0934@mx.google.com> Resent-Message-ID: <201210151850.q9FIo1h5047117@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172727
>Category: ports
>Synopsis: [UPDATE] Update fcitx to 4.2.6.1
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 15 18:50:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Zhihao Yuan
>Release: FreeBSD 8.3-STABLE amd64
>Organization:
Northern Illinois University
>Environment:
System: FreeBSD elitebook.hp 8.3-STABLE FreeBSD 8.3-STABLE #4 r240363: Tue Sep 11 10:40:15 CDT 2012 lichray@elitebook.hp:/usr/obj/usr/src/sys/HOUKAGO amd64
>Description:
Some bug fixes:
fcitx 4.2.6 -> 4.2.6.1
fcitx-configtool 4.2.5 -> 4.2.5.1
fcitx-libpinyin 0.2.0 -> 0.2.1
fcitx-googlepinyin 0.1.5 -> 0.1.6
Note that a patch to solve ports/172093 is included in this update, so please close such an PR.
>How-To-Repeat:
>Fix:
--- fcitx_4.2.6.1_all.patch begins here ---
Index: chinese/fcitx/Makefile
===================================================================
--- chinese/fcitx/Makefile (revision 305927)
+++ chinese/fcitx/Makefile (working copy)
@@ -6,7 +6,7 @@
#
PORTNAME= fcitx
-PORTVERSION= 4.2.6
+PORTVERSION= 4.2.6.1
CATEGORIES= chinese x11
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -41,6 +41,7 @@
INSTALLS_ICONS= yes
OPTIONS_DEFINE= GTK2 GTK3 QT4 OPENCC TPUNC
+OPTIONS_DEFAULT=GTK2
GTK2_DESC= Enable Gtk2 IM module
GTK3_DESC= Enable Gtk3 IM module
Index: chinese/fcitx/distinfo
===================================================================
--- chinese/fcitx/distinfo (revision 305927)
+++ chinese/fcitx/distinfo (working copy)
@@ -1,5 +1,5 @@
-SHA256 (fcitx/fcitx-4.2.6.tar.xz) = 13479bca8d7f420f486f1e2ea733dc9a0060f18c0f08b415c3c56694f2fd775e
-SIZE (fcitx/fcitx-4.2.6.tar.xz) = 1439664
+SHA256 (fcitx/fcitx-4.2.6.1.tar.xz) = b3b1fa548163701ca6009fa71362668eb973bffa8067f039d7cbe643e4769ab1
+SIZE (fcitx/fcitx-4.2.6.1.tar.xz) = 1442744
SHA256 (fcitx/pinyin.tar.gz) = 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1
SIZE (fcitx/pinyin.tar.gz) = 1608886
SHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7
Index: chinese/fcitx/pkg-plist
===================================================================
--- chinese/fcitx/pkg-plist (revision 305927)
+++ chinese/fcitx/pkg-plist (working copy)
@@ -91,7 +91,7 @@
%%GTK3%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-fcitx.so
%%GTK3%%@exec gtk-query-immodules-3.0 > %%LOCALBASE%%/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
%%GTK3%%@unexec gtk-query-immodules-3.0 > %%LOCALBASE%%/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
-%%QT4%%lib/qt4/plugins/inputmethods/qtim-fcitx.so
+%%QT4%%lib/qt4/plugins/inputmethods/libqtim-fcitx.so
%%QT4%%@dirrmtry lib/qt4/plugins/inputmethods
%%QT4%%@dirrmtry lib/qt4/plugins
libdata/pkgconfig/fcitx-config.pc
Index: chinese/fcitx-configtool/Makefile
===================================================================
--- chinese/fcitx-configtool/Makefile (revision 305927)
+++ chinese/fcitx-configtool/Makefile (working copy)
@@ -6,7 +6,7 @@
#
PORTNAME= fcitx-configtool
-PORTVERSION= 0.4.5
+PORTVERSION= 0.4.5.1
CATEGORIES= chinese x11
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
@@ -23,12 +23,12 @@
USE_GETTEXT= yes
USE_CMAKE= yes
-OPTIONS= GTK2 "Enable Gtk2 Version" on \
- GTK3 "Enable Gtk3 Version" off
+OPTIONS_DEFINE= GTK2 GTK3
+OPTIONS_DEFAULT=GTK2
.include <bsd.port.options.mk>
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
CMAKE_ARGS+= -DENABLE_GTK2=ON
USE_GNOME+= gtk20
PLIST_SUB+= GTK2=""
@@ -36,7 +36,7 @@
PLIST_SUB+= GTK2="@comment "
.endif
-.if defined(WITH_GTK3)
+.if ${PORT_OPTIONS:MGTK3}
USE_GNOME+= gtk30
PLIST_SUB+= GTK3=""
.else
@@ -44,7 +44,7 @@
PLIST_SUB+= GTK3="@comment "
.endif
-.if defined(WITHOUT_GTK2) && defined(WITHOUT_GTK3)
+.if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3}
IGNORE= a GUI is required
.endif
Index: chinese/fcitx-configtool/distinfo
===================================================================
--- chinese/fcitx-configtool/distinfo (revision 305927)
+++ chinese/fcitx-configtool/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-configtool-0.4.5.tar.xz) = 474ff8635e29e29b6b6f37efe698e2b4264efaba55448a13d0b46d696887c8c1
-SIZE (fcitx/fcitx-configtool-0.4.5.tar.xz) = 42036
+SHA256 (fcitx/fcitx-configtool-0.4.5.1.tar.xz) = bde3097a073dba733633c33d9b4834acdb46295fed7fc5d95dda3a2260f91e28
+SIZE (fcitx/fcitx-configtool-0.4.5.1.tar.xz) = 42468
Index: chinese/fcitx-googlepinyin/Makefile
===================================================================
--- chinese/fcitx-googlepinyin/Makefile (revision 305927)
+++ chinese/fcitx-googlepinyin/Makefile (working copy)
@@ -6,8 +6,7 @@
#
PORTNAME= fcitx-googlepinyin
-PORTVERSION= 0.1.5
-PORTREVISION= 1
+PORTVERSION= 0.1.6
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
@@ -15,8 +14,8 @@
MAINTAINER= lichray@gmail.com
COMMENT= A libgooglepinyin support for Fcitx
-LIB_DEPENDS= fcitx-config.4:${PORTSDIR}/chinese/fcitx \
- googlepinyin.0:${PORTSDIR}/chinese/libgooglepinyin
+LIB_DEPENDS= fcitx-config:${PORTSDIR}/chinese/fcitx \
+ googlepinyin:${PORTSDIR}/chinese/libgooglepinyin
USE_XZ= yes
USE_GETTEXT= yes
Index: chinese/fcitx-googlepinyin/distinfo
===================================================================
--- chinese/fcitx-googlepinyin/distinfo (revision 305927)
+++ chinese/fcitx-googlepinyin/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-googlepinyin-0.1.5.tar.xz) = f74ac4b40d11002a0dfc49572475a9b9d9671755b9c77bbc7a091d6e0849ab8d
-SIZE (fcitx/fcitx-googlepinyin-0.1.5.tar.xz) = 20776
+SHA256 (fcitx/fcitx-googlepinyin-0.1.6.tar.xz) = 29a5506ed45d26534f7bcbca1c56138984dcc7e99a42652c6a49fe20ec0da781
+SIZE (fcitx/fcitx-googlepinyin-0.1.6.tar.xz) = 24080
Index: chinese/fcitx-googlepinyin/pkg-plist
===================================================================
--- chinese/fcitx-googlepinyin/pkg-plist (revision 305927)
+++ chinese/fcitx-googlepinyin/pkg-plist (working copy)
@@ -1,6 +1,10 @@
lib/fcitx/fcitx-googlepinyin.so
share/fcitx/addon/fcitx-googlepinyin.conf
-share/fcitx/configdesc/fcitx-googlepinyin.desc
share/fcitx/inputmethod/googlepinyin.conf
+share/fcitx/imicon/googlepinyin.png
+share/fcitx/skin/default/googlepinyin.png
+share/fcitx/skin/classic/googlepinyin.png
+share/icons/hicolor/16x16/apps/fcitx-googlepinyin.png
+share/icons/hicolor/48x48/apps/fcitx-googlepinyin.png
share/locale/zh_CN/LC_MESSAGES/fcitx-googlepinyin.mo
share/locale/zh_TW/LC_MESSAGES/fcitx-googlepinyin.mo
Index: chinese/fcitx-libpinyin/Makefile
===================================================================
--- chinese/fcitx-libpinyin/Makefile (revision 305927)
+++ chinese/fcitx-libpinyin/Makefile (working copy)
@@ -6,19 +6,19 @@
#
PORTNAME= fcitx-libpinyin
-PORTVERSION= 0.2.0
+PORTVERSION= 0.2.1
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
http://cloud.github.com/downloads/fcitx/fcitx-libpinyin/:libpinyin
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} model.text.tar.gz:libpinyin
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} model.text.${MDVER}.tar.gz:libpinyin
DIST_SUBDIR= fcitx
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= lichray@gmail.com
COMMENT= The libpinyin support for Fcitx
-LIB_DEPENDS= fcitx-config.4:${PORTSDIR}/chinese/fcitx \
- pinyin.2:${PORTSDIR}/chinese/libpinyin
+LIB_DEPENDS= fcitx-config:${PORTSDIR}/chinese/fcitx \
+ pinyin:${PORTSDIR}/chinese/libpinyin
USE_LDCONFIG= ${PREFIX}/lib/fcitx/
USE_XZ= yes
@@ -28,8 +28,9 @@
INSTALLS_ICONS= yes
post-patch:
- @${LN} -s ${_DISTDIR}/model.text.tar.gz ${WRKSRC}/data
+ @${LN} -s ${_DISTDIR}/model.text.${MDVER}.tar.gz ${WRKSRC}/data
PROJECTHOST= fcitx
+MDVER= 20120921
.include <bsd.port.mk>
Index: chinese/fcitx-libpinyin/distinfo
===================================================================
--- chinese/fcitx-libpinyin/distinfo (revision 305927)
+++ chinese/fcitx-libpinyin/distinfo (working copy)
@@ -1,4 +1,4 @@
-SHA256 (fcitx/fcitx-libpinyin-0.2.0.tar.xz) = b39649d4e4ebb4b054ea520fe80efd520b273d42223d6d8c0b699b11fa4cd039
-SIZE (fcitx/fcitx-libpinyin-0.2.0.tar.xz) = 24464
-SHA256 (fcitx/model.text.tar.gz) = 8d87d9c0b622f3163976a8c8bc57ded878cf0dee63c855b8a7afd36a151114eb
-SIZE (fcitx/model.text.tar.gz) = 9991219
+SHA256 (fcitx/fcitx-libpinyin-0.2.1.tar.xz) = 6a5c9f7c7009a893b4beba85d6ee361253ca1211ce954da0e752c01a528c8c09
+SIZE (fcitx/fcitx-libpinyin-0.2.1.tar.xz) = 24468
+SHA256 (fcitx/model.text.20120921.tar.gz) = 84f086a8eb56a4a8ddab7d95ce1b386dfe292561a3271132e3aa6e85ba4ed339
+SIZE (fcitx/model.text.20120921.tar.gz) = 9980454
--- fcitx_4.2.6.1_all.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?507c5a70.e700320a.5557.0934>