Attachment #124353 for bug #167863

View | Details | Raw Unified | Return to bug 167863
Collapse All | Expand All

Lines 6-13 Link Here

(-)chinese/sunpinyin/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= sunpinyin	8	PORTNAME= sunpinyin
9	PORTVERSION= 2.0.3	9	DISTVERSION= 2.0.4rc1
10	PORTREVISION= 1
11	CATEGORIES= chinese devel	10	CATEGORIES= chinese devel
12	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}:1 \	11	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}:1 \
13	http://open-gram.googlecode.com/files/:2	12	http://open-gram.googlecode.com/files/:2
Lines 27-32 BUILD_DEPENDS= pkg-config:${PORTSDIR}/de Link Here
27	LICENSE_FILE_LGPL21= ${WRKSRC}/LGPL.LICENSE	26	LICENSE_FILE_LGPL21= ${WRKSRC}/LGPL.LICENSE
28	LICENSE_FILE_CDDL= ${WRKSRC}/OPENSOLARIS.LICENSE	27	LICENSE_FILE_CDDL= ${WRKSRC}/OPENSOLARIS.LICENSE
29		28
		29	USE_XZ= yes
30	USE_SCONS= yes	30	USE_SCONS= yes
31	SCONS_ARGS+= --prefix=${PREFIX} --libdatadir=${PREFIX}/share	31	SCONS_ARGS+= --prefix=${PREFIX} --libdatadir=${PREFIX}/share
32	USE_LDCONFIG= yes	32	USE_LDCONFIG= yes

Lines 1-6 Link Here

(-)chinese/sunpinyin/distinfo (-6 / +6 lines)
1	SHA256 (sunpinyin-2.0.3.tar.gz) = 4ab776e7563f69f8dbda8fac7cfaa42bd0db1ea68bab15f756094ce5398d83d1	1	SHA256 (sunpinyin-2.0.4rc1.tar.xz) = e8d752ca3fdf475cb097e71dfae3fbf7e118c373a3ea98d3742fc12ae838594e
2	SIZE (sunpinyin-2.0.3.tar.gz) = 169394	2	SIZE (sunpinyin-2.0.4rc1.tar.xz) = 969976
3	SHA256 (lm_sc.t3g.arpa.tar.bz2) = e66380518ba51c5c666babc09e91c253c8bb5809f6d853e9a56f0368f057659e	3	SHA256 (lm_sc.t3g.arpa.tar.bz2) = 5fcbb6264befd03a75fad1301b8804a8df52972b2ea91045c7f2613904bbc6c7
4	SIZE (lm_sc.t3g.arpa.tar.bz2) = 35959362	4	SIZE (lm_sc.t3g.arpa.tar.bz2) = 36280876
5	SHA256 (dict.utf8.tar.bz2) = 42f8eb6e8e4de809022069f25ff82a20c09f43b705fa2946162a92960857c97c	5	SHA256 (dict.utf8.tar.bz2) = d0bcbc5b7005823e69c490a178d456d476069c640bf292028282e9a94d784418
6	SIZE (dict.utf8.tar.bz2) = 496006	6	SIZE (dict.utf8.tar.bz2) = 583655




--- src/ime-core/imi_view_classic.h.orig	2011-02-17 21:39:52.000000000 -0600
+++ src/ime-core/imi_view_classic.h	2011-11-10 23:00:20.374788681 -0600
@@ -61,6 +61,9 @@ public:
     virtual int  onCandidatePageRequest(int pgno, bool relative);
     virtual int  onCandidateSelectRequest(int index);
 
+    void makeSelection(int candiIdx, unsigned& mask);
+    void deleteCandidate(int candiIdx, unsigned& mask);
+
 private:
     unsigned    m_cursorFrIdx;
     unsigned    m_candiFrIdx;
@@ -75,8 +78,6 @@ private:
     inline void _erase (bool backward, unsigned& mask);
 
     inline void _getCandidates ();
-    inline void _makeSelection (int candiIdx, unsigned& mask);
-    inline void _deleteCandidate (int candiIdx, unsigned& mask);
 
     inline void _commitChar (TWCHAR ch);
     inline void _commitString (const wstring& wstr);
--- src/ime-core/imi_view_classic.cpp.orig	2011-02-17 21:39:52.000000000 -0600
+++ src/ime-core/imi_view_classic.cpp	2011-11-10 23:01:01.213605402 -0600
@@ -168,7 +168,7 @@ CIMIClassicView::onKeyEvent(const CKeyEv
              !m_pIC->isEmpty ()) {
         changeMasks |= KEYEVENT_USED;
         unsigned sel = (keyvalue == '0'? 9: keyvalue-'1');        
-        _deleteCandidate (sel, changeMasks);
+        deleteCandidate (sel, changeMasks);
         goto PROCESSED;
 
     } else if ((modifiers & (IM_CTRL_MASK | IM_ALT_MASK | IM_SUPER_MASK | IM_RELEASE_MASK)) == 0) {
@@ -177,7 +177,7 @@ CIMIClassicView::onKeyEvent(const CKeyEv
             if (!m_pIC->isEmpty ()) {
                 changeMasks |= KEYEVENT_USED;
                 unsigned sel = (keyvalue == '0'? 9: keyvalue-'1');
-                _makeSelection (sel, changeMasks);
+                makeSelection (sel, changeMasks);
             } else {
                 m_numeric_mode = true;
             }
@@ -216,7 +216,7 @@ CIMIClassicView::onKeyEvent(const CKeyEv
         } else if (keycode == IM_VK_SPACE) {
             if (!m_pIC->isEmpty ()) {
                 changeMasks |= KEYEVENT_USED;
-                _makeSelection (0, changeMasks);
+                makeSelection (0, changeMasks);
             } else {
                 wstring wstr = (m_pIC->fullPuncOp()) (keyvalue);
                 if (wstr.size()) {
@@ -327,7 +327,7 @@ CIMIClassicView::onCandidateSelectReques
     unsigned changeMasks = 0;
 
     if (!m_pIC->isEmpty())
-        _makeSelection(index, changeMasks);
+        makeSelection(index, changeMasks);
 
     updateWindows(changeMasks);
     return 0;
@@ -612,7 +612,7 @@ CIMIClassicView::_moveEnd (unsigned& mas
 }
 
 void
-CIMIClassicView::_makeSelection (int candiIdx, unsigned& mask)
+CIMIClassicView::makeSelection (int candiIdx, unsigned& mask)
 {
     candiIdx += m_candiPageFirst;
     if (!m_tailSentence.empty ()) --candiIdx;
@@ -655,7 +655,7 @@ CIMIClassicView::_makeSelection (int can
 }
     
 void
-CIMIClassicView::_deleteCandidate (int candiIdx, unsigned& mask)
+CIMIClassicView::deleteCandidate (int candiIdx, unsigned& mask)
 {
     candiIdx += m_candiPageFirst;
     if (!m_tailSentence.empty ()) --candiIdx;
--- src/ime-core/imi_view.h.orig	2011-02-17 21:39:52.000000000 -0600
+++ src/ime-core/imi_view.h	2011-11-10 23:05:14.515633839 -0600
@@ -188,7 +188,7 @@ public:
     CIMIWinHandler* getWinHandler(void) {return m_pWinHandler;}
 
     void setHotkeyProfile (CHotkeyProfile *prof) { m_pHotkeyProfile = prof;}
-    void setCandiWindowSize (unsigned size) {m_candiWindowSize = size<10? size: 10;}
+    void setCandiWindowSize (unsigned size) {m_candiWindowSize = size;}
     CHotkeyProfile* getHotkeyProfile() { return m_pHotkeyProfile; }
     unsigned getCandiWindowSize() { return m_candiWindowSize; }
 

Lines 1-17 Link Here

(-)chinese/sunpinyin/files/patch-xdg (-10 / +18 lines)
1	diff -uNr src/ime-core/imi_options.cpp src/ime-core/imi_options.cpp	1	--- src/ime-core/imi_options.cpp~ 2012-05-13 22:55:19.000000000 -0500
2	--- src/ime-core/imi_options.cpp 2010-09-22 13:14:32.876000000 +0800	2	+++ src/ime-core/imi_options.cpp 2012-05-13 23:08:27.566965023 -0500
3	+++ src/ime-core/imi_options.cpp 2010-09-22 13:21:48.181000000 +0800	3	@@ -73,12 +73,15 @@ CSimplifiedChinesePolicy::loadResources(
4	@@ -73,8 +73,11 @@
5		4
6	if (!m_user_data_dir.size()) {	5	if (!m_user_data_dir.size()) {
7	char path[256];	6	char path[256];
8	- const char *home = getenv ("HOME");	7	- const char *home = getenv("HOME");
9	- snprintf (path, sizeof(path), "%s/%s", home, SUNPINYIN_USERDATA_DIR_PREFIX);	8	- snprintf(path,
10	+ const char *home = getenv ("XDG_CONFIG_HOME");	9	- sizeof(path),
11	+ if(home == NULL)	10	- "%s/%s",
12	+ snprintf (path, sizeof(path), "%s/.config/%s", getenv("HOME"), SUNPINYIN_USERDATA_DIR_PREFIX);	11	- home,
		12	- SUNPINYIN_USERDATA_DIR_PREFIX);
		13	+ const char *home = getenv("XDG_CONFIG_HOME");
		14	+ if (home == NULL)
		15	+ snprintf(path, sizeof(path),
		16	+ "%s/.config/%s", getenv("HOME"),
		17	+ SUNPINYIN_USERDATA_DIR_PREFIX);
13	+ else	18	+ else
14	+ snprintf (path, sizeof(path), "%s/%s", home, SUNPINYIN_USERDATA_DIR_PREFIX);	19	+ snprintf(path, sizeof(path),
		20	+ "%s/%s", home,
		21	+ SUNPINYIN_USERDATA_DIR_PREFIX);
15	m_user_data_dir = path;	22	m_user_data_dir = path;
16	}	23	}
17		24
Lines 27-29 diff -uNr src/ime-core/imi_options.h src Link Here
27	#endif	34	#endif
28		35
29	struct CSimplifiedChinesePolicy : public IConfigurable	36	struct CSimplifiedChinesePolicy : public IConfigurable
		37




include/sunpinyin-2.0/ime-core/imi_data.h
include/sunpinyin-2.0/ime-core/imi_defines.h
include/sunpinyin-2.0/ime-core/imi_funcobjs.h
include/sunpinyin-2.0/ime-core/imi_glibHandler.h
include/sunpinyin-2.0/ime-core/imi_keys.h
include/sunpinyin-2.0/ime-core/imi_option_event.h
include/sunpinyin-2.0/ime-core/imi_option_keys.h
include/sunpinyin-2.0/ime-core/imi_options.h
include/sunpinyin-2.0/ime-core/imi_plugin.h
include/sunpinyin-2.0/ime-core/imi_uiobjects.h
include/sunpinyin-2.0/ime-core/imi_view.h
include/sunpinyin-2.0/ime-core/imi_view_classic.h

Lines 6-12 Link Here

(-)chinese/fcitx/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= fcitx	8	PORTNAME= fcitx
9	PORTVERSION= 4.2.2	9	PORTVERSION= 4.2.3
10	CATEGORIES= chinese x11	10	CATEGORIES= chinese x11
11	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}	11	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
12	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} pinyin.tar.gz table.tar.gz	12	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} pinyin.tar.gz table.tar.gz

Lines 1-5 Link Here

(-)chinese/fcitx/distinfo (-2 / +2 lines)
1	SHA256 (fcitx/fcitx-4.2.2.tar.xz) = 1d18096232a700ddcf059e737b6acb2b292e5a4ae5d4bc2714e4f599e4e6daa6	1	SHA256 (fcitx/fcitx-4.2.3.tar.xz) = 4b7d22ada50f7e375096094c2abcf09ad114ffb68521ccf0de37d71e1014183c
2	SIZE (fcitx/fcitx-4.2.2.tar.xz) = 585936	2	SIZE (fcitx/fcitx-4.2.3.tar.xz) = 612028
3	SHA256 (fcitx/pinyin.tar.gz) = 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1	3	SHA256 (fcitx/pinyin.tar.gz) = 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1
4	SIZE (fcitx/pinyin.tar.gz) = 1608886	4	SIZE (fcitx/pinyin.tar.gz) = 1608886
5	SHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7	5	SHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7

Lines 109-114 share/cmake/fcitx/FcitxMacro.cmake Link Here

(-)chinese/fcitx/pkg-plist (+2 lines)
109	%%DATADIR%%/data/AutoEng.dat	109	%%DATADIR%%/data/AutoEng.dat
110	%%DATADIR%%/data/gbks2t.tab	110	%%DATADIR%%/data/gbks2t.tab
111	%%DATADIR%%/data/punc.mb.zh_CN	111	%%DATADIR%%/data/punc.mb.zh_CN
		112	%%DATADIR%%/data/punc.mb.zh_HK
112	%%DATADIR%%/data/punc.mb.zh_TW	113	%%DATADIR%%/data/punc.mb.zh_TW
113	%%DATADIR%%/data/vk.conf	114	%%DATADIR%%/data/vk.conf
114	%%DATADIR%%/inputmethod/pinyin.conf	115	%%DATADIR%%/inputmethod/pinyin.conf
Lines 295-300 share/icons/hicolor/scalable/status/fcit Link Here
295	share/icons/hicolor/scalable/status/fcitx-punc-inactive.svg	296	share/icons/hicolor/scalable/status/fcitx-punc-inactive.svg
296	share/icons/hicolor/scalable/status/fcitx-vk-active.svg	297	share/icons/hicolor/scalable/status/fcitx-vk-active.svg
297	share/icons/hicolor/scalable/status/fcitx-vk-inactive.svg	298	share/icons/hicolor/scalable/status/fcitx-vk-inactive.svg
		299	share/locale/ja/LC_MESSAGES/fcitx.mo
298	share/locale/zh_CN/LC_MESSAGES/fcitx.mo	300	share/locale/zh_CN/LC_MESSAGES/fcitx.mo
299	share/locale/zh_TW/LC_MESSAGES/fcitx.mo	301	share/locale/zh_TW/LC_MESSAGES/fcitx.mo
300	share/mime/packages/x-fskin.xml	302	share/mime/packages/x-fskin.xml

Lines 6-12 Link Here

(-)chinese/fcitx-chewing/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= fcitx-chewing	8	PORTNAME= fcitx-chewing
9	PORTVERSION= 0.1.0	9	PORTVERSION= 0.1.2
10	CATEGORIES= chinese	10	CATEGORIES= chinese
11	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}	11	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
12	DIST_SUBDIR= fcitx	12	DIST_SUBDIR= fcitx
Lines 17-23 COMMENT= Chewing support for Fcitx Link Here
17	LIB_DEPENDS= fcitx-config.4:${PORTSDIR}/chinese/fcitx \	17	LIB_DEPENDS= fcitx-config.4:${PORTSDIR}/chinese/fcitx \
18	chewing.3:${PORTSDIR}/chinese/libchewing	18	chewing.3:${PORTSDIR}/chinese/libchewing
19		19
20	USE_BZIP2= yes	20	USE_XZ= yes
21	USE_GETTEXT= yes	21	USE_GETTEXT= yes
22	USE_CMAKE= yes	22	USE_CMAKE= yes
23	USE_GNOME= intltool	23	USE_GNOME= intltool

Lines 1-2 Link Here

(-)chinese/fcitx-chewing/distinfo (-2 / +2 lines)
1	SHA256 (fcitx/fcitx-chewing-0.1.0.tar.bz2) = 6b9f7bb00fc1d8b7a5f888589665f185b906b83a68d630605cb0cc649f2a2352	1	SHA256 (fcitx/fcitx-chewing-0.1.2.tar.xz) = d7e44f76a69c34c9c5e27fc2dd97e52290e8efe28ca008899735f992bbdcc5d2
2	SIZE (fcitx/fcitx-chewing-0.1.0.tar.bz2) = 15867	2	SIZE (fcitx/fcitx-chewing-0.1.2.tar.xz) = 15120

Lines 1-4 Link Here

(-)chinese/fcitx-chewing/pkg-descr (-1 / +1 lines)
1	fcitx-chewing provides Chewing, an intelligent phonetic input method	1	fcitx-chewing provides Chewing, an intelligent phonetic input method
2	engine, as a back-end to the Fcitx IM server.	2	engine, as a back-end to the Fcitx IM framework.
3		3
4	WWW: http://code.google.com/p/fcitx/	4	WWW: http://code.google.com/p/fcitx/

Lines 6-12 Link Here

(-)chinese/fcitx-configtool/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= fcitx-configtool	8	PORTNAME= fcitx-configtool
9	PORTVERSION= 0.4.2	9	PORTVERSION= 0.4.3
10	CATEGORIES= chinese x11	10	CATEGORIES= chinese x11
11	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}	11	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
12	DIST_SUBDIR= fcitx	12	DIST_SUBDIR= fcitx

Lines 1-2 Link Here

(-)chinese/fcitx-configtool/distinfo (-2 / +2 lines)
1	SHA256 (fcitx/fcitx-configtool-0.4.2.tar.xz) = 98e1c14c3737e13a6340eb093f7f5391e4cd973e147aec8c9e49f41b3a1904b7	1	SHA256 (fcitx/fcitx-configtool-0.4.3.tar.xz) = 0b8722da441acd3deb841f6b389b02499bc99f61a711ce57ad0cccae359a53b9
2	SIZE (fcitx/fcitx-configtool-0.4.2.tar.xz) = 33724	2	SIZE (fcitx/fcitx-configtool-0.4.3.tar.xz) = 34792

Lines 1-10 Link Here

(-)chinese/fcitx-configtool/files/patch-gtk3_CMakeLists.txt (-6 / +5 lines)
1	--- gtk3/CMakeLists.txt~ 2012-01-30 04:51:25.000000000 -0600	1	--- gtk3/CMakeLists.txt~ 2012-05-03 01:21:57.000000000 -0500
2	+++ gtk3/CMakeLists.txt 2012-02-06 03:22:50.184481579 -0600	2	+++ gtk3/CMakeLists.txt 2012-05-14 01:55:09.806098826 -0500
3	@@ -45,6 +45,7 @@ target_link_libraries (fcitx-config-gtk3	3	@@ -42,5 +42,6 @@ target_link_libraries (fcitx-config-gtk3
4	${FCITX4_FCITX_CONFIG_LIBRARIES}
5	${FCITX4_FCITX_LIBRARIES}	4	${FCITX4_FCITX_LIBRARIES}
		5	${GLIB2_LIBRARIES}
6	${GIO2_LIBRARIES}	6	${GIO2_LIBRARIES}
7	+ -lintl	7	+ -lintl
8	)	8	)
9		9
10	if (UNIQUE3_FOUND)

Lines 1-10 Link Here

(-)chinese/fcitx-configtool/files/patch-gtk_CMakeLists.txt (-6 / +6 lines)
1	--- gtk/CMakeLists.txt~ 2012-01-30 04:51:25.000000000 -0600	1	--- gtk/CMakeLists.txt~ 2012-05-03 01:21:57.000000000 -0500
2	+++ gtk/CMakeLists.txt 2012-02-06 03:19:28.808521532 -0600	2	+++ gtk/CMakeLists.txt 2012-05-14 01:56:06.761294523 -0500
3	@@ -44,6 +44,7 @@ target_link_libraries (fcitx-config-gtk	3	@@ -49,6 +49,7 @@ target_link_libraries (fcitx-config-gtk
4	${FCITX4_FCITX_CONFIG_LIBRARIES}
5	${FCITX4_FCITX_LIBRARIES}	4	${FCITX4_FCITX_LIBRARIES}
6	${GIO2_LIBRARIES}	5	${GLIB2_LIBRARIES}
7	+ -lintl	6	${DBUS_GLIB_LIBRARIES}
		7	+ -lintl
8	)	8	)
9		9
10	if (UNIQUE_FOUND)	10	if (UNIQUE_FOUND)

Lines 6-12 Link Here

(-)textproc/fcitx-keyboard/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= fcitx-keyboard	8	PORTNAME= fcitx-keyboard
9	PORTVERSION= 0.1.2	9	PORTVERSION= 0.1.3
10	CATEGORIES= textproc	10	CATEGORIES= textproc
11	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}	11	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
12	DIST_SUBDIR= fcitx	12	DIST_SUBDIR= fcitx

Lines 1-2 Link Here

(-)textproc/fcitx-keyboard/distinfo (-2 / +2 lines)
1	SHA256 (fcitx/fcitx-keyboard-0.1.2.tar.xz) = de62e60f9a2e23836885f893f8c475b02ce5c6b93fcc8af7ec5b626a1c0b0a95	1	SHA256 (fcitx/fcitx-keyboard-0.1.3.tar.xz) = 3df3bc35eb1cb564a29fb71b4fef441c95432766b686514374805b841cbca3ef
2	SIZE (fcitx/fcitx-keyboard-0.1.2.tar.xz) = 42060	2	SIZE (fcitx/fcitx-keyboard-0.1.3.tar.xz) = 42588

Lines 6-12 Link Here

(-)chinese/fcitx-sunpinyin/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= fcitx-sunpinyin	8	PORTNAME= fcitx-sunpinyin
9	PORTVERSION= 0.3.5	9	PORTVERSION= 0.3.6
10	CATEGORIES= chinese	10	CATEGORIES= chinese
11	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}	11	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
12	DIST_SUBDIR= fcitx	12	DIST_SUBDIR= fcitx

Lines 1-2 Link Here

(-)chinese/fcitx-sunpinyin/distinfo (-2 / +2 lines)
1	SHA256 (fcitx/fcitx-sunpinyin-0.3.5.tar.xz) = 932b74eafb86f9051400a311c4da09ad4888190015e667eea3c4019934f67b62	1	SHA256 (fcitx/fcitx-sunpinyin-0.3.6.tar.xz) = 6ed029860fe8df1e39bf8f36ada4473a94467887614e103d5832fd8a09cfa6a6
2	SIZE (fcitx/fcitx-sunpinyin-0.3.5.tar.xz) = 40248	2	SIZE (fcitx/fcitx-sunpinyin-0.3.6.tar.xz) = 40348

Lines 1-11 Link Here

(-)chinese/fcitx-sunpinyin/files/patch-cmake_FindSunpinyin.cmake (-11 lines)
1	--- cmake/FindSunpinyin.cmake~ 2012-03-04 21:43:53.000000000 -0600
2	+++ cmake/FindSunpinyin.cmake 2012-04-06 02:14:47.564463773 -0500
3	@@ -16,7 +16,7 @@ if(SUNPINYIN_INCLUDE_DIR AND SUNPINYIN_L
4	endif(SUNPINYIN_INCLUDE_DIR AND SUNPINYIN_LIBRARIES)
5
6	find_package(PkgConfig REQUIRED)
7	-pkg_check_modules(PC_LIBSUNPINYIN "sunpinyin-2.0 >= 2.0.4")
8	+pkg_check_modules(PC_LIBSUNPINYIN "sunpinyin-2.0 >= 2.0.3")
9
10	find_path(SUNPINYIN_MAIN_INCLUDE_DIR
11	NAMES sunpinyin.h

Return to bug 167863

Lines 1-88 Link Here

(-)chinese/sunpinyin/files/patch-2.0.4-compatible (-88 lines)
1	--- src/ime-core/imi_view_classic.h.orig 2011-02-17 21:39:52.000000000 -0600
2	+++ src/ime-core/imi_view_classic.h 2011-11-10 23:00:20.374788681 -0600
3	@@ -61,6 +61,9 @@ public:
4	virtual int onCandidatePageRequest(int pgno, bool relative);
5	virtual int onCandidateSelectRequest(int index);
6
7	+ void makeSelection(int candiIdx, unsigned& mask);
8	+ void deleteCandidate(int candiIdx, unsigned& mask);
9	+
10	private:
11	unsigned m_cursorFrIdx;
12	unsigned m_candiFrIdx;
13	@@ -75,8 +78,6 @@ private:
14	inline void _erase (bool backward, unsigned& mask);
15
16	inline void _getCandidates ();
17	- inline void _makeSelection (int candiIdx, unsigned& mask);
18	- inline void _deleteCandidate (int candiIdx, unsigned& mask);
19
20	inline void _commitChar (TWCHAR ch);
21	inline void _commitString (const wstring& wstr);
22	--- src/ime-core/imi_view_classic.cpp.orig 2011-02-17 21:39:52.000000000 -0600
23	+++ src/ime-core/imi_view_classic.cpp 2011-11-10 23:01:01.213605402 -0600
24	@@ -168,7 +168,7 @@ CIMIClassicView::onKeyEvent(const CKeyEv
25	!m_pIC->isEmpty ()) {
26	changeMasks \|= KEYEVENT_USED;
27	unsigned sel = (keyvalue == '0'? 9: keyvalue-'1');
28	- _deleteCandidate (sel, changeMasks);
29	+ deleteCandidate (sel, changeMasks);
30	goto PROCESSED;
31
32	} else if ((modifiers & (IM_CTRL_MASK \| IM_ALT_MASK \| IM_SUPER_MASK \| IM_RELEASE_MASK)) == 0) {
33	@@ -177,7 +177,7 @@ CIMIClassicView::onKeyEvent(const CKeyEv
34	if (!m_pIC->isEmpty ()) {
35	changeMasks \|= KEYEVENT_USED;
36	unsigned sel = (keyvalue == '0'? 9: keyvalue-'1');
37	- _makeSelection (sel, changeMasks);
38	+ makeSelection (sel, changeMasks);
39	} else {
40	m_numeric_mode = true;
41	}
42	@@ -216,7 +216,7 @@ CIMIClassicView::onKeyEvent(const CKeyEv
43	} else if (keycode == IM_VK_SPACE) {
44	if (!m_pIC->isEmpty ()) {
45	changeMasks \|= KEYEVENT_USED;
46	- _makeSelection (0, changeMasks);
47	+ makeSelection (0, changeMasks);
48	} else {
49	wstring wstr = (m_pIC->fullPuncOp()) (keyvalue);
50	if (wstr.size()) {
51	@@ -327,7 +327,7 @@ CIMIClassicView::onCandidateSelectReques
52	unsigned changeMasks = 0;
53
54	if (!m_pIC->isEmpty())
55	- _makeSelection(index, changeMasks);
56	+ makeSelection(index, changeMasks);
57
58	updateWindows(changeMasks);
59	return 0;
60	@@ -612,7 +612,7 @@ CIMIClassicView::_moveEnd (unsigned& mas
61	}
62
63	void
64	-CIMIClassicView::_makeSelection (int candiIdx, unsigned& mask)
65	+CIMIClassicView::makeSelection (int candiIdx, unsigned& mask)
66	{
67	candiIdx += m_candiPageFirst;
68	if (!m_tailSentence.empty ()) --candiIdx;
69	@@ -655,7 +655,7 @@ CIMIClassicView::_makeSelection (int can
70	}
71
72	void
73	-CIMIClassicView::_deleteCandidate (int candiIdx, unsigned& mask)
74	+CIMIClassicView::deleteCandidate (int candiIdx, unsigned& mask)
75	{
76	candiIdx += m_candiPageFirst;
77	if (!m_tailSentence.empty ()) --candiIdx;
78	--- src/ime-core/imi_view.h.orig 2011-02-17 21:39:52.000000000 -0600
79	+++ src/ime-core/imi_view.h 2011-11-10 23:05:14.515633839 -0600
80	@@ -188,7 +188,7 @@ public:
81	CIMIWinHandler* getWinHandler(void) {return m_pWinHandler;}
82
83	void setHotkeyProfile (CHotkeyProfile *prof) { m_pHotkeyProfile = prof;}
84	- void setCandiWindowSize (unsigned size) {m_candiWindowSize = size<10? size: 10;}
85	+ void setCandiWindowSize (unsigned size) {m_candiWindowSize = size;}
86	CHotkeyProfile* getHotkeyProfile() { return m_pHotkeyProfile; }
87	unsigned getCandiWindowSize() { return m_candiWindowSize; }
88

Lines 3-12 include/sunpinyin-2.0/ime-core/imi_conte Link Here

(-)chinese/sunpinyin/pkg-plist (+2 lines)
3	include/sunpinyin-2.0/ime-core/imi_data.h	3	include/sunpinyin-2.0/ime-core/imi_data.h
4	include/sunpinyin-2.0/ime-core/imi_defines.h	4	include/sunpinyin-2.0/ime-core/imi_defines.h
5	include/sunpinyin-2.0/ime-core/imi_funcobjs.h	5	include/sunpinyin-2.0/ime-core/imi_funcobjs.h
		6	include/sunpinyin-2.0/ime-core/imi_glibHandler.h
6	include/sunpinyin-2.0/ime-core/imi_keys.h	7	include/sunpinyin-2.0/ime-core/imi_keys.h
7	include/sunpinyin-2.0/ime-core/imi_option_event.h	8	include/sunpinyin-2.0/ime-core/imi_option_event.h
8	include/sunpinyin-2.0/ime-core/imi_option_keys.h	9	include/sunpinyin-2.0/ime-core/imi_option_keys.h
9	include/sunpinyin-2.0/ime-core/imi_options.h	10	include/sunpinyin-2.0/ime-core/imi_options.h
		11	include/sunpinyin-2.0/ime-core/imi_plugin.h
10	include/sunpinyin-2.0/ime-core/imi_uiobjects.h	12	include/sunpinyin-2.0/ime-core/imi_uiobjects.h
11	include/sunpinyin-2.0/ime-core/imi_view.h	13	include/sunpinyin-2.0/ime-core/imi_view.h
12	include/sunpinyin-2.0/ime-core/imi_view_classic.h	14	include/sunpinyin-2.0/ime-core/imi_view_classic.h