From ac69a53ba42dfff7812e59fe7f6f17fd2f99f7fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 1 Feb 2021 22:42:46 +0700 Subject: [PATCH] fcitx-libpinyin: update to 0.5.4. --- .../patches/libpinyin-2.6.0.patch | 10 ----- srcpkgs/fcitx-libpinyin/template | 40 ++++++++++++------- 2 files changed, 26 insertions(+), 24 deletions(-) delete mode 100644 srcpkgs/fcitx-libpinyin/patches/libpinyin-2.6.0.patch diff --git a/srcpkgs/fcitx-libpinyin/patches/libpinyin-2.6.0.patch b/srcpkgs/fcitx-libpinyin/patches/libpinyin-2.6.0.patch deleted file mode 100644 index 16336702549..00000000000 --- a/srcpkgs/fcitx-libpinyin/patches/libpinyin-2.6.0.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- data/table.conf.orig 2021-01-17 17:32:50.977868321 +0700 -+++ data/table.conf 2021-01-17 17:34:32.055849637 +0700 -@@ -3,6 +3,7 @@ - lambda parameter:0.347121 - - source table format:pinyin -+database format:BerkeleyDB - - default RESERVED NULL NULL NULL NOT_USED - default GB_DICTIONARY gb_char.table gb_char.bin gb_char.dbin SYSTEM_FILE diff --git a/srcpkgs/fcitx-libpinyin/template b/srcpkgs/fcitx-libpinyin/template index 8372dbff322..5cb3d78d6ca 100644 --- a/srcpkgs/fcitx-libpinyin/template +++ b/srcpkgs/fcitx-libpinyin/template @@ -1,18 +1,22 @@ # Template file for 'fcitx-libpinyin' pkgname=fcitx-libpinyin -version=0.5.3 -revision=2 +_mversion=20161206 +version=0.5.4 +revision=1 build_style=cmake -configure_args="-DENABLE_QT=OFF" -hostmakedepends="pkg-config gobject-introspection fcitx libpinyin" +configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_QT=OFF" +hostmakedepends="pkg-config fcitx libpinyin gettext" makedepends="libpinyin-devel fcitx-devel" depends="fcitx" short_desc="Fcitx wrapper for libpinyin" maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://github.com/fcitx/fcitx-libpinyin" -distfiles="https://download.fcitx-im.org/$pkgname/$pkgname-${version}_dict.tar.xz" -checksum=fccd408b9fad8becebf7f736e3309e775d045d6383742892385b69be91f89b4c +distfiles="https://download.fcitx-im.org/$pkgname/$pkgname-${version}.tar.xz + https://download.fcitx-im.org/data/model.text.$_mversion.tar.gz" +checksum="650a846f59a50af5e0ce2e493957885bac59995784bb4e211bf8ad1a83607af3 + 5c7024e5735389c471f54b867eda0d98c5a40a5e5e75333a9febac107508f704" +skip_extraction=model.text.$_mversion.tar.gz if [ "$XBPS_WORDSIZE$XBPS_TARGET_ENDIAN" = "${XBPS_TARGET_WORDSIZE}le" ] then @@ -20,12 +24,20 @@ then hostmakedepends+=" qt5-devel" makedepends+=" libfcitx-qt5-devel qt5-webengine-devel qt5-declarative-devel qt5-webchannel-devel qt5-location-devel" - - fcitx-libpinyin-qt5_package() { - short_desc+=" - Qt5 IM module" - depends="fcitx-libpinyin-${version}_${revision}" - pkg_install() { - vmove usr/lib/fcitx/qt - } - } +else + # Non empty to forbid xbps-src from generating subpackages + # Other developers argue that conditional define _package is bad. + subpackages=" " fi + +post_extract() { + cp $XBPS_SRCDISTDIR/$pkgname-$version/model.text.$_mversion.tar.gz data +} + +fcitx-libpinyin-qt5_package() { + short_desc+=" - Qt5 IM module" + depends="fcitx-libpinyin-${version}_${revision}" + pkg_install() { + vmove usr/lib/fcitx/qt + } +}