Skip to content

Instantly share code, notes, and snippets.

@lichray

lichray/fcitx_all_in_one_4.2.0.patch

Created February 6, 2012 10:23
Show Gist options
  • Save lichray/1751348 to your computer and use it in GitHub Desktop.
Save lichray/1751348 to your computer and use it in GitHub Desktop.
Download ZIP
Upgrade fcitx to 4.2.0
Raw
fcitx_all_in_one_4.2.0.patch
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx.orig/Makefile /usr/ports/chinese/fcitx/Makefile
--- /usr/ports/chinese/fcitx.orig/Makefile 2011-11-11 00:36:12.000000000 -0600
+++ /usr/ports/chinese/fcitx/Makefile 2012-02-06 02:43:35.582174787 -0600
@@ -6,7 +6,7 @@
#
PORTNAME= fcitx
-PORTVERSION= 4.1.2
+PORTVERSION= 4.2.0
CATEGORIES= chinese x11
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} pinyin.tar.gz table.tar.gz
@@ -18,7 +18,8 @@
LICENSE= GPLv2
-LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
+ dbus-1.3:${PORTSDIR}/devel/dbus
RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
MAN1= createPYMB.1 fcitx-remote.1 fcitx.1 mb2org.1 mb2txt.1 \
@@ -35,7 +36,8 @@
OPTIONS= GTK2 "Enable Gtk2 IM module" off \
GTK3 "Enable Gtk3 IM module" off \
QT4 "Enable Qt4 IM module" off \
- DBUS "Enable D-Bus for KIMPanel support" off
+ OPENCC "Enable OpenCC for Chinese Transform" off \
+ TPUNC "Use traditional quotation marks" off
.include <bsd.port.options.mk>
@@ -57,12 +59,14 @@
CMAKE_ARGS+= -DENABLE_QT_IM_MODULE=ON
.endif
-.if defined(WITH_DBUS)
-LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
-PLIST_SUB+= DBUS=""
+.if defined(WITH_OPENCC)
+LIB_DEPENDS+= opencc.1:${PORTSDIR}/chinese/opencc
.else
-CMAKE_ARGS+= -DENABLE_DBUS=OFF
-PLIST_SUB+= DBUS="@comment "
+CMAKE_ARGS+= -DENABLE_OPENCC=OFF
+.endif
+
+.if defined(WITH_TPUNC)
+EXTRA_PATCHES+= ${FILESDIR}/tpunc-data_punc.mb.zh_CN
.endif
.if defined(WITH_DEBUG)
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx.orig/distinfo /usr/ports/chinese/fcitx/distinfo
--- /usr/ports/chinese/fcitx.orig/distinfo 2011-11-10 23:18:26.000000000 -0600
+++ /usr/ports/chinese/fcitx/distinfo 2012-02-06 00:41:45.434122990 -0600
@@ -1,5 +1,5 @@
-SHA256 (fcitx/fcitx-4.1.2.tar.bz2) = cf61355fcd8457df9bac7c1f88dff6781eeba5f9466905c2d8d3b872133c99ae
-SIZE (fcitx/fcitx-4.1.2.tar.bz2) = 764998
+SHA256 (fcitx/fcitx-4.2.0.tar.bz2) = 1410141f91321ec0c2514b8a9b3ff13ce3af82841036264f5a8b7ad005b139e5
+SIZE (fcitx/fcitx-4.2.0.tar.bz2) = 785160
SHA256 (fcitx/pinyin.tar.gz) = bf8c581450f9fac0eab0498927d1d5e5c1cd465ed9937e4d9362ca9d67920fa4
SIZE (fcitx/pinyin.tar.gz) = 1613447
SHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx.orig/files/patch-data_script_fcitx-configtool /usr/ports/chinese/fcitx/files/patch-data_script_fcitx-configtool
--- /usr/ports/chinese/fcitx.orig/files/patch-data_script_fcitx-configtool 2011-11-10 23:18:26.000000000 -0600
+++ /usr/ports/chinese/fcitx/files/patch-data_script_fcitx-configtool 1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
---- ./data/script/fcitx-configtool~ 2011-10-02 05:43:11.000000000 -0500
-+++ ./data/script/fcitx-configtool 2011-11-09 21:18:23.600500583 -0600
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #--------------------------------------
- # fcitx-config
- #
-@@ -61,4 +61,4 @@ case "$DE" in
- *)
- run_gtk
- ;;
--esac
-\ No newline at end of file
-+esac
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx.orig/files/patch-src_lib_fcitx-config_CMakeLists.txt /usr/ports/chinese/fcitx/files/patch-src_lib_fcitx-config_CMakeLists.txt
--- /usr/ports/chinese/fcitx.orig/files/patch-src_lib_fcitx-config_CMakeLists.txt 2011-11-14 03:12:38.000000000 -0600
+++ /usr/ports/chinese/fcitx/files/patch-src_lib_fcitx-config_CMakeLists.txt 2012-02-06 00:48:19.370874434 -0600
@@ -1,14 +1,5 @@
--- src/lib/fcitx-config/CMakeLists.txt.orig 2011-10-02 05:43:11.000000000 -0500
+++ src/lib/fcitx-config/CMakeLists.txt 2011-11-13 16:02:26.681232301 -0600
-@@ -15,7 +15,7 @@ add_library(fcitx-config SHARED ${FCITX_
- target_link_libraries(fcitx-config fcitx-utils)
- set_target_properties(fcitx-config
- PROPERTIES VERSION 4.1.0
-- SOVERSION 4.1
-+ SOVERSION 4
- COMPILE_FLAGS "-fvisibility=hidden"
- LINK_FLAGS "-Wl,--no-undefined"
- )
@@ -23,7 +23,7 @@ set_target_properties(fcitx-config
configure_file(fcitx-config.pc.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-config.pc)
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx.orig/files/patch-src_lib_fcitx-utils_CMakeLists.txt /usr/ports/chinese/fcitx/files/patch-src_lib_fcitx-utils_CMakeLists.txt
--- /usr/ports/chinese/fcitx.orig/files/patch-src_lib_fcitx-utils_CMakeLists.txt 2011-11-14 03:12:38.000000000 -0600
+++ /usr/ports/chinese/fcitx/files/patch-src_lib_fcitx-utils_CMakeLists.txt 2012-02-06 00:48:36.336251895 -0600
@@ -1,14 +1,5 @@
--- src/lib/fcitx-utils/CMakeLists.txt.orig 2011-10-02 05:43:11.000000000 -0500
+++ src/lib/fcitx-utils/CMakeLists.txt 2011-11-13 16:02:51.201489333 -0600
-@@ -21,7 +21,7 @@ endif (LIBKVM_FOUND)
- add_library(fcitx-utils SHARED ${FCITX_UTILS_SOURCES})
- set_target_properties(fcitx-utils
- PROPERTIES VERSION 0.1.0
-- SOVERSION 0.1
-+ SOVERSION 0
- COMPILE_FLAGS "-fvisibility=hidden"
- LINK_FLAGS "-Wl,--no-undefined"
- )
@@ -34,7 +34,7 @@ endif (LIBKVM_FOUND)
configure_file(fcitx-utils.pc.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-utils.pc)
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx.orig/files/patch-src_lib_fcitx_CMakeLists.txt /usr/ports/chinese/fcitx/files/patch-src_lib_fcitx_CMakeLists.txt
--- /usr/ports/chinese/fcitx.orig/files/patch-src_lib_fcitx_CMakeLists.txt 2011-11-14 03:12:38.000000000 -0600
+++ /usr/ports/chinese/fcitx/files/patch-src_lib_fcitx_CMakeLists.txt 2012-02-06 00:48:52.498610118 -0600
@@ -1,14 +1,5 @@
--- src/lib/fcitx/CMakeLists.txt.orig 2011-10-02 05:43:11.000000000 -0500
+++ src/lib/fcitx/CMakeLists.txt 2011-11-13 16:01:32.246665458 -0600
-@@ -32,7 +32,7 @@ link_directories(${DL_LIBRARY_DIRS} ${PT
- add_library(fcitx-core SHARED ${LIBFCITX_SOURCES})
- set_target_properties(fcitx-core
- PROPERTIES VERSION 0.2.0
-- SOVERSION 0.2
-+ SOVERSION 0
- COMPILE_FLAGS "-fvisibility=hidden"
- LINK_FLAGS "-Wl,--no-undefined"
- )
@@ -41,7 +41,7 @@ configure_file(fcitx.pc.in ${CMAKE_CURRE
target_link_libraries(fcitx-core fcitx-config fcitx-utils ${DL_LIBRARIES} ${PTHREAD_LIBRARIES})
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx.orig/files/tpunc-data_punc.mb.zh_CN /usr/ports/chinese/fcitx/files/tpunc-data_punc.mb.zh_CN
--- /usr/ports/chinese/fcitx.orig/files/tpunc-data_punc.mb.zh_CN 1969-12-31 18:00:00.000000000 -0600
+++ /usr/ports/chinese/fcitx/files/tpunc-data_punc.mb.zh_CN 2012-02-06 01:33:17.881278042 -0600
@@ -0,0 +1,22 @@
+--- data/punc.mb.zh_CN~ 2012-02-01 10:41:59.000000000 -0600
++++ data/punc.mb.zh_CN 2012-02-06 01:32:03.879099301 -0600
+@@ -1,10 +1,10 @@
+ . 。
+ , ，
+ ? ？
+-" “ ”
++" 「 」
+ : ：
+ ; ；
+-' ‘ ’
++' 『 』
+ < 《
+ > 》
+ \ 、
+@@ -17,4 +17,4 @@ _ ——
+ ) ）
+ [ ·
+ ] ［ ］
+-~ ～
+\ No newline at end of file
++~ ～
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx.orig/pkg-plist /usr/ports/chinese/fcitx/pkg-plist
--- /usr/ports/chinese/fcitx.orig/pkg-plist 2011-11-14 03:12:38.000000000 -0600
+++ /usr/ports/chinese/fcitx/pkg-plist 2012-02-06 02:44:19.231253882 -0600
@@ -14,6 +14,7 @@
include/fcitx-config/hotkey.h
include/fcitx-config/xdg.h
include/fcitx-utils/log.h
+include/fcitx-utils/memory.h
include/fcitx-utils/utarray.h
include/fcitx-utils/utf8.h
include/fcitx-utils/uthash.h
@@ -21,6 +22,7 @@
include/fcitx/addon.h
include/fcitx/candidate.h
include/fcitx/configfile.h
+include/fcitx/context.h
include/fcitx/fcitx.h
include/fcitx/frontend.h
include/fcitx/hook.h
@@ -28,9 +30,10 @@
include/fcitx/instance.h
include/fcitx/keys.h
include/fcitx/module.h
+include/fcitx/module/chttrans/chttrans.h
include/fcitx/module/classicui/classicuiinterface.h
-%%DBUS%%include/fcitx/module/dbus/dbusstuff.h
-%%DBUS%%include/fcitx/module/ipc/ipc.h
+include/fcitx/module/dbus/dbusstuff.h
+include/fcitx/module/ipc/ipc.h
include/fcitx/module/pinyin/pydef.h
include/fcitx/module/punc/punc.h
include/fcitx/module/x11/x11stuff.h
@@ -39,10 +42,10 @@
lib/fcitx/fcitx-autoeng.so
lib/fcitx/fcitx-chttrans.so
lib/fcitx/fcitx-classic-ui.so
-%%DBUS%%lib/fcitx/fcitx-dbus.so
+lib/fcitx/fcitx-dbus.so
lib/fcitx/fcitx-fullwidth-char.so
-%%DBUS%%lib/fcitx/fcitx-ipc.so
-%%DBUS%%lib/fcitx/fcitx-kimpanel-ui.so
+lib/fcitx/fcitx-ipc.so
+lib/fcitx/fcitx-kimpanel-ui.so
lib/fcitx/fcitx-pinyin.so
lib/fcitx/fcitx-punc.so
lib/fcitx/fcitx-quickphrase.so
@@ -54,18 +57,17 @@
lib/fcitx/fcitx-xim.so
lib/libfcitx-config.so
lib/libfcitx-config.so.4
-lib/libfcitx-config.so.4.1.0
+lib/libfcitx-config.so.4.1
lib/libfcitx-core.so
lib/libfcitx-core.so.0
-lib/libfcitx-core.so.0.2.0
+lib/libfcitx-core.so.0.3
lib/libfcitx-utils.so
lib/libfcitx-utils.so.0
-lib/libfcitx-utils.so.0.1.0
+lib/libfcitx-utils.so.0.1
libdata/pkgconfig/fcitx-config.pc
libdata/pkgconfig/fcitx-utils.pc
libdata/pkgconfig/fcitx.pc
share/applications/fcitx-configtool.desktop
-%%DBUS%%share/applications/fcitx-kimpanel.desktop
share/applications/fcitx-skin-installer.desktop
share/applications/fcitx.desktop
share/cmake/fcitx/FcitxConfig.cmake
@@ -80,10 +82,10 @@
%%DATADIR%%/addon/fcitx-autoeng.conf
%%DATADIR%%/addon/fcitx-chttrans.conf
%%DATADIR%%/addon/fcitx-classic-ui.conf
-%%DBUS%%%%DATADIR%%/addon/fcitx-dbus.conf
+%%DATADIR%%/addon/fcitx-dbus.conf
%%DATADIR%%/addon/fcitx-fullwidth-char.conf
-%%DBUS%%%%DATADIR%%/addon/fcitx-ipc.conf
-%%DBUS%%%%DATADIR%%/addon/fcitx-kimpanel-ui.conf
+%%DATADIR%%/addon/fcitx-ipc.conf
+%%DATADIR%%/addon/fcitx-kimpanel-ui.conf
%%DATADIR%%/addon/fcitx-pinyin.conf
%%DATADIR%%/addon/fcitx-punc.conf
%%DATADIR%%/addon/fcitx-quickphrase.conf
@@ -99,13 +101,18 @@
%%DATADIR%%/configdesc/fcitx-classic-ui.desc
%%DATADIR%%/configdesc/fcitx-pinyin.desc
%%DATADIR%%/configdesc/fcitx-xim.desc
+%%DATADIR%%/configdesc/inputmethod.desc
%%DATADIR%%/configdesc/profile.desc
%%DATADIR%%/configdesc/skin.desc
%%DATADIR%%/configdesc/table.desc
%%DATADIR%%/data/AutoEng.dat
%%DATADIR%%/data/gbks2t.tab
-%%DATADIR%%/data/punc.mb
+%%DATADIR%%/data/punc.mb.zh_CN
+%%DATADIR%%/data/punc.mb.zh_TW
%%DATADIR%%/data/vk.conf
+%%DATADIR%%/inputmethod/pinyin.conf
+%%DATADIR%%/inputmethod/qw.conf
+%%DATADIR%%/inputmethod/shuangpin.conf
%%DATADIR%%/pinyin/pySym.mb
%%DATADIR%%/pinyin/pybase.mb
%%DATADIR%%/pinyin/pyphrase.mb
@@ -226,38 +233,62 @@
%%DATADIR%%/table/zrm.mb
share/icons/hicolor/128x128/apps/fcitx.png
share/icons/hicolor/16x16/apps/fcitx.png
-share/icons/hicolor/22x22/apps/fcitx.png
+share/icons/hicolor/16x16/status/fcitx-fullwidth-active.png
+share/icons/hicolor/16x16/status/fcitx-fullwidth-inactive.png
+share/icons/hicolor/16x16/status/fcitx-kbd.png
+share/icons/hicolor/16x16/status/fcitx-punc-active.png
+share/icons/hicolor/16x16/status/fcitx-punc-inactive.png
+share/icons/hicolor/16x16/status/fcitx-vk-active.png
+share/icons/hicolor/16x16/status/fcitx-vk-inactive.png
share/icons/hicolor/24x24/apps/fcitx.png
+share/icons/hicolor/24x24/status/fcitx-fullwidth-active.png
+share/icons/hicolor/24x24/status/fcitx-fullwidth-inactive.png
+share/icons/hicolor/24x24/status/fcitx-kbd.png
+share/icons/hicolor/24x24/status/fcitx-punc-active.png
+share/icons/hicolor/24x24/status/fcitx-punc-inactive.png
+share/icons/hicolor/24x24/status/fcitx-vk-active.png
+share/icons/hicolor/24x24/status/fcitx-vk-inactive.png
share/icons/hicolor/32x32/apps/fcitx.png
-share/icons/hicolor/32x32/status/fcitx-fullwidth-active.png
-share/icons/hicolor/32x32/status/fcitx-fullwidth-inactive.png
-share/icons/hicolor/32x32/status/fcitx-punc-active.png
-share/icons/hicolor/32x32/status/fcitx-punc-inactive.png
-share/icons/hicolor/32x32/status/fcitx-vk-active.png
-share/icons/hicolor/32x32/status/fcitx-vk-inactive.png
share/icons/hicolor/48x48/apps/fcitx.png
share/icons/hicolor/48x48/status/fcitx-cangjie.png
share/icons/hicolor/48x48/status/fcitx-chn.png
share/icons/hicolor/48x48/status/fcitx-chttrans-active.png
share/icons/hicolor/48x48/status/fcitx-chttrans-inactive.png
-share/icons/hicolor/48x48/status/fcitx-eng.png
share/icons/hicolor/48x48/status/fcitx-erbi.png
+share/icons/hicolor/48x48/status/fcitx-fullwidth-active.png
+share/icons/hicolor/48x48/status/fcitx-fullwidth-inactive.png
+share/icons/hicolor/48x48/status/fcitx-kbd.png
share/icons/hicolor/48x48/status/fcitx-pinyin.png
+share/icons/hicolor/48x48/status/fcitx-punc-active.png
+share/icons/hicolor/48x48/status/fcitx-punc-inactive.png
share/icons/hicolor/48x48/status/fcitx-remind-active.png
share/icons/hicolor/48x48/status/fcitx-remind-inactive.png
share/icons/hicolor/48x48/status/fcitx-shuangpin.png
+share/icons/hicolor/48x48/status/fcitx-vk-active.png
+share/icons/hicolor/48x48/status/fcitx-vk-inactive.png
share/icons/hicolor/48x48/status/fcitx-wbpy.png
share/icons/hicolor/48x48/status/fcitx-wubi.png
share/icons/hicolor/48x48/status/fcitx-ziranma.png
+share/icons/hicolor/scabable/status/fcitx-fullwidth-active.svg
+share/icons/hicolor/scabable/status/fcitx-fullwidth-inactive.svg
+share/icons/hicolor/scabable/status/fcitx-kbd.svg
+share/icons/hicolor/scabable/status/fcitx-punc-active.svg
+share/icons/hicolor/scabable/status/fcitx-punc-inactive.svg
+share/icons/hicolor/scabable/status/fcitx-vk-active.svg
+share/icons/hicolor/scabable/status/fcitx-vk-inactive.svg
share/locale/zh_CN/LC_MESSAGES/fcitx.mo
+share/locale/zh_TW/LC_MESSAGES/fcitx.mo
share/mime/packages/x-fskin.xml
@dirrmtry share/applications
+@dirrmtry share/icons/hicolor/scabable/status
+@dirrmtry share/icons/hicolor/scabable
@dirrm %%DATADIR%%/table
@dirrm %%DATADIR%%/skin/default
@dirrm %%DATADIR%%/skin/dark
@dirrm %%DATADIR%%/skin/classic
@dirrm %%DATADIR%%/skin
@dirrm %%DATADIR%%/pinyin
+@dirrm %%DATADIR%%/inputmethod
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%/configdesc
@dirrm %%DATADIR%%/addon
@@ -268,9 +299,10 @@
@dirrm include/fcitx/module/x11
@dirrm include/fcitx/module/punc
@dirrm include/fcitx/module/pinyin
-%%DBUS%%@dirrm include/fcitx/module/ipc
-%%DBUS%%@dirrm include/fcitx/module/dbus
+@dirrm include/fcitx/module/ipc
+@dirrm include/fcitx/module/dbus
@dirrm include/fcitx/module/classicui
+@dirrm include/fcitx/module/chttrans
@dirrm include/fcitx/module
@dirrm include/fcitx-utils
@dirrm include/fcitx-config
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-cloudpinyin.orig/Makefile /usr/ports/chinese/fcitx-cloudpinyin/Makefile
--- /usr/ports/chinese/fcitx-cloudpinyin.orig/Makefile 2011-11-13 18:49:01.000000000 -0600
+++ /usr/ports/chinese/fcitx-cloudpinyin/Makefile 2012-02-06 01:46:06.708775215 -0600
@@ -6,7 +6,7 @@
#
PORTNAME= fcitx-cloudpinyin
-PORTVERSION= 0.1.2
+PORTVERSION= 0.2.0
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-cloudpinyin.orig/distinfo /usr/ports/chinese/fcitx-cloudpinyin/distinfo
--- /usr/ports/chinese/fcitx-cloudpinyin.orig/distinfo 2011-11-13 18:49:01.000000000 -0600
+++ /usr/ports/chinese/fcitx-cloudpinyin/distinfo 2012-02-06 02:26:56.473897493 -0600
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-cloudpinyin-0.1.2.tar.bz2) = e051db21f3d998e7b7c2509e1e7cd4b1a634cc233c099d03828db6dce280fc87
-SIZE (fcitx/fcitx-cloudpinyin-0.1.2.tar.bz2) = 17427
+SHA256 (fcitx/fcitx-cloudpinyin-0.2.0.tar.bz2) = a485b52169fab47ce4658cb1e520f965be85b38676fc4fd215f2447ea6db67d1
+SIZE (fcitx/fcitx-cloudpinyin-0.2.0.tar.bz2) = 19275
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-cloudpinyin.orig/pkg-plist /usr/ports/chinese/fcitx-cloudpinyin/pkg-plist
--- /usr/ports/chinese/fcitx-cloudpinyin.orig/pkg-plist 2011-11-13 18:49:01.000000000 -0600
+++ /usr/ports/chinese/fcitx-cloudpinyin/pkg-plist 2012-02-06 02:26:50.393757021 -0600
@@ -2,3 +2,4 @@
share/fcitx/addon/fcitx-cloudpinyin.conf
share/fcitx/configdesc/fcitx-cloudpinyin.desc
share/locale/zh_CN/LC_MESSAGES/fcitx-cloudpinyin.mo
+share/locale/zh_TW/LC_MESSAGES/fcitx-cloudpinyin.mo
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-configtool.orig/Makefile /usr/ports/chinese/fcitx-configtool/Makefile
--- /usr/ports/chinese/fcitx-configtool.orig/Makefile 2011-11-13 18:41:33.000000000 -0600
+++ /usr/ports/chinese/fcitx-configtool/Makefile 2012-02-06 03:27:14.144887143 -0600
@@ -6,7 +6,7 @@
#
PORTNAME= fcitx-configtool
-PORTVERSION= 0.3.1
+PORTVERSION= 0.4.0
CATEGORIES= chinese x11
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
@@ -14,16 +14,39 @@
MAINTAINER= [email protected]
COMMENT= Fcitx IM configure tool
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
LIB_DEPENDS= fcitx-config.4:${PORTSDIR}/chinese/fcitx
USE_BZIP2= yes
-USE_GNOME= gtk20 intltool gnomehack
+USE_GNOME= intltool gnomehack
USE_GETTEXT= yes
USE_CMAKE= yes
-PROJECTHOST= fcitx
+OPTIONS= GTK2 "Enable Gtk2 Version" on \
+ GTK3 "Enable Gtk3 Version" off
+
+.include <bsd.port.options.mk>
-PLIST_FILES= bin/fcitx-config-gtk \
- share/locale/zh_CN/LC_MESSAGES/fcitx-configtool.mo
+.if defined(WITH_GTK2)
+USE_GNOME+= gtk20
+PLIST_SUB+= GTK2=""
+.else
+CMAKE_ARGS+= -DENABLE_GTK2=OFF
+PLIST_SUB+= GTK2="@comment "
+.endif
+
+.if defined(WITH_GTK3)
+USE_GNOME+= gtk30
+CMAKE_ARGS+= -DENABLE_GTK3=ON
+PLIST_SUB+= GTK3=""
+.else
+PLIST_SUB+= GTK3="@comment "
+.endif
+
+.if defined(WITHOUT_GTK2) && defined(WITHOUT_GTK3)
+IGNORE= a GUI is required
+.endif
+
+PROJECTHOST= fcitx
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-configtool.orig/distinfo /usr/ports/chinese/fcitx-configtool/distinfo
--- /usr/ports/chinese/fcitx-configtool.orig/distinfo 2011-11-13 18:41:33.000000000 -0600
+++ /usr/ports/chinese/fcitx-configtool/distinfo 2012-02-06 02:30:01.883164554 -0600
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-configtool-0.3.1.tar.bz2) = 60a2596ca3c36d0c98398d36d4eb5f1f03992133a782ae15cb39f66131aeaa3e
-SIZE (fcitx/fcitx-configtool-0.3.1.tar.bz2) = 22323
+SHA256 (fcitx/fcitx-configtool-0.4.0.tar.bz2) = 580a531838c27a1446d1b8ad33d84e44fa729c1b178deff4b9736d316d754640
+SIZE (fcitx/fcitx-configtool-0.4.0.tar.bz2) = 32124
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-configtool.orig/files/patch-gtk3_CMakeLists.txt /usr/ports/chinese/fcitx-configtool/files/patch-gtk3_CMakeLists.txt
--- /usr/ports/chinese/fcitx-configtool.orig/files/patch-gtk3_CMakeLists.txt 1969-12-31 18:00:00.000000000 -0600
+++ /usr/ports/chinese/fcitx-configtool/files/patch-gtk3_CMakeLists.txt 2012-02-06 03:24:07.667129542 -0600
@@ -0,0 +1,10 @@
+--- gtk3/CMakeLists.txt~ 2012-01-30 04:51:25.000000000 -0600
++++ gtk3/CMakeLists.txt 2012-02-06 03:22:50.184481579 -0600
+@@ -45,6 +45,7 @@ target_link_libraries (fcitx-config-gtk3
+ ${FCITX4_FCITX_CONFIG_LIBRARIES}
+ ${FCITX4_FCITX_LIBRARIES}
+ ${GIO2_LIBRARIES}
++ -lintl
+ )
+
+ if (UNIQUE3_FOUND)
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-configtool.orig/files/patch-gtk_CMakeLists.txt /usr/ports/chinese/fcitx-configtool/files/patch-gtk_CMakeLists.txt
--- /usr/ports/chinese/fcitx-configtool.orig/files/patch-gtk_CMakeLists.txt 1969-12-31 18:00:00.000000000 -0600
+++ /usr/ports/chinese/fcitx-configtool/files/patch-gtk_CMakeLists.txt 2012-02-06 03:23:56.958914487 -0600
@@ -0,0 +1,10 @@
+--- gtk/CMakeLists.txt~ 2012-01-30 04:51:25.000000000 -0600
++++ gtk/CMakeLists.txt 2012-02-06 03:19:28.808521532 -0600
+@@ -44,6 +44,7 @@ target_link_libraries (fcitx-config-gtk
+ ${FCITX4_FCITX_CONFIG_LIBRARIES}
+ ${FCITX4_FCITX_LIBRARIES}
+ ${GIO2_LIBRARIES}
++ -lintl
+ )
+
+ if (UNIQUE_FOUND)
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-configtool.orig/pkg-plist /usr/ports/chinese/fcitx-configtool/pkg-plist
--- /usr/ports/chinese/fcitx-configtool.orig/pkg-plist 1969-12-31 18:00:00.000000000 -0600
+++ /usr/ports/chinese/fcitx-configtool/pkg-plist 2012-02-06 02:35:27.448063815 -0600
@@ -0,0 +1,4 @@
+%%GTK2%%bin/fcitx-config-gtk
+%%GTK3%%bin/fcitx-config-gtk3
+share/locale/zh_CN/LC_MESSAGES/fcitx-configtool.mo
+share/locale/zh_TW/LC_MESSAGES/fcitx-configtool.mo
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-googlepinyin.orig/Makefile /usr/ports/chinese/fcitx-googlepinyin/Makefile
--- /usr/ports/chinese/fcitx-googlepinyin.orig/Makefile 2011-11-13 18:41:34.000000000 -0600
+++ /usr/ports/chinese/fcitx-googlepinyin/Makefile 2012-02-06 02:12:09.142096277 -0600
@@ -6,7 +6,7 @@
#
PORTNAME= fcitx-googlepinyin
-PORTVERSION= 0.1.3
+PORTVERSION= 0.1.4
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-googlepinyin.orig/distinfo /usr/ports/chinese/fcitx-googlepinyin/distinfo
--- /usr/ports/chinese/fcitx-googlepinyin.orig/distinfo 2011-11-13 18:41:34.000000000 -0600
+++ /usr/ports/chinese/fcitx-googlepinyin/distinfo 2012-02-06 02:12:18.105265354 -0600
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-googlepinyin-0.1.3.tar.bz2) = b8191daf1b6d3ced2f55c950b2fe9b72857360a14ce1003da6ad84c42d3eaced
-SIZE (fcitx/fcitx-googlepinyin-0.1.3.tar.bz2) = 20394
+SHA256 (fcitx/fcitx-googlepinyin-0.1.4.tar.bz2) = f6152d5ba0cf310f8b46f16b4f89ca7d57563fd3607f2b152595c5994cbe0f63
+SIZE (fcitx/fcitx-googlepinyin-0.1.4.tar.bz2) = 20812
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-googlepinyin.orig/files/patch-src_eim.cpp /usr/ports/chinese/fcitx-googlepinyin/files/patch-src_eim.cpp
--- /usr/ports/chinese/fcitx-googlepinyin.orig/files/patch-src_eim.cpp 1969-12-31 18:00:00.000000000 -0600
+++ /usr/ports/chinese/fcitx-googlepinyin/files/patch-src_eim.cpp 2012-02-06 02:14:30.849763164 -0600
@@ -0,0 +1,11 @@
+--- src/eim.cpp~ 2012-01-31 09:03:36.000000000 -0600
++++ src/eim.cpp 2012-02-06 02:13:29.145600582 -0600
+@@ -466,7 +466,7 @@ void* FcitxGooglePinyinCreate (FcitxInst
+ if (fp)
+ fclose(fp);
+
+- bool result = ime_pinyin::im_open_decoder(LIBDIR "/googlepinyin/data/dict_pinyin.dat", userDict);
++ bool result = ime_pinyin::im_open_decoder(DATADIR "/googlepinyin/dict_pinyin.dat", userDict);
+
+ if (userDict)
+ free(userDict);
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-googlepinyin.orig/pkg-plist /usr/ports/chinese/fcitx-googlepinyin/pkg-plist
--- /usr/ports/chinese/fcitx-googlepinyin.orig/pkg-plist 2011-11-11 09:53:33.000000000 -0600
+++ /usr/ports/chinese/fcitx-googlepinyin/pkg-plist 2012-02-06 02:16:40.143676244 -0600
@@ -2,3 +2,4 @@
share/fcitx/addon/fcitx-googlepinyin.conf
share/fcitx/configdesc/fcitx-googlepinyin.desc
share/locale/zh_CN/LC_MESSAGES/fcitx-googlepinyin.mo
+share/locale/zh_TW/LC_MESSAGES/fcitx-googlepinyin.mo
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-sunpinyin.orig/Makefile /usr/ports/chinese/fcitx-sunpinyin/Makefile
--- /usr/ports/chinese/fcitx-sunpinyin.orig/Makefile 2011-11-13 18:41:34.000000000 -0600
+++ /usr/ports/chinese/fcitx-sunpinyin/Makefile 2012-02-06 02:21:12.193960398 -0600
@@ -6,7 +6,7 @@
#
PORTNAME= fcitx-sunpinyin
-PORTVERSION= 0.3.2
+PORTVERSION= 0.3.3
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-sunpinyin.orig/distinfo /usr/ports/chinese/fcitx-sunpinyin/distinfo
--- /usr/ports/chinese/fcitx-sunpinyin.orig/distinfo 2011-11-13 18:41:34.000000000 -0600
+++ /usr/ports/chinese/fcitx-sunpinyin/distinfo 2012-02-06 02:21:52.395888704 -0600
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-sunpinyin-0.3.2.tar.bz2) = e22c6b64224ac7d50d62574980eaa180c9857f35c87b7450a185cd8e906a3577
-SIZE (fcitx/fcitx-sunpinyin-0.3.2.tar.bz2) = 43008
+SHA256 (fcitx/fcitx-sunpinyin-0.3.3.tar.bz2) = e9cb352ca05fd2dc9e366f9c35e2cdd6747a8aafc5ca5ae4fdce002b0ec21dba
+SIZE (fcitx/fcitx-sunpinyin-0.3.3.tar.bz2) = 43224
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-sunpinyin.orig/files/patch-src_eim.cpp /usr/ports/chinese/fcitx-sunpinyin/files/patch-src_eim.cpp
--- /usr/ports/chinese/fcitx-sunpinyin.orig/files/patch-src_eim.cpp 2011-11-11 09:47:43.000000000 -0600
+++ /usr/ports/chinese/fcitx-sunpinyin/files/patch-src_eim.cpp 1969-12-31 18:00:00.000000000 -0600
@@ -1,11 +0,0 @@
---- src/eim.cpp.orig 2011-09-29 01:58:59.000000000 -0500
-+++ src/eim.cpp 2011-11-11 02:25:11.839864988 -0600
-@@ -229,8 +229,6 @@ INPUT_RETURN_VALUE FcitxSunpinyinGetCand
- (ppd.size() - ppd.caret() + 1) * sizeof(TWCHAR));
- memcpy(sunpinyin->input_src, src, hzlen * sizeof(TWCHAR));
-
-- FcitxLog(INFO, "%d", ppd.candi_start());
--
- sunpinyin->front_src[ppd.caret()] = 0;
- sunpinyin->end_src[ppd.size() - ppd.caret() + 1] = 0;
- sunpinyin->input_src[hzlen] = 0;
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-sunpinyin.orig/pkg-plist /usr/ports/chinese/fcitx-sunpinyin/pkg-plist
--- /usr/ports/chinese/fcitx-sunpinyin.orig/pkg-plist 2011-11-11 09:47:42.000000000 -0600
+++ /usr/ports/chinese/fcitx-sunpinyin/pkg-plist 2012-02-06 02:21:46.563754722 -0600
@@ -11,3 +11,4 @@
share/icons/hicolor/32x32/apps/fcitx-sunpinyin.png
share/icons/hicolor/48x48/apps/fcitx-sunpinyin.png
share/locale/zh_CN/LC_MESSAGES/fcitx-sunpinyin.mo
+share/locale/zh_TW/LC_MESSAGES/fcitx-sunpinyin.mo
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-ui-light.orig/Makefile /usr/ports/chinese/fcitx-ui-light/Makefile
--- /usr/ports/chinese/fcitx-ui-light.orig/Makefile 2011-11-13 18:41:34.000000000 -0600
+++ /usr/ports/chinese/fcitx-ui-light/Makefile 2012-02-06 03:30:45.871162912 -0600
@@ -6,7 +6,7 @@
#
PORTNAME= fcitx-ui-light
-PORTVERSION= 0.1.2
+PORTVERSION= 0.1.3
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-ui-light.orig/distinfo /usr/ports/chinese/fcitx-ui-light/distinfo
--- /usr/ports/chinese/fcitx-ui-light.orig/distinfo 2011-11-13 18:41:34.000000000 -0600
+++ /usr/ports/chinese/fcitx-ui-light/distinfo 2012-02-06 03:30:53.743320965 -0600
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-ui-light-0.1.2.tar.bz2) = 942f38fefed719c80dbf4eab830448088d59546c5b5a251e0a5bee16e4f4ece7
-SIZE (fcitx/fcitx-ui-light-0.1.2.tar.bz2) = 34240
+SHA256 (fcitx/fcitx-ui-light-0.1.3.tar.bz2) = 6fc12f1efdf0cb48d26eaf8a6b9dd26c4595112ee01cc051b42d548dc6c68c54
+SIZE (fcitx/fcitx-ui-light-0.1.3.tar.bz2) = 34515
diff -ruN --exclude=CVS /usr/ports/chinese/fcitx-ui-light.orig/pkg-plist /usr/ports/chinese/fcitx-ui-light/pkg-plist
--- /usr/ports/chinese/fcitx-ui-light.orig/pkg-plist 2011-11-11 10:01:48.000000000 -0600
+++ /usr/ports/chinese/fcitx-ui-light/pkg-plist 2012-02-06 03:31:27.491003679 -0600
@@ -3,3 +3,4 @@
share/fcitx/configdesc/fcitx-light-ui.desc
share/applications/fcitx-light.desktop
share/locale/zh_CN/LC_MESSAGES/fcitx-light-ui.mo
+share/locale/zh_TW/LC_MESSAGES/fcitx-light-ui.mo
diff -ruN --exclude=CVS /usr/ports/chinese/libgooglepinyin.orig/Makefile /usr/ports/chinese/libgooglepinyin/Makefile
--- /usr/ports/chinese/libgooglepinyin.orig/Makefile 2011-11-11 09:50:46.000000000 -0600
+++ /usr/ports/chinese/libgooglepinyin/Makefile 2012-02-06 01:47:56.672595788 -0600
@@ -6,16 +6,13 @@
#
PORTNAME= libgooglepinyin
-PORTVERSION= 0.1.1
+PORTVERSION= 0.1.2
CATEGORIES= chinese devel
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= [email protected]
COMMENT= A fork of Google Pinyin IME on Android
-ONLY_FOR_ARCHS= amd64 i386
-ONLY_FOR_ARCHS_REASON= does not support big-endian dictionary
-
USE_BZIP2= yes
USE_LDCONFIG= yes
USE_CMAKE= yes
diff -ruN --exclude=CVS /usr/ports/chinese/libgooglepinyin.orig/distinfo /usr/ports/chinese/libgooglepinyin/distinfo
--- /usr/ports/chinese/libgooglepinyin.orig/distinfo 2011-11-11 09:50:46.000000000 -0600
+++ /usr/ports/chinese/libgooglepinyin/distinfo 2012-02-06 01:48:05.300739439 -0600
@@ -1,2 +1,2 @@
-SHA256 (libgooglepinyin-0.1.1.tar.bz2) = 5a5aab5e68d8c0ad81e91122d65e9c4c684db2e0c659422686d81adf3385de03
-SIZE (libgooglepinyin-0.1.1.tar.bz2) = 716270
+SHA256 (libgooglepinyin-0.1.2.tar.bz2) = 1a339ae45721a60b9fadd15e43c34b9bb27af3bb999c00ed0d88b4084cfd0637
+SIZE (libgooglepinyin-0.1.2.tar.bz2) = 1348557
diff -ruN --exclude=CVS /usr/ports/chinese/libgooglepinyin.orig/files/patch-data_CMakeLists.txt /usr/ports/chinese/libgooglepinyin/files/patch-data_CMakeLists.txt
--- /usr/ports/chinese/libgooglepinyin.orig/files/patch-data_CMakeLists.txt 2011-11-11 09:50:46.000000000 -0600
+++ /usr/ports/chinese/libgooglepinyin/files/patch-data_CMakeLists.txt 2012-02-06 02:02:18.317099964 -0600
@@ -1,8 +1,10 @@
---- data/CMakeLists.txt~ 2011-09-06 00:15:40.000000000 -0500
-+++ data/CMakeLists.txt 2011-11-11 05:33:16.204582570 -0600
-@@ -6,4 +6,4 @@ add_custom_target(datafile ALL DEPENDS d
+--- data/CMakeLists.txt~ 2012-02-03 02:20:17.000000000 -0600
++++ data/CMakeLists.txt 2012-02-06 01:57:14.709943289 -0600
+@@ -14,5 +14,5 @@ add_custom_command(OUTPUT dict_pinyin.da
+ add_custom_target(datafile ALL DEPENDS dict_pinyin.dat)
configure_file(googlepinyin.pc.in ${CMAKE_CURRENT_BINARY_DIR}/googlepinyin.pc)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dict_pinyin.dat DESTINATION ${datadir}/googlepinyin)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dict_pinyin.dat DESTINATION ${libdir}/googlepinyin/data)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/googlepinyin.pc DESTINATION ${libdir}/pkgconfig)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dict_pinyin.dat DESTINATION ${datadir}/googlepinyin)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/googlepinyin.pc DESTINATION ${prefix}/libdata/pkgconfig)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment