From 241326d281bb505e3acd71d7902df2510dbe2cb0 Mon Sep 17 00:00:00 2001 From: Christopher Arndt Date: Thu, 16 May 2019 16:59:55 +0200 Subject: [PATCH] Upstream repository changed and now uses git submodule for waflib Signed-off-by: Christopher Arndt --- .SRCINFO | 8 +++++--- .gitignore | 7 ++++--- PKGBUILD | 15 ++++++++++++--- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 90b4553ca48..fa874b1c20c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = serd-git pkgdesc = A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples - pkgver = 0.30.1.r705.fc6ef04 + pkgver = 0.30.1.r752.d14838c pkgrel = 1 url = http://drobilla.net/software/serd/ install = serd.install @@ -10,10 +10,12 @@ pkgbase = serd-git makedepends = git makedepends = python provides = serd - provides = 0.30.1 + provides = serd=0.30.1 conflicts = serd conflicts = serd-svn - source = serd::git+http://git.drobilla.net/serd.git + source = serd::git+https://gitlab.com/drobilla/serd.git + source = autowaf::git+https://gitlab.com/drobilla/autowaf.git + md5sums = SKIP md5sums = SKIP pkgname = serd-git diff --git a/.gitignore b/.gitignore index 67d1cb0b7da..0851d8e31ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ -serd -src -pkg +autowaf/ +serd/ +src/ +pkg/ serd-git-*.tar.xz serd-git-*.src.tar.gz .AURINFO diff --git a/PKGBUILD b/PKGBUILD index a956cdddf0c..b7223c18879 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=serd pkgname="${_pkgname}-git" -pkgver=0.30.1.r705.fc6ef04 +pkgver=0.30.1.r752.d14838c pkgrel=1 pkgdesc="A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples" arch=('i686' 'x86_64') @@ -12,8 +12,9 @@ makedepends=('git' 'python') conflicts=("${_pkgname}" "${_pkgname}-svn") provides=("${_pkgname}" "${_pkgname}=${pkgver//.r*/}") install="${_pkgname}.install" -source=("$_pkgname::git+http://git.drobilla.net/serd.git") -md5sums=('SKIP') +source=("$_pkgname::git+https://gitlab.com/drobilla/serd.git" + 'autowaf::git+https://gitlab.com/drobilla/autowaf.git') +md5sums=('SKIP' 'SKIP') pkgver() { cd "${srcdir}/${_pkgname}" @@ -22,6 +23,14 @@ pkgver() { echo "$ver.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" } +prepare() { + cd "${srcdir}/${_pkgname}" + + git submodule init + git config submodule.waflib.url "${srcdir}/autowaf" + git submodule update +} + build() { cd "${srcdir}/${_pkgname}"