diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-24 09:10:15 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-24 09:10:15 +0100 |
| commit | 0a91993304168ce808fbb7eca986e03262ccb692 (patch) | |
| tree | b8a47673b339f0f718625cf189b75e1dff7fe737 /community/libpinyin | |
| parent | be8b4f05bd396634d6e9e7328da718f3a96048a6 (diff) | |
| parent | 31416859638d756d88136e4e0eb78027c16ac17f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libpinyin/PKGBUILD
extra/calligra/PKGBUILD
extra/evas_generic_loaders/PKGBUILD
extra/gnome-menus/PKGBUILD
extra/nx/PKGBUILD
extra/poppler/PKGBUILD
extra/usermin/PKGBUILD
extra/vigra/PKGBUILD
extra/webmin/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
Diffstat (limited to 'community/libpinyin')
| -rw-r--r-- | community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch | 25 | ||||
| -rw-r--r-- | community/libpinyin/PKGBUILD | 14 |
2 files changed, 34 insertions, 5 deletions
diff --git a/community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch b/community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch new file mode 100644 index 000000000..c895adf4c --- /dev/null +++ b/community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch @@ -0,0 +1,25 @@ +From 00fec992f5c760f546a1db933fb08325fc9cccbf Mon Sep 17 00:00:00 2001 +From: Peng Wu <alexepico@gmail.com> +Date: Sat, 23 Mar 2013 09:52:46 +0800 +Subject: [PATCH] fixes import dict + +--- + src/storage/phrase_large_table2.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/storage/phrase_large_table2.h b/src/storage/phrase_large_table2.h +index 368d03d..34bb12d 100644 +--- a/src/storage/phrase_large_table2.h ++++ b/src/storage/phrase_large_table2.h +@@ -133,7 +133,7 @@ static inline int reduce_tokens(const PhraseTokens tokens, + } + + /* the following line will be removed in future after code are verified. */ +- assert(0 == num || 1 == num); ++ assert(0 <= num && num <= 3); + + return num; + } +-- +1.8.1.5 + diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD index 9e48633d8..1ec2b0265 100644 --- a/community/libpinyin/PKGBUILD +++ b/community/libpinyin/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 86670 2013-03-21 01:28:41Z fyan $ +# $Id: PKGBUILD 86857 2013-03-23 08:32:34Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Yangtse <yangtsesu@gmail.com> # Contributor: WU Jun <quark at lihdd dot net> pkgname=libpinyin pkgver=0.8.93 -pkgrel=1 -pkgdesc="Library to deal with pinyin." +pkgrel=2 +pkgdesc="Library to deal with pinyin" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/libpinyin/libpinyin" license=('GPL') depends=('db' 'glib2') options=(!libtool) source=("https://github.com/libpinyin/libpinyin/archive/${pkgver}.tar.gz" - "http://downloads.sourceforge.net/libpinyin/model5.text.tar.gz") + "http://downloads.sourceforge.net/libpinyin/model5.text.tar.gz" + "https://github.com/epico/libpinyin/commit/00fec992f5c760f546a1db933fb08325fc9cccbf.patch") noextract=("model5.text.tar.gz") build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../00fec992f5c760f546a1db933fb08325fc9cccbf.patch + cp "${srcdir}/model5.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/" sed -i '/wget.*model5\.text\.tar\.gz/ d' ${srcdir}/${pkgname}-${pkgver}/data/Makefile.am @@ -30,4 +33,5 @@ package() { make DESTDIR="${pkgdir}" install } md5sums=('1d9a768496c8a4368d3488639cadd554' - 'a83812e2d3be5695be54f95d9d7a3aa0') + 'a83812e2d3be5695be54f95d9d7a3aa0' + '2163a85183c36f69d65d19b2bc9e2c9b') |