mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
app-i18n/scim-pinyin: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/9120
This commit is contained in:
committed by
Tony Vroon
parent
1e803e9c12
commit
2dd2b35a71
@@ -1,62 +0,0 @@
|
||||
diff -Nru scim-pinyin-0.5.91.orig/src/scim_pinyin_imengine.cpp scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp
|
||||
--- scim-pinyin-0.5.91.orig/src/scim_pinyin_imengine.cpp 2005-08-06 23:31:08.000000000 +0800
|
||||
+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp 2009-02-18 00:06:34.000000000 +0800
|
||||
@@ -706,8 +706,12 @@
|
||||
m_sys_phrase_lib = m_pinyin_global->get_sys_phrase_lib ();
|
||||
m_user_phrase_lib = m_pinyin_global->get_user_phrase_lib ();
|
||||
}
|
||||
-
|
||||
- if (encoding == "GBK" || encoding == "GB2312") {
|
||||
+
|
||||
+ if (encoding == "GBK") {
|
||||
+ m_simplified = true;
|
||||
+ m_traditional = true;
|
||||
+ m_chinese_iconv.set_encoding ("GBK");
|
||||
+ } else if (encoding == "GB2312") {
|
||||
m_simplified = true;
|
||||
m_traditional = false;
|
||||
m_chinese_iconv.set_encoding ("GB2312");
|
||||
@@ -930,10 +934,39 @@
|
||||
|
||||
m_iconv.set_encoding (encoding);
|
||||
|
||||
- if (encoding == "GBK" || encoding == "GB2312") {
|
||||
- m_simplified = true;
|
||||
- m_traditional = false;
|
||||
- m_chinese_iconv.set_encoding ("GB2312");
|
||||
+ if (encoding == "GBK") {
|
||||
+ if (m_simplified == false) {
|
||||
+ if(m_traditional == true){
|
||||
+ ; //Big5. Big5togbk is not implemented. Set to next available.
|
||||
+ m_simplified = true;
|
||||
+ m_chinese_iconv.set_encoding ("GBK");
|
||||
+ }else{ // nochinese mode. Should not happen.
|
||||
+ m_forward = true;
|
||||
+ m_chinese_iconv.set_encoding ("");
|
||||
+ }
|
||||
+ }else{
|
||||
+ if( m_traditional == false) //GB2312
|
||||
+ m_chinese_iconv.set_encoding("GB2312");
|
||||
+ else m_chinese_iconv.set_encoding ("GBK"); //ALL
|
||||
+ }
|
||||
+ } else if (encoding == "GB2312") {
|
||||
+ if ( m_simplified == false ) {
|
||||
+ if(m_traditional == true) {
|
||||
+ ; //partly map big5 to gb2312 is not done. Set to next.
|
||||
+ m_forward = true;
|
||||
+ m_chinese_iconv.set_encoding ("");
|
||||
+ }else{//Should not happen.
|
||||
+ m_forward = true;
|
||||
+ m_chinese_iconv.set_encoding("");
|
||||
+ }
|
||||
+ }else{
|
||||
+ if (m_traditional == true) { //Should not happen.
|
||||
+ m_forward = true;
|
||||
+ m_chinese_iconv.set_encoding ("");
|
||||
+ }else{
|
||||
+ m_chinese_iconv.set_encoding ("GB2312");
|
||||
+ }
|
||||
+ }
|
||||
} else if (encoding == "BIG5" || encoding == "BIG5-HKSCS") {
|
||||
m_simplified = false;
|
||||
m_traditional = true;
|
||||
@@ -1,44 +0,0 @@
|
||||
diff -Naur scim-pinyin-0.5.91.orig/src/scim_phrase.cpp scim-pinyin-0.5.91/src/scim_phrase.cpp
|
||||
--- scim-pinyin-0.5.91.orig/src/scim_phrase.cpp 2005-01-06 22:30:58.000000000 +0900
|
||||
+++ scim-pinyin-0.5.91/src/scim_phrase.cpp 2008-06-21 13:16:32.000000000 +0900
|
||||
@@ -27,6 +27,7 @@
|
||||
|
||||
#define SCIM_PHRASE_MAX_RELATION 1000
|
||||
|
||||
+#include <cstring>
|
||||
#include <scim.h>
|
||||
#include "scim_pinyin_private.h"
|
||||
#include "scim_phrase.h"
|
||||
diff -Naur scim-pinyin-0.5.91.orig/src/scim_pinyin.cpp scim-pinyin-0.5.91/src/scim_pinyin.cpp
|
||||
--- scim-pinyin-0.5.91.orig/src/scim_pinyin.cpp 2005-08-08 15:11:16.000000000 +0900
|
||||
+++ scim-pinyin-0.5.91/src/scim_pinyin.cpp 2008-06-21 13:16:30.000000000 +0900
|
||||
@@ -28,6 +28,7 @@
|
||||
#define Uses_SCIM_CONFIG_PATH
|
||||
#define Uses_SCIM_LOOKUP_TABLE
|
||||
|
||||
+#include <cstring>
|
||||
#include <scim.h>
|
||||
#include "scim_pinyin.h"
|
||||
|
||||
diff -Naur scim-pinyin-0.5.91.orig/src/scim_pinyin_phrase.cpp scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp
|
||||
--- scim-pinyin-0.5.91.orig/src/scim_pinyin_phrase.cpp 2005-08-06 21:06:49.000000000 +0900
|
||||
+++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp 2008-06-21 13:21:13.000000000 +0900
|
||||
@@ -26,6 +26,7 @@
|
||||
#define Uses_SCIM_CONFIG_PATH
|
||||
#define Uses_SCIM_LOOKUP_TABLE
|
||||
|
||||
+#include <cstring>
|
||||
#include <scim.h>
|
||||
#include "scim_pinyin_private.h"
|
||||
#include "scim_phrase.h"
|
||||
diff -Naur scim-pinyin-0.5.91.orig/src/scim_special_table.cpp scim-pinyin-0.5.91/src/scim_special_table.cpp
|
||||
--- scim-pinyin-0.5.91.orig/src/scim_special_table.cpp 2005-01-06 22:31:02.000000000 +0900
|
||||
+++ scim-pinyin-0.5.91/src/scim_special_table.cpp 2008-06-21 13:25:25.000000000 +0900
|
||||
@@ -20,6 +20,7 @@
|
||||
#define Uses_STL_IOMANIP
|
||||
#define Uscs_C_STRING
|
||||
|
||||
+#include <cstring>
|
||||
#include <time.h>
|
||||
#include <scim.h>
|
||||
#include "scim_pinyin_private.h"
|
||||
@@ -1,25 +0,0 @@
|
||||
Index: scim-pinyin-0.5.91/skim/setupui/smartpinyinui.ui
|
||||
===================================================================
|
||||
--- scim-pinyin-0.5.91.orig/skim/setupui/smartpinyinui.ui
|
||||
+++ scim-pinyin-0.5.91/skim/setupui/smartpinyinui.ui
|
||||
@@ -863,20 +863,4 @@
|
||||
<tabstop>kcfg__IMEngine_Pinyin_DisablePhraseKey</tabstop>
|
||||
</tabstops>
|
||||
<layoutdefaults spacing="6" margin="11"/>
|
||||
-<includehints>
|
||||
- <includehint>skimeditshortcutbutton.h</includehint>
|
||||
- <includehint>klineedit.h</includehint>
|
||||
- <includehint>skimeditshortcutbutton.h</includehint>
|
||||
- <includehint>klineedit.h</includehint>
|
||||
- <includehint>skimeditshortcutbutton.h</includehint>
|
||||
- <includehint>klineedit.h</includehint>
|
||||
- <includehint>klineedit.h</includehint>
|
||||
- <includehint>skimeditshortcutbutton.h</includehint>
|
||||
- <includehint>skimeditshortcutbutton.h</includehint>
|
||||
- <includehint>klineedit.h</includehint>
|
||||
- <includehint>skimeditshortcutbutton.h</includehint>
|
||||
- <includehint>klineedit.h</includehint>
|
||||
- <includehint>skimeditshortcutbutton.h</includehint>
|
||||
- <includehint>klineedit.h</includehint>
|
||||
-</includehints>
|
||||
</UI>
|
||||
Reference in New Issue
Block a user