Attachment 154504 Details for Bug 198700 – Proposed patch

[patch] Proposed patch

fcitx-4.2.8.5.diff (text/plain), 29.91 KB, created by Xin LI on 2015-03-19 07:14:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xin LI

Created: 2015-03-19 07:14:28 UTC

Size: 29.91 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 381586)
>+++ Makefile	(working copy)
>@@ -2,12 +2,15 @@
> # $FreeBSD$
> 
> PORTNAME=	fcitx
>-PORTVERSION=	4.2.6.1
>-PORTREVISION=	5
>+PORTVERSION=	4.2.8.5
> CATEGORIES=	chinese x11
>-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
>-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
>-		pinyin.tar.gz table.tar.gz en_dict-${_DICT_VER}.tar.gz
>+MASTER_SITES=	http://download.fcitx-im.org/data/:dict \
>+		http://download.fcitx-im.org/fcitx/:fcitx \
>+		${MASTER_SITE_GOOGLE_CODE}
>+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:fcitx \
>+		pinyin.tar.gz:dict table.tar.gz:dict en_dict-${_DICT_VER}.tar.gz:dict \
>+		py_stroke-${PY_STROKE_VER}.tar.gz:dict \
>+		py_table-${PY_TABLE_VER}.tar.gz:dict
> DIST_SUBDIR=	${PORTNAME}
> EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
> 
>@@ -17,8 +20,7 @@ COMMENT=	Flexible Input Method Framework
> LICENSE=	GPLv2
> 
> BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
>-LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
>-		libdbus-1.so:${PORTSDIR}/devel/dbus \
>+LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
> 		libicuuc.so:${PORTSDIR}/devel/icu
> RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
> 
>@@ -30,7 +32,8 @@ CONFLICTS=	zh-scim-fcitx-3.*
> USE_GNOME=	pango intltool libxml2 introspection
> USE_XORG=	x11 xext xkbfile
> USE_LDCONFIG=	yes
>-USES=		tar:xz cmake desktop-file-utils gettext iconv pathfix pkgconfig shared-mime-info
>+USES=		tar:xz cmake desktop-file-utils execinfo gettext iconv
>+USES+=		pathfix pkgconfig shared-mime-info
> INSTALLS_ICONS=	yes
> LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
> 
>@@ -72,6 +75,7 @@ USE_QT4=	qmake_build moc_build rcc_build uic_build
> CMAKE_ARGS+=	-DENABLE_QT_IM_MODULE=ON
> PLIST_SUB+=	QT4=""
> .else
>+CMAKE_ARGS+=	-DENABLE_QT=OFF
> PLIST_SUB+=	QT4="@comment "
> .endif
> 
>@@ -91,16 +95,15 @@ CMAKE_ARGS+=	-DENABLE_DEBUG=ON
> 
> DOCS_EXTRA_PATCHES=	${FILESDIR}/nodocs-doc_CMakeLists.txt
> 
>-_DICT_VER=	20120815
>+_DICT_VER=	20121020
>+PY_STROKE_VER=	20121124
>+PY_TABLE_VER=	20121124
> 
> post-patch:
>-	@${CP} ${_DISTDIR}/pinyin.tar.gz ${WRKSRC}/data
>-	@${CP} ${_DISTDIR}/table.tar.gz ${WRKSRC}/data/table
>-	@${CP} ${_DISTDIR}/en_dict-${_DICT_VER}.tar.gz ${WRKSRC}/data
>-.if ${OSVERSION} < 800067
>-# getline() is GNU extension which FreeBSD only recently adopted
>-EXTRA_PATCHES+=	${FILESDIR}/getline-src_lib_fcitx-utils_utils.c \
>-		${FILESDIR}/getline-src_lib_fcitx-utils_utils.h
>-.endif
>+	@${CP} ${_DISTDIR}/pinyin.tar.gz ${WRKSRC}/src/im/pinyin/data
>+	@${CP} ${_DISTDIR}/table.tar.gz ${WRKSRC}/src/im/table/data
>+	@${CP} ${_DISTDIR}/en_dict-${_DICT_VER}.tar.gz ${WRKSRC}/src/module/spell/dict
>+	@${CP} ${_DISTDIR}/py_stroke-${PY_STROKE_VER}.tar.gz ${WRKSRC}/src/module/pinyin-enhance/data
>+	@${CP} ${_DISTDIR}/py_table-${PY_TABLE_VER}.tar.gz ${WRKSRC}/src/module/pinyin-enhance/data
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 381586)
>+++ distinfo	(working copy)
>@@ -1,8 +1,12 @@
>-SHA256 (fcitx/fcitx-4.2.6.1.tar.xz) = b3b1fa548163701ca6009fa71362668eb973bffa8067f039d7cbe643e4769ab1
>-SIZE (fcitx/fcitx-4.2.6.1.tar.xz) = 1442744
>+SHA256 (fcitx/fcitx-4.2.8.5.tar.xz) = 6a7dda9177ec2443049f95f5db65aff34e906cb24030a973aaf9d0485833bc78
>+SIZE (fcitx/fcitx-4.2.8.5.tar.xz) = 1662736
> SHA256 (fcitx/pinyin.tar.gz) = 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1
> SIZE (fcitx/pinyin.tar.gz) = 1608886
> SHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7
> SIZE (fcitx/table.tar.gz) = 4144686
>-SHA256 (fcitx/en_dict-20120815.tar.gz) = a73c989eae586a681a0e64bd7e8a43d45fc6dfbfd45b98e4b83f715a87639945
>-SIZE (fcitx/en_dict-20120815.tar.gz) = 679983
>+SHA256 (fcitx/en_dict-20121020.tar.gz) = c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb
>+SIZE (fcitx/en_dict-20121020.tar.gz) = 630491
>+SHA256 (fcitx/py_stroke-20121124.tar.gz) = 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248
>+SIZE (fcitx/py_stroke-20121124.tar.gz) = 445601
>+SHA256 (fcitx/py_table-20121124.tar.gz) = 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04
>+SIZE (fcitx/py_table-20121124.tar.gz) = 186822
>Index: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(revision 381586)
>+++ files/patch-CMakeLists.txt	(working copy)
>@@ -1,11 +0,0 @@
>---- CMakeLists.txt~	2011-10-02 05:43:11.000000000 -0500
>-+++ CMakeLists.txt	2011-11-09 07:51:31.801020675 -0600
>-@@ -93,7 +93,7 @@ if (ENABLE_OPENCC)
>- endif (ENABLE_OPENCC)
>- 
>- if(ENABLE_DEBUG)
>--    set(_DEBUG)
>-+    set(_DEBUG ON)
>- endif(ENABLE_DEBUG)
>- 
>- set(package     fcitx)
>Index: files/patch-cmake_modules_FindLibkvm.cmake
>===================================================================
>--- files/patch-cmake_modules_FindLibkvm.cmake	(revision 381586)
>+++ files/patch-cmake_modules_FindLibkvm.cmake	(working copy)
>@@ -1,34 +0,0 @@
>-diff --git a/cmake/FindLibkvm.cmake b/cmake/FindLibkvm.cmake
>-index a66b85d..4453fd4 100644
>---- cmake/FindLibkvm.cmake
>-+++ cmake/FindLibkvm.cmake
>-@@ -5,23 +5,11 @@
>- #  LIBKVM_INCLUDE_DIR - Libkvm include directory
>- #  LIBKVM_LIBRARIES - Libraries needed to use Libkvm
>- #
>-- 
>--if(LIBKVM_INCLUDE_DIR AND LIBKVM_FOUND)
>--  set(Libkvm_FIND_QUIETLY TRUE)
>--endif(LIBKVM_INCLUDE_DIR AND LIBKVM_FOUND)
>-- 
>-+
>- find_path(LIBKVM_INCLUDE_DIR kvm.h)
>-- 
>--set(LIBKVM_FOUND FALSE)
>-- 
>--if(LIBKVM_INCLUDE_DIR)
>--    find_library(LIBKVM_LIBRARIES NAMES kvm)
>--    if(LIBKVM_LIBRARIES)
>--      set(LIBKVM_FOUND TRUE)
>--    endif(LIBKVM_LIBRARIES)
>--endif(LIBKVM_INCLUDE_DIR)
>-- 
>-+find_library(LIBKVM_LIBRARIES NAMES kvm)
>-+
>- include(FindPackageHandleStandardArgs)
>--find_package_handle_standard_args(Libkvm  DEFAULT_MSG  LIBKVM_INCLUDE_DIR  LIBKVM_FOUND)
>-- 
>--mark_as_advanced(LIBKVM_INCLUDE_DIR  LIBKVM_LIBRARIES  LIBKVM_LIBC_HAS_KVM_OPEN  LIBKVM_FOUND)
>-+find_package_handle_standard_args(Libkvm  DEFAULT_MSG  LIBKVM_INCLUDE_DIR  LIBKVM_LIBRARIES)
>-+
>-+mark_as_advanced(LIBKVM_INCLUDE_DIR  LIBKVM_LIBRARIES)
>Index: files/patch-doc_man_CMakeLists.txt
>===================================================================
>--- files/patch-doc_man_CMakeLists.txt	(revision 381586)
>+++ files/patch-doc_man_CMakeLists.txt	(working copy)
>@@ -1,9 +1,8 @@
>---- doc/man/CMakeLists.txt~	2011-10-02 05:43:11.000000000 -0500
>-+++ doc/man/CMakeLists.txt	2011-11-09 05:30:55.468797225 -0600
>+--- doc/man/CMakeLists.txt.orig	2014-09-18 00:26:23 UTC
>++++ doc/man/CMakeLists.txt
> @@ -2,4 +2,4 @@ set(FCITX_MANS
>  fcitx.1 createPYMB.1 readPYBase.1 readPYMB.1 mb2org.1 scel2org.1 mb2txt.1 txt2mb.1 fcitx-remote.1
>  )
>  
>--install(FILES ${FCITX_MANS} DESTINATION share/man/man1)
>-\ No newline at end of file
>+-install(FILES ${FCITX_MANS} DESTINATION "${mandir}/man1")
> +install(FILES ${FCITX_MANS} DESTINATION man/man1)
>Index: files/patch-src_lib_fcitx-config_CMakeLists.txt
>===================================================================
>--- files/patch-src_lib_fcitx-config_CMakeLists.txt	(revision 381586)
>+++ files/patch-src_lib_fcitx-config_CMakeLists.txt	(working copy)
>@@ -1,11 +0,0 @@
>---- 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
>-@@ -23,7 +23,7 @@ set_target_properties(fcitx-config
>- configure_file(fcitx-config.pc.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-config.pc)
>- 
>- install(TARGETS fcitx-config DESTINATION ${libdir})
>--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-config.pc DESTINATION "${libdir}/pkgconfig")
>-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-config.pc DESTINATION "libdata/pkgconfig")
>- install(FILES ${FCITX_CONFIG_HEADERS} DESTINATION "${includedir}/fcitx-config")
>- 
>- if (ENABLE_STATIC)
>Index: files/patch-src_lib_fcitx-gclient_CMakeLists.txt
>===================================================================
>--- files/patch-src_lib_fcitx-gclient_CMakeLists.txt	(revision 381586)
>+++ files/patch-src_lib_fcitx-gclient_CMakeLists.txt	(working copy)
>@@ -1,18 +1,11 @@
>---- src/lib/fcitx-gclient/CMakeLists.txt~	2012-07-17 15:21:04.000000000 -0500
>-+++ src/lib/fcitx-gclient/CMakeLists.txt	2012-07-18 00:46:13.209418264 -0500
>-@@ -46,7 +46,7 @@ target_link_libraries(fcitx-gclient ${GI
>- configure_file(fcitx-gclient.pc.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-gclient.pc)
>+--- src/lib/fcitx-gclient/CMakeLists.txt.orig	2014-09-18 00:26:23 UTC
>++++ src/lib/fcitx-gclient/CMakeLists.txt
>+@@ -86,7 +86,7 @@ if(ENABLE_GIR)
>+ endif()
>  
>- install(TARGETS fcitx-gclient LIBRARY DESTINATION "${libdir}")
>--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-gclient.pc DESTINATION "${libdir}/pkgconfig")
>-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-gclient.pc DESTINATION "libdata/pkgconfig")
>- install(FILES ${FCITX_GCLIENT_HEADERS} DESTINATION "${includedir}/fcitx-gclient")
>- 
>- if (ENABLE_GIR)
>-@@ -86,4 +86,4 @@ install(TARGETS fcitx-gclient-static
>- )
>- endif (ENABLE_STATIC)
>- 
>--add_subdirectory(test)
>-\ No newline at end of file
>+ if(ENABLE_STATIC)
>+-  add_library(fcitx-gclient-static STATIC ${FCITX_GCLIENT_SOURCES})
> +add_subdirectory(test)
>+   set_target_properties(fcitx-gclient-static PROPERTIES
>+     OUTPUT_NAME "fcitx-gclient"
>+     PREFIX "lib")
>Index: files/patch-src_lib_fcitx-gclient_fcitxclient.c
>===================================================================
>--- files/patch-src_lib_fcitx-gclient_fcitxclient.c	(revision 381586)
>+++ files/patch-src_lib_fcitx-gclient_fcitxclient.c	(working copy)
>@@ -1,17 +0,0 @@
>---- src/lib/fcitx-gclient/fcitxclient.c.orig	2012-09-19 14:25:18.000000000 +0800
>-+++ src/lib/fcitx-gclient/fcitxclient.c	2012-09-19 14:29:55.000000000 +0800
>-@@ -26,10 +26,14 @@
>- #include "fcitxclient.h"
>- #include "marshall.h"
>- 
>-+#ifdef _DEBUG
>- #define fcitx_gclient_debug(...) g_log ("fcitx-client",       \
>-                                       G_LOG_LEVEL_DEBUG,    \
>-                                       __VA_ARGS__)
>- 
>-+#else
>-+#define fcitx_gclient_debug(...)
>-+#endif
>- typedef struct _ProcessKeyStruct ProcessKeyStruct;
>- 
>- struct _ProcessKeyStruct {
>Index: files/patch-src_lib_fcitx-qt_CMakeLists.txt
>===================================================================
>--- files/patch-src_lib_fcitx-qt_CMakeLists.txt	(revision 0)
>+++ files/patch-src_lib_fcitx-qt_CMakeLists.txt	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/lib/fcitx-qt/CMakeLists.txt.orig	2014-09-18 00:26:23 UTC
>++++ src/lib/fcitx-qt/CMakeLists.txt
>+@@ -30,7 +30,7 @@ set(fcitx_qt_HEADERS
>+ 
>+ fcitx_translate_add_sources(${fcitx_qt_HEADERS} ${fcitx_qt_SOURCES})
>+ 
>+-if(NOT (ENABLE_QT_IM_MODULE OR ENABLE_QT))
>++if(NOT (ENABLE_QT_IM_MODULE AND ENABLE_QT))
>+   return()
>+ endif()
>+ 
>
>Property changes on: files/patch-src_lib_fcitx-qt_CMakeLists.txt
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_lib_fcitx-utils_CMakeLists.txt
>===================================================================
>--- files/patch-src_lib_fcitx-utils_CMakeLists.txt	(revision 381586)
>+++ files/patch-src_lib_fcitx-utils_CMakeLists.txt	(working copy)
>@@ -1,11 +0,0 @@
>---- 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
>-@@ -34,7 +34,7 @@ endif (LIBKVM_FOUND)
>- configure_file(fcitx-utils.pc.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-utils.pc)
>- 
>- install(TARGETS fcitx-utils LIBRARY DESTINATION "${libdir}")
>--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-utils.pc DESTINATION "${libdir}/pkgconfig")
>-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-utils.pc DESTINATION "libdata/pkgconfig")
>- install(FILES ${FCITX_UTILS_HEADERS} DESTINATION "${includedir}/fcitx-utils")
>- 
>- if (ENABLE_STATIC)
>Index: files/patch-src_lib_fcitx_CMakeLists.txt
>===================================================================
>--- files/patch-src_lib_fcitx_CMakeLists.txt	(revision 381586)
>+++ files/patch-src_lib_fcitx_CMakeLists.txt	(working copy)
>@@ -1,11 +0,0 @@
>---- 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
>-@@ -41,7 +41,7 @@ configure_file(fcitx.pc.in ${CMAKE_CURRE
>- 
>- target_link_libraries(fcitx-core fcitx-config fcitx-utils ${DL_LIBRARIES} ${PTHREAD_LIBRARIES})
>- install(TARGETS fcitx-core LIBRARY DESTINATION "${libdir}")
>--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx.pc DESTINATION "${libdir}/pkgconfig")
>-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx.pc DESTINATION "libdata/pkgconfig")
>- install(FILES ${FCITX_HEADERS} DESTINATION "${includedir}/fcitx")
>- 
>- if (ENABLE_STATIC)
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 381586)
>+++ pkg-plist	(working copy)
>@@ -2,6 +2,7 @@ bin/createPYMB
> bin/fcitx
> bin/fcitx-configtool
> bin/fcitx-dbus-watcher
>+bin/fcitx-diagnose
> bin/fcitx-remote
> bin/fcitx-skin-installer
> bin/fcitx4-config
>@@ -15,13 +16,30 @@ include/fcitx-config/fcitx-config.h
> include/fcitx-config/hotkey.h
> include/fcitx-config/xdg.h
> include/fcitx-gclient/fcitxclient.h
>+include/fcitx-gclient/fcitxconnection.h
> include/fcitx-gclient/fcitxinputmethod.h
> include/fcitx-gclient/fcitxkbd.h
>+%%QT4%%include/fcitx-qt/fcitxqt_export.h
>+%%QT4%%include/fcitx-qt/fcitxqtconfiguifactory.h
>+%%QT4%%include/fcitx-qt/fcitxqtconfiguiplugin.h
>+%%QT4%%include/fcitx-qt/fcitxqtconfiguiwidget.h
>+%%QT4%%include/fcitx-qt/fcitxqtconnection.h
>+%%QT4%%include/fcitx-qt/fcitxqtformattedpreedit.h
>+%%QT4%%include/fcitx-qt/fcitxqtinputcontextproxy.h
>+%%QT4%%include/fcitx-qt/fcitxqtinputmethoditem.h
>+%%QT4%%include/fcitx-qt/fcitxqtinputmethodproxy.h
>+%%QT4%%include/fcitx-qt/fcitxqtkeyboardlayout.h
>+%%QT4%%include/fcitx-qt/fcitxqtkeyboardproxy.h
>+%%QT4%%include/fcitx-qt/fcitxqtkeysequencewidget.h
> include/fcitx-utils/bitset.h
>+include/fcitx-utils/desktop-parse.h
>+include/fcitx-utils/handler-table.h
> include/fcitx-utils/keysym.h
> include/fcitx-utils/keysymgen.h
> include/fcitx-utils/log.h
> include/fcitx-utils/memory.h
>+include/fcitx-utils/objpool.h
>+include/fcitx-utils/stringmap.h
> include/fcitx-utils/utarray.h
> include/fcitx-utils/utf8.h
> include/fcitx-utils/uthash.h
>@@ -38,25 +56,46 @@ include/fcitx/instance.h
> include/fcitx/keys.h
> include/fcitx/module.h
> include/fcitx/module/chttrans/chttrans.h
>+include/fcitx/module/chttrans/fcitx-chttrans.h
> include/fcitx/module/classicui/classicuiinterface.h
>+include/fcitx/module/classicui/fcitx-classicui.h
>+include/fcitx/module/clipboard/clipboard.h
>+include/fcitx/module/clipboard/fcitx-clipboard.h
> include/fcitx/module/dbus/dbusstuff.h
>+include/fcitx/module/dbus/fcitx-dbus.h
>+include/fcitx/module/freedesktop-notify/fcitx-freedesktop-notify.h
>+include/fcitx/module/freedesktop-notify/freedesktop-notify.h
> include/fcitx/module/ipc/ipc.h
>+include/fcitx/module/notificationitem/fcitx-notificationitem.h
>+include/fcitx/module/notificationitem/notificationitem.h
>+include/fcitx/module/pinyin-enhance/fcitx-pinyin-enhance.h
>+include/fcitx/module/pinyin-enhance/pinyin-enhance.h
>+include/fcitx/module/pinyin/fcitx-pinyin.h
> include/fcitx/module/pinyin/pydef.h
>+include/fcitx/module/punc/fcitx-punc.h
> include/fcitx/module/punc/punc.h
>+include/fcitx/module/quickphrase/fcitx-quickphrase.h
> include/fcitx/module/quickphrase/quickphrase.h
>+include/fcitx/module/spell/fcitx-spell.h
> include/fcitx/module/spell/spell.h
>+include/fcitx/module/x11/fcitx-x11.h
> include/fcitx/module/x11/x11stuff.h
>+include/fcitx/module/xkb/fcitx-xkb.h
>+include/fcitx/module/xkb/xkb.h
> include/fcitx/profile.h
> include/fcitx/ui.h
> lib/fcitx/fcitx-autoeng.so
> lib/fcitx/fcitx-chttrans.so
> lib/fcitx/fcitx-classic-ui.so
>+lib/fcitx/fcitx-clipboard.so
> lib/fcitx/fcitx-dbus.so
>+lib/fcitx/fcitx-freedesktop-notify.so
> lib/fcitx/fcitx-fullwidth-char.so
> lib/fcitx/fcitx-imselector.so
> lib/fcitx/fcitx-ipc.so
> lib/fcitx/fcitx-keyboard.so
> lib/fcitx/fcitx-kimpanel-ui.so
>+lib/fcitx/fcitx-notificationitem.so
> lib/fcitx/fcitx-pinyin-enhance.so
> lib/fcitx/fcitx-pinyin.so
> lib/fcitx/fcitx-punc.so
>@@ -71,6 +110,12 @@ lib/fcitx/fcitx-x11.so
> lib/fcitx/fcitx-xim.so
> lib/fcitx/fcitx-xkb.so
> lib/fcitx/fcitx-xkbdbus.so
>+lib/fcitx/libexec/comp-spell-dict
>+lib/fcitx/libexec/fcitx-po-parser
>+%%QT4%%lib/fcitx/libexec/fcitx-qt-gui-wrapper
>+%%QT4%%lib/fcitx/qt/libfcitx-quickphrase-editor.so
>+lib/fcitx/libexec/fcitx-scanner
>+lib/girepository-1.0/Fcitx-1.0.typelib
> lib/libfcitx-config.so
> lib/libfcitx-config.so.4
> lib/libfcitx-config.so.4.1
>@@ -80,10 +125,17 @@ lib/libfcitx-core.so.0.3
> lib/libfcitx-gclient.so
> lib/libfcitx-gclient.so.0
> lib/libfcitx-gclient.so.0.1
>+%%QT4%%lib/libfcitx-qt.so
>+%%QT4%%lib/libfcitx-qt.so.0
>+%%QT4%%lib/libfcitx-qt.so.0.1
> lib/libfcitx-utils.so
> lib/libfcitx-utils.so.0
> lib/libfcitx-utils.so.0.1
>-lib/girepository-1.0/Fcitx-1.0.typelib
>+lib/pkgconfig/fcitx-config.pc
>+lib/pkgconfig/fcitx-gclient.pc
>+%%QT4%%lib/pkgconfig/fcitx-qt.pc
>+lib/pkgconfig/fcitx-utils.pc
>+lib/pkgconfig/fcitx.pc
> man/man1/createPYMB.1.gz
> man/man1/fcitx-remote.1.gz
> man/man1/fcitx.1.gz
>@@ -93,18 +145,6 @@ man/man1/readPYBase.1.gz
> man/man1/readPYMB.1.gz
> man/man1/scel2org.1.gz
> man/man1/txt2mb.1.gz
>-share/gir-1.0/Fcitx-1.0.gir
>-%%GTK2%%lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-fcitx.so
>-%%GTK2%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
>-%%GTK2%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
>-%%GTK3%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-fcitx.so
>-%%GTK3%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache
>-%%GTK3%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache
>-%%QT4%%lib/qt4/plugins/inputmethods/libqtim-fcitx.so
>-libdata/pkgconfig/fcitx-config.pc
>-libdata/pkgconfig/fcitx-gclient.pc
>-libdata/pkgconfig/fcitx-utils.pc
>-libdata/pkgconfig/fcitx.pc
> share/applications/fcitx-configtool.desktop
> share/applications/fcitx-skin-installer.desktop
> share/applications/fcitx.desktop
>@@ -111,7 +151,18 @@ share/applications/fcitx.desktop
> share/cmake/fcitx/FcitxConfig.cmake
> share/cmake/fcitx/FcitxConfigVersion.cmake
> share/cmake/fcitx/FcitxMacro.cmake
>+share/cmake/fcitx/fcitx-cmake-helper.sh
>+share/cmake/fcitx/fcitx-extract-confdesc.sh
>+share/cmake/fcitx/fcitx-extract-desktop.sh
>+share/cmake/fcitx/fcitx-extract-gettext.sh
>+share/cmake/fcitx/fcitx-extract-kde.sh
>+share/cmake/fcitx/fcitx-extract-po.sh
>+share/cmake/fcitx/fcitx-extract-qt.sh
>+share/cmake/fcitx/fcitx-merge-config.sh
>+share/cmake/fcitx/fcitx-parse-po.sh
>+share/cmake/fcitx/fcitx-write-po.sh
> share/cmake/fcitx/getdescpo
>+share/dbus-1/services/org.fcitx.Fcitx.service
> %%PORTDOCS%%%%DOCSDIR%%/API.txt
> %%PORTDOCS%%%%DOCSDIR%%/Develop_Readme
> %%PORTDOCS%%%%DOCSDIR%%/cjkvinput.txt
>@@ -120,12 +171,15 @@ share/cmake/fcitx/getdescpo
> %%DATADIR%%/addon/fcitx-autoeng.conf
> %%DATADIR%%/addon/fcitx-chttrans.conf
> %%DATADIR%%/addon/fcitx-classic-ui.conf
>+%%DATADIR%%/addon/fcitx-clipboard.conf
> %%DATADIR%%/addon/fcitx-dbus.conf
>+%%DATADIR%%/addon/fcitx-freedesktop-notify.conf
> %%DATADIR%%/addon/fcitx-fullwidth-char.conf
> %%DATADIR%%/addon/fcitx-imselector.conf
> %%DATADIR%%/addon/fcitx-ipc.conf
> %%DATADIR%%/addon/fcitx-keyboard.conf
> %%DATADIR%%/addon/fcitx-kimpanel-ui.conf
>+%%DATADIR%%/addon/fcitx-notificationitem.conf
> %%DATADIR%%/addon/fcitx-pinyin-enhance.conf
> %%DATADIR%%/addon/fcitx-pinyin.conf
> %%DATADIR%%/addon/fcitx-punc.conf
>@@ -145,6 +199,7 @@ share/cmake/fcitx/getdescpo
> %%DATADIR%%/configdesc/fcitx-autoeng.desc
> %%DATADIR%%/configdesc/fcitx-chttrans.desc
> %%DATADIR%%/configdesc/fcitx-classic-ui.desc
>+%%DATADIR%%/configdesc/fcitx-clipboard.desc
> %%DATADIR%%/configdesc/fcitx-imselector.desc
> %%DATADIR%%/configdesc/fcitx-keyboard.desc
> %%DATADIR%%/configdesc/fcitx-pinyin-enhance.desc
>@@ -161,11 +216,13 @@ share/cmake/fcitx/getdescpo
> %%DATADIR%%/configdesc/table.desc
> %%DATADIR%%/data/AutoEng.dat
> %%DATADIR%%/data/charselectdata
>-%%DATADIR%%/data/en_dict.fscd
>+%%DATADIR%%/data/env_setup.sh
> %%DATADIR%%/data/gbks2t.tab
> %%DATADIR%%/data/punc.mb.zh_CN
> %%DATADIR%%/data/punc.mb.zh_HK
> %%DATADIR%%/data/punc.mb.zh_TW
>+%%DATADIR%%/data/quickphrase.d/emoji.mb
>+%%DATADIR%%/data/quickphrase.d/latex.mb
> %%DATADIR%%/data/vk.conf
> %%DATADIR%%/dbus/daemon.conf
> %%DATADIR%%/imicon/cangjie.png
>@@ -178,10 +235,10 @@ share/cmake/fcitx/getdescpo
> %%DATADIR%%/inputmethod/pinyin.conf
> %%DATADIR%%/inputmethod/qw.conf
> %%DATADIR%%/inputmethod/shuangpin.conf
>-%%DATADIR%%/pinyin/pySym.mb
> %%DATADIR%%/pinyin/pybase.mb
> %%DATADIR%%/pinyin/pyphrase.mb
>-%%DATADIR%%/pinyin/sp.dat
>+%%DATADIR%%/py-enhance/py_stroke.mb
>+%%DATADIR%%/py-enhance/py_table.mb
> %%DATADIR%%/skin/classic/active.png
> %%DATADIR%%/skin/classic/bar.png
> %%DATADIR%%/skin/classic/bingchan.png
>@@ -197,7 +254,6 @@ share/cmake/fcitx/getdescpo
> %%DATADIR%%/skin/classic/fullwidth_inactive.png
> %%DATADIR%%/skin/classic/inactive.png
> %%DATADIR%%/skin/classic/input.png
>-%%DATADIR%%/skin/classic/kbd.png
> %%DATADIR%%/skin/classic/logo.png
> %%DATADIR%%/skin/classic/menu.png
> %%DATADIR%%/skin/classic/next.png
>@@ -230,7 +286,6 @@ share/cmake/fcitx/getdescpo
> %%DATADIR%%/skin/dark/fullwidth_inactive.png
> %%DATADIR%%/skin/dark/inactive.png
> %%DATADIR%%/skin/dark/input.png
>-%%DATADIR%%/skin/dark/kbd.png
> %%DATADIR%%/skin/dark/keyboard.png
> %%DATADIR%%/skin/dark/logo.png
> %%DATADIR%%/skin/dark/menu.png
>@@ -250,8 +305,11 @@ share/cmake/fcitx/getdescpo
> %%DATADIR%%/skin/dark/wubi.png
> %%DATADIR%%/skin/dark/ziranma.png
> %%DATADIR%%/skin/default/active.png
>+%%DATADIR%%/skin/default/anthy.png
> %%DATADIR%%/skin/default/bar.png
> %%DATADIR%%/skin/default/bingchan.png
>+%%DATADIR%%/skin/default/bopomofo.png
>+%%DATADIR%%/skin/default/boshiamy.png
> %%DATADIR%%/skin/default/cangjie.png
> %%DATADIR%%/skin/default/chttrans_active.png
> %%DATADIR%%/skin/default/chttrans_inactive.png
>@@ -262,13 +320,15 @@ share/cmake/fcitx/getdescpo
> %%DATADIR%%/skin/default/fcitx_skin.conf
> %%DATADIR%%/skin/default/fullwidth_active.png
> %%DATADIR%%/skin/default/fullwidth_inactive.png
>+%%DATADIR%%/skin/default/hangul.png
> %%DATADIR%%/skin/default/inactive.png
> %%DATADIR%%/skin/default/input.png
>-%%DATADIR%%/skin/default/kbd.png
> %%DATADIR%%/skin/default/keyboard.png
>+%%DATADIR%%/skin/default/kkc.png
> %%DATADIR%%/skin/default/logo.png
> %%DATADIR%%/skin/default/menu.png
> %%DATADIR%%/skin/default/next.png
>+%%DATADIR%%/skin/default/pinyin-libpinyin.png
> %%DATADIR%%/skin/default/pinyin.png
> %%DATADIR%%/skin/default/prev.png
> %%DATADIR%%/skin/default/punc_active.png
>@@ -276,7 +336,10 @@ share/cmake/fcitx/getdescpo
> %%DATADIR%%/skin/default/quwei.png
> %%DATADIR%%/skin/default/remind_active.png
> %%DATADIR%%/skin/default/remind_inactive.png
>+%%DATADIR%%/skin/default/shuangpin-libpinyin.png
> %%DATADIR%%/skin/default/shuangpin.png
>+%%DATADIR%%/skin/default/sogoupinyin.png
>+%%DATADIR%%/skin/default/unikey.png
> %%DATADIR%%/skin/default/vk_active.png
> %%DATADIR%%/skin/default/vk_inactive.png
> %%DATADIR%%/skin/default/wanfeng.png
>@@ -283,6 +346,7 @@ share/cmake/fcitx/getdescpo
> %%DATADIR%%/skin/default/wbpy.png
> %%DATADIR%%/skin/default/wubi.png
> %%DATADIR%%/skin/default/ziranma.png
>+%%DATADIR%%/spell/en_dict.fscd
> %%DATADIR%%/table/cangjie.conf
> %%DATADIR%%/table/cj.mb
> %%DATADIR%%/table/db.conf
>@@ -299,67 +363,79 @@ share/cmake/fcitx/getdescpo
> %%DATADIR%%/table/wbx.mb
> %%DATADIR%%/table/zrm.conf
> %%DATADIR%%/table/zrm.mb
>-share/icons/gnome/scalable/status/fcitx-fullwidth-active.svg
>-share/icons/gnome/scalable/status/fcitx-fullwidth-inactive.svg
>-share/icons/gnome/scalable/status/fcitx-kbd.svg
>-share/icons/gnome/scalable/status/fcitx-punc-active.svg
>-share/icons/gnome/scalable/status/fcitx-punc-inactive.svg
>-share/icons/gnome/scalable/status/fcitx-vk-active.svg
>-share/icons/gnome/scalable/status/fcitx-vk-inactive.svg
>+share/gir-1.0/Fcitx-1.0.gir
> share/icons/hicolor/128x128/apps/fcitx.png
>+share/icons/hicolor/16x16/apps/fcitx-fullwidth-active.png
>+share/icons/hicolor/16x16/apps/fcitx-fullwidth-inactive.png
>+share/icons/hicolor/16x16/apps/fcitx-kbd.png
>+share/icons/hicolor/16x16/apps/fcitx-punc-active.png
>+share/icons/hicolor/16x16/apps/fcitx-punc-inactive.png
>+share/icons/hicolor/16x16/apps/fcitx-vk-active.png
>+share/icons/hicolor/16x16/apps/fcitx-vk-inactive.png
> share/icons/hicolor/16x16/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/22x22/apps/fcitx-fullwidth-active.png
>+share/icons/hicolor/22x22/apps/fcitx-fullwidth-inactive.png
>+share/icons/hicolor/22x22/apps/fcitx-kbd.png
>+share/icons/hicolor/22x22/apps/fcitx-punc-active.png
>+share/icons/hicolor/22x22/apps/fcitx-punc-inactive.png
>+share/icons/hicolor/22x22/apps/fcitx-vk-active.png
>+share/icons/hicolor/22x22/apps/fcitx-vk-inactive.png
> share/icons/hicolor/22x22/apps/fcitx.png
>-share/icons/hicolor/22x22/status/fcitx-fullwidth-active.png
>-share/icons/hicolor/22x22/status/fcitx-fullwidth-inactive.png
>-share/icons/hicolor/22x22/status/fcitx-kbd.png
>-share/icons/hicolor/22x22/status/fcitx-punc-active.png
>-share/icons/hicolor/22x22/status/fcitx-punc-inactive.png
>-share/icons/hicolor/22x22/status/fcitx-vk-active.png
>-share/icons/hicolor/22x22/status/fcitx-vk-inactive.png
>+share/icons/hicolor/24x24/apps/fcitx-fullwidth-active.png
>+share/icons/hicolor/24x24/apps/fcitx-fullwidth-inactive.png
>+share/icons/hicolor/24x24/apps/fcitx-kbd.png
>+share/icons/hicolor/24x24/apps/fcitx-punc-active.png
>+share/icons/hicolor/24x24/apps/fcitx-punc-inactive.png
>+share/icons/hicolor/24x24/apps/fcitx-vk-active.png
>+share/icons/hicolor/24x24/apps/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/48x48/apps/fcitx-cangjie.png
>+share/icons/hicolor/48x48/apps/fcitx-chn.png
>+share/icons/hicolor/48x48/apps/fcitx-chttrans-active.png
>+share/icons/hicolor/48x48/apps/fcitx-chttrans-inactive.png
>+share/icons/hicolor/48x48/apps/fcitx-erbi.png
>+share/icons/hicolor/48x48/apps/fcitx-fullwidth-active.png
>+share/icons/hicolor/48x48/apps/fcitx-fullwidth-inactive.png
>+share/icons/hicolor/48x48/apps/fcitx-kbd.png
>+share/icons/hicolor/48x48/apps/fcitx-pinyin.png
>+share/icons/hicolor/48x48/apps/fcitx-punc-active.png
>+share/icons/hicolor/48x48/apps/fcitx-punc-inactive.png
>+share/icons/hicolor/48x48/apps/fcitx-remind-active.png
>+share/icons/hicolor/48x48/apps/fcitx-remind-inactive.png
>+share/icons/hicolor/48x48/apps/fcitx-shuangpin.png
>+share/icons/hicolor/48x48/apps/fcitx-vk-active.png
>+share/icons/hicolor/48x48/apps/fcitx-vk-inactive.png
>+share/icons/hicolor/48x48/apps/fcitx-wbpy.png
>+share/icons/hicolor/48x48/apps/fcitx-wubi.png
>+share/icons/hicolor/48x48/apps/fcitx-ziranma.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-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/scalable/status/fcitx-fullwidth-active.svg
>-share/icons/hicolor/scalable/status/fcitx-fullwidth-inactive.svg
>-share/icons/hicolor/scalable/status/fcitx-kbd.svg
>-share/icons/hicolor/scalable/status/fcitx-punc-active.svg
>-share/icons/hicolor/scalable/status/fcitx-punc-inactive.svg
>-share/icons/hicolor/scalable/status/fcitx-vk-active.svg
>-share/icons/hicolor/scalable/status/fcitx-vk-inactive.svg
>+share/icons/hicolor/scalable/apps/fcitx-fullwidth-active-symbolic.svg
>+share/icons/hicolor/scalable/apps/fcitx-fullwidth-active.svg
>+share/icons/hicolor/scalable/apps/fcitx-fullwidth-inactive-symbolic.svg
>+share/icons/hicolor/scalable/apps/fcitx-fullwidth-inactive.svg
>+share/icons/hicolor/scalable/apps/fcitx-kbd-symbolic.svg
>+share/icons/hicolor/scalable/apps/fcitx-kbd.svg
>+share/icons/hicolor/scalable/apps/fcitx-punc-active-symbolic.svg
>+share/icons/hicolor/scalable/apps/fcitx-punc-active.svg
>+share/icons/hicolor/scalable/apps/fcitx-punc-inactive-symbolic.svg
>+share/icons/hicolor/scalable/apps/fcitx-punc-inactive.svg
>+share/icons/hicolor/scalable/apps/fcitx-vk-active-symbolic.svg
>+share/icons/hicolor/scalable/apps/fcitx-vk-active.svg
>+share/icons/hicolor/scalable/apps/fcitx-vk-inactive-symbolic.svg
>+share/icons/hicolor/scalable/apps/fcitx-vk-inactive.svg
>+share/icons/hicolor/scalable/apps/fcitx.svg
>+share/locale/de/LC_MESSAGES/fcitx.mo
>+share/locale/es/LC_MESSAGES/fcitx.mo
> share/locale/ja/LC_MESSAGES/fcitx.mo
>+share/locale/ko/LC_MESSAGES/fcitx.mo
> share/locale/zh_CN/LC_MESSAGES/fcitx.mo
> share/locale/zh_TW/LC_MESSAGES/fcitx.mo
> share/mime/packages/x-fskin.xml
>+%%GTK2%%lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-fcitx.so
>+%%GTK2%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
>+%%GTK2%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
>+%%GTK3%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-fcitx.so
>+%%GTK3%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache
>+%%GTK3%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache
>+%%QT4%%%%QT_PLUGINDIR%%/inputmethods/qtim-fcitx.so

Actions: View | Diff

Attachments on bug 198700: 154504