diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch')
-rw-r--r-- | app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch b/app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch new file mode 100644 index 000000000000..58da5e99766a --- /dev/null +++ b/app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch @@ -0,0 +1,77 @@ +diff --git a/src/winime.cpp b/src/winime.cpp +index 0c52393..85729a3 100644 +--- a/src/winime.cpp ++++ b/src/winime.cpp +@@ -56,10 +56,10 @@ mCandilistBufLen(0) + + memcpy(&mHead, mpBuf, sizeof(mHead)); + int len = strlen(mHead.mCodeSet); +- mpIndex1 = (char **) (mpBuf + sizeof(mHead)); +- mpIndex2 = (char **) (mpBuf + sizeof(mHead) + len * sizeof(char *)); +- mpText = mpBuf + sizeof(mHead) + len * sizeof(char *) + +- len * len * sizeof(char *); ++ mpIndex1 = (int *) (mpBuf + sizeof(mHead)); ++ mpIndex2 = (int *) (mpBuf + sizeof(mHead) + len * sizeof(int)); ++ mpText = mpBuf + sizeof(mHead) + len * sizeof(int) + ++ len * len * sizeof(int); + } + + WinIme::~WinIme() { +@@ -246,32 +246,33 @@ int WinIme::Search(char c) { + // p = *t; + } + else +- p = mpIndex1[Index(c)]; ++ p = (char *)mpIndex1[Index(c)]; + + if (p == (char *) 0xffffffff) + found = false; +- p = (unsigned int) p + mpText; ++ p = (unsigned long) p + mpText; + } //2nd level index + else if (mNum == 1) { + int l = strlen(mHead.mCodeSet); + if (c == mHead.mWildChar) { + char **t; + t = +- find_if(mpIndex2 + Index(mInput[0]) * l, +- mpIndex2 + (Index(mInput[0]) + 1) * l, ++ find_if((char **)(mpIndex2 + Index(mInput[0]) * l), ++ (char **)(mpIndex2 + (Index(mInput[0]) + 1) * l), + bind2nd(not_equal_to < char *>(), + (char *) 0xffffffff)); +- if (t == mpIndex2 + (Index(mInput[0]) + 1) * l) ++ if (t == ((char **)mpIndex2) + (Index(mInput[0]) + 1) * l) + p = (char *) 0xffffffff; + else + p = *t; +- } else +- p = mpIndex2[Index(mInput[0]) * l + Index(c)]; ++ } else { ++ int dd = Index(mInput[0]) * l + Index(c); ++ p = (char *)(mpIndex2[Index(mInput[0]) * l + Index(c)]); ++ } + + if (p == (char *) 0xffffffff) + found = false; +- +- p = (unsigned int) p + mpText; ++ p = (unsigned long) p + mpText; + } else if (mNum < mHead.mMaxCodes) { + p = mpOffset[mNum - 1]; + if (p == (char *) 0xffffffff) +diff --git a/src/winime.h b/src/winime.h +index c2f51ab..816a270 100644 +--- a/src/winime.h ++++ b/src/winime.h +@@ -83,8 +83,8 @@ class WinIme { + char* mpOffset[12]; + int mFd; + char* mpBuf; +- char** mpIndex1; +- char** mpIndex2; ++ int *mpIndex1; ++ int *mpIndex2; + char* mpText; + char* mpCur; //current search position + unsigned int mBufSize; |