[libpinyin] Update to 0.7.0
Peng Wu
pwu at fedoraproject.org
Fri Jul 27 03:52:57 UTC 2012
commit 0a700b05e90b5967561dc832bac397722511b922
Author: Peng Wu <alexepico at gmail.com>
Date: Fri Jul 27 11:51:30 2012 +0800
Update to 0.7.0
.gitignore | 1 +
libpinyin-0.7.x-head.patch | 165 --------------------------------------------
libpinyin.spec | 7 ++-
sources | 2 +-
4 files changed, 7 insertions(+), 168 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d41a01..4175370 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/libpinyin-0.5.92.tar.gz
/libpinyin-0.6.0.tar.gz
/libpinyin-0.6.92.tar.gz
+/libpinyin-0.7.0.tar.gz
diff --git a/libpinyin-0.7.x-head.patch b/libpinyin-0.7.x-head.patch
index f2acdc4..e69de29 100644
--- a/libpinyin-0.7.x-head.patch
+++ b/libpinyin-0.7.x-head.patch
@@ -1,165 +0,0 @@
-From f9f1575a983f184dd84b137d4b8d5ce3a35c063d Mon Sep 17 00:00:00 2001
-From: Peng Wu <alexepico at gmail.com>
-Date: Wed, 4 Jul 2012 13:21:42 +0800
-Subject: [PATCH 1/5] fixes _compute_phrase_strings_of_items
-
----
- src/pinyin.cpp | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/src/pinyin.cpp b/src/pinyin.cpp
-index 96c2d33..12a4b8d 100644
---- a/src/pinyin.cpp
-+++ b/src/pinyin.cpp
-@@ -918,6 +918,7 @@ static bool _prepend_sentence_candidate(pinyin_instance_t * instance,
- }
-
- static bool _compute_phrase_strings_of_items(pinyin_instance_t * instance,
-+ size_t offset,
- CandidateVector candidates) {
- /* populate m_phrase_string in lookup_candidate_t. */
-
-@@ -926,9 +927,14 @@ static bool _compute_phrase_strings_of_items(pinyin_instance_t * instance,
- (candidates, lookup_candidate_t, i);
-
- switch(candidate->m_candidate_type) {
-- case BEST_MATCH_CANDIDATE:
-- pinyin_get_sentence(instance, &(candidate->m_phrase_string));
-+ case BEST_MATCH_CANDIDATE: {
-+ gchar * sentence = NULL;
-+ pinyin_get_sentence(instance, &sentence);
-+ candidate->m_phrase_string = g_strdup
-+ (g_utf8_offset_to_pointer(sentence, offset));
-+ g_free(sentence);
- break;
-+ }
- case NORMAL_CANDIDATE:
- case DIVIDED_CANDIDATE:
- case RESPLIT_CANDIDATE:
-@@ -1133,7 +1139,7 @@ bool pinyin_get_candidates(pinyin_instance_t * instance,
-
- _prepend_sentence_candidate(instance, candidates);
-
-- _compute_phrase_strings_of_items(instance, candidates);
-+ _compute_phrase_strings_of_items(instance, offset, candidates);
-
- _remove_duplicated_items_by_phrase_string(instance, candidates);
-
-@@ -1507,7 +1513,7 @@ bool pinyin_get_full_pinyin_candidates(pinyin_instance_t * instance,
-
- _prepend_sentence_candidate(instance, candidates);
-
-- _compute_phrase_strings_of_items(instance, candidates);
-+ _compute_phrase_strings_of_items(instance, offset, candidates);
-
- _remove_duplicated_items_by_phrase_string(instance, candidates);
-
---
-1.7.10.4
-
-
-From 7cd0517bcb30e2c802533ccfec9fc8228a410472 Mon Sep 17 00:00:00 2001
-From: Peng Wu <alexepico at gmail.com>
-Date: Wed, 4 Jul 2012 16:05:55 +0800
-Subject: [PATCH 2/5] fixes ld script
-
----
- src/libpinyin.ver | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/libpinyin.ver b/src/libpinyin.ver
-index eb9e6d8..8208425 100644
---- a/src/libpinyin.ver
-+++ b/src/libpinyin.ver
-@@ -4,6 +4,8 @@ LIBPINYIN {
- pinyin_save;
- pinyin_set_double_pinyin_scheme;
- pinyin_set_chewing_scheme;
-+ pinyin_load_phrase_library;
-+ pinyin_unload_phrase_library;
- pinyin_fini;
- pinyin_set_options;
- pinyin_alloc_instance;
---
-1.7.10.4
-
-
-From 91ce93e4807833b1f61a0ef79ce2a11187fb72e8 Mon Sep 17 00:00:00 2001
-From: Peng Wu <alexepico at gmail.com>
-Date: Thu, 5 Jul 2012 17:05:12 +0800
-Subject: [PATCH 3/5] fixes libpinyin.ver
-
----
- src/libpinyin.ver | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/libpinyin.ver b/src/libpinyin.ver
-index 8208425..eddc5e4 100644
---- a/src/libpinyin.ver
-+++ b/src/libpinyin.ver
-@@ -6,6 +6,9 @@ LIBPINYIN {
- pinyin_set_chewing_scheme;
- pinyin_load_phrase_library;
- pinyin_unload_phrase_library;
-+ pinyin_begin_add_phrases;
-+ pinyin_iterator_add_phrase;
-+ pinyin_end_add_phrases;
- pinyin_fini;
- pinyin_set_options;
- pinyin_alloc_instance;
---
-1.7.10.4
-
-
-From e8226de4e54798d65d7981830ff18e6367230be3 Mon Sep 17 00:00:00 2001
-From: Peng Wu <alexepico at gmail.com>
-Date: Fri, 6 Jul 2012 14:47:58 +0800
-Subject: [PATCH 4/5] fixes _prepend_sentence_candidate
-
----
- src/pinyin.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/pinyin.cpp b/src/pinyin.cpp
-index 12a4b8d..64d69db 100644
---- a/src/pinyin.cpp
-+++ b/src/pinyin.cpp
-@@ -908,6 +908,7 @@ static bool _prepend_sentence_candidate(pinyin_instance_t * instance,
- pinyin_get_sentence(instance, &sentence);
- if (NULL == sentence)
- return false;
-+ g_free(sentence);
-
- /* prepend best match candidate to candidates. */
- lookup_candidate_t candidate;
---
-1.7.10.4
-
-
-From 3f74e38f850f232c7b2637a4b70adc8ab9e0b903 Mon Sep 17 00:00:00 2001
-From: Peng Wu <alexepico at gmail.com>
-Date: Mon, 9 Jul 2012 12:48:55 +0800
-Subject: [PATCH 5/5] fixes pinyin_reset
-
----
- src/pinyin.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/pinyin.cpp b/src/pinyin.cpp
-index 64d69db..a6724ae 100644
---- a/src/pinyin.cpp
-+++ b/src/pinyin.cpp
-@@ -1624,6 +1624,10 @@ bool pinyin_train(pinyin_instance_t * instance){
- }
-
- bool pinyin_reset(pinyin_instance_t * instance){
-+ g_free(instance->m_raw_full_pinyin);
-+ instance->m_raw_full_pinyin = NULL;
-+
-+ g_array_set_size(instance->m_prefixes, 0);
- g_array_set_size(instance->m_pinyin_keys, 0);
- g_array_set_size(instance->m_pinyin_key_rests, 0);
- g_array_set_size(instance->m_constraints, 0);
---
-1.7.10.4
-
diff --git a/libpinyin.spec b/libpinyin.spec
index 33143cd..f16fd5a 100644
--- a/libpinyin.spec
+++ b/libpinyin.spec
@@ -1,6 +1,6 @@
Name: libpinyin
-Version: 0.6.92
-Release: 3%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
Summary: Library to deal with pinyin
License: GPLv2+
@@ -86,6 +86,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{_mandir}/man1/*.1.*
%changelog
+* Fri Jul 27 2012 Peng Wu <pwu at redhat.com> - 0.7.0-1
+- Update to 0.7.0
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.92-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 5a0455c..08013d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d466c065eb3ac492ee81342e73ad29d7 libpinyin-0.6.92.tar.gz
+b4a375338f98f70698d519fad1aeb411 libpinyin-0.7.0.tar.gz
More information about the scm-commits
mailing list