From 7b40f708e08bd7cf996fa441e3f0f2d8a9723550 Mon Sep 17 00:00:00 2001 From: "atom.long" Date: Wed, 31 May 2017 00:22:24 +0800 Subject: [PATCH] task: (1) get source from github.com (2) fix for build --- task/PKGBUILD | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/task/PKGBUILD b/task/PKGBUILD index d43232e5..dd3f4e3c 100644 --- a/task/PKGBUILD +++ b/task/PKGBUILD @@ -42,26 +42,30 @@ checkdepends=("python" # for tests #source=("http://taskwarrior.org/download/${pkgname}-${pkgver}.tar.gz") #sha256sums=("d87bcee58106eb8a79b850e9abc153d98b79e00d50eade0d63917154984f2a15") -source=("${pkgname}-${pkgver}::git+https://git.tasktools.org/scm/tm/task.git#tag=v${pkgver}") -sha256sums=("SKIP") +source=("${pkgname}-s${pkgver}.tar.gz"::"https://github.com/taskwarrior/${pkgname}/archive/s${pkgver}.tar.gz") +sha256sums=("30a6253aa5de2f339def58150edcf1d7c1a302875f30f9b31160eaaf2303e978") #prepare() { -# pacman -Syu --noconfirm # fix for appveyor old files +# pacman -Syu --noconfirm # fix for appveyor old files #} build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-s${pkgver}" # ls "/usr/include/sys" # pacman -Q msg "Starting cmake..." cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr . + sed -i -r 's/-luuid/-luuid.dll/' src/CMakeFiles/task_executable.dir/link.txt + sed -i -r 's/-luuid/-luuid.dll/' src/CMakeFiles/calc_executable.dir/link.txt + sed -i -r 's/-luuid/-luuid.dll/' src/CMakeFiles/lex_executable.dir/link.txt + msg "Starting make..." make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-s${pkgver}" make DESTDIR=$pkgdir install # Note that we rename the bash completion script for bash-completion > 1.99, until upstream does so. @@ -74,11 +78,11 @@ package() { install -Dm644 "$pkgdir/usr/share/doc/task/scripts/vim/syntax/taskedit.vim" "$pkgdir/usr/share/vim/vimfiles/syntax/taskedit.vim" install -Dm644 "$pkgdir/usr/share/doc/task/scripts/vim/syntax/taskrc.vim" "$pkgdir/usr/share/vim/vimfiles/syntax/taskrc.vim" - install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/task/LICENSE" + install -Dm644 "$srcdir/$pkgname-s$pkgver/LICENSE" "$pkgdir/usr/share/licenses/task/LICENSE" } check() { - cd "${srcdir}/${pkgname}-${pkgver}/test" + cd "${srcdir}/${pkgname}-s${pkgver}/test" msg "Starting make for testing..." make