diff --git a/brise/PKGBUILD b/brise/PKGBUILD index ef7f05eae..9fb7cc05f 100644 --- a/brise/PKGBUILD +++ b/brise/PKGBUILD @@ -1,22 +1,23 @@ pkgname=brise pkgver=0.35 -pkgrel=1 +pkgrel=2 pkgdesc="Rime schema repository" arch=('x86_64') url=" http://rime.im/" license=('GPL3') -makedepends=('cmake' 'librime>=1.0') +depends=() +makedepends=('cmake' 'git' 'librime>=1.2') provides=('librime-data') -conflicts=('librime<0.9.3' 'ibus-rime<0.9.3') -source=("http://dl.bintray.com/lotem/rime/${pkgname}-${pkgver}.tar.gz") -sha512sums=('1a2a3ddba9be7089a1b82ce446a3e5dc93a13fff121f861aa1acbdea950f490c9367866902a056296e17de5076a59a54741ceb3a59a9c0ec58b6b7c54f519f3d') +conflicts=('librime<1.2' 'ibus-rime<1.2') +source=("git+https://github.com/lotem/brise.git#tag=brise-$pkgver") +md5sums=('SKIP') build() { - cd "${srcdir}/$pkgname" + cd $pkgname make } package() { - cd "${srcdir}/$pkgname" + cd $pkgname make DESTDIR="$pkgdir" install } diff --git a/fcitx-rime/PKGBUILD b/fcitx-rime/PKGBUILD index c00dc1d4f..88c02211d 100644 --- a/fcitx-rime/PKGBUILD +++ b/fcitx-rime/PKGBUILD @@ -2,12 +2,12 @@ pkgname=fcitx-rime pkgver=0.3.1 -pkgrel=1 -pkgdesc="Fcitx Wrapper for librime" +pkgrel=2 +pkgdesc='Fcitx Wrapper for librime' arch=('i686' 'x86_64') url="http://code.google.com/p/fcitx" license=('GPL') -depends=('fcitx>=4.2.7' "librime>=1.0" "brise") +depends=('fcitx>=4.2.7' "librime>=1.2" "brise") makedepends=('cmake') source=(http://download.fcitx-im.org/${pkgname}/${pkgname}-${pkgver}.tar.xz) diff --git a/librime/PKGBUILD b/librime/PKGBUILD index 7e7fff466..add70fdbc 100644 --- a/librime/PKGBUILD +++ b/librime/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: 網軍總司令 pkgname=librime -_pkgname=rime -pkgver=1.2 +_basever=1.2.9 +pkgver=1.2.9.cbe2ffc pkgrel=1 pkgdesc="Rime input method engine" arch=('x86_64') @@ -12,19 +12,21 @@ url="http://code.google.com/p/rimeime/" license=('GPL3') depends=('boost-libs' 'google-glog' 'kyotocabinet' 'opencc' 'yaml-cpp>=0.5.0' 'marisa') optdepends=('brise: Rime schema repository') -makedepends=('cmake' 'boost') -source=("https://github.com/lotem/$pkgname/archive/$_pkgname-$pkgver.tar.gz") -md5sums=('bcb249dfaeb84d4a884bcc6a9dae433f') +makedepends=('cmake' 'boost' 'git') +source=("git+https://github.com/rime/librime.git#commit=cbe2ffcbbde147a741b1d03f4f5b4e408f6ccdb8") +sha512sums=('SKIP') + +pkgver() { + cd "$pkgname" + printf "%s.%s" "${_basever}" "$(git rev-parse --short HEAD)" +} build() { - cd "$srcdir/$pkgname-$_pkgname-$pkgver" - mkdir -p build - cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + cd $pkgname make } package() { - cd "$srcdir/$pkgname-$_pkgname-$pkgver" + cd $pkgname make DESTDIR="$pkgdir" install }