diff --git a/.SRCINFO b/.SRCINFO index 8525e2ff4cf1..0aecbf4e1d19 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = direwolf-git pkgdesc = Software modem/TNC and APRS encoder/decoder - pkgver = 1.7.dev.A.r70.gc25629a + pkgver = 1.7.dev.A.r111.gba0313c pkgrel = 1 url = https://github.com/wb2osz/direwolf arch = i686 @@ -19,11 +19,14 @@ pkgbase = direwolf-git source = git+https://github.com/wb2osz/direwolf.git#branch=dev source = direwolf.service source = direwolf-kiss.service + source = https://patch-diff.githubusercontent.com/raw/wb2osz/direwolf/pull/487.patch sha1sums = SKIP sha1sums = 66366c7a4e8d3768013f9036f2681a86d4b8ad88 sha1sums = eea3a3fb334645cd8a1e2604dc6c6b024148722a + sha1sums = 0934a4d695c2ab7c3ee3a396655f7f762f5fe8ca sha256sums = SKIP sha256sums = a1efe2bb96470bc52faa747708b195a685dc454f3d9c91f6bf4d39ab94d3608a sha256sums = 2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68 + sha256sums = 7bc0722cb0db9eaccd30af075ec9f5267e4c1850f38d79a718313e322d9ed070 pkgname = direwolf-git diff --git a/PKGBUILD b/PKGBUILD index 1428f3200947..570bf89d8561 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexander Fasching pkgname=direwolf-git _pkgname=direwolf -pkgver=1.7.dev.A.r70.gc25629a +pkgver=1.7.dev.A.r111.gba0313c pkgrel=1 pkgdesc="Software modem/TNC and APRS encoder/decoder" arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') @@ -14,25 +14,27 @@ provides=('direwolf') conflicts=('direwolf') source=('git+https://github.com/wb2osz/direwolf.git#branch=dev' 'direwolf.service' - 'direwolf-kiss.service') -# 'gpsd-version.patch') + 'direwolf-kiss.service' + 'https://patch-diff.githubusercontent.com/raw/wb2osz/direwolf/pull/487.patch') sha1sums=('SKIP' '66366c7a4e8d3768013f9036f2681a86d4b8ad88' - 'eea3a3fb334645cd8a1e2604dc6c6b024148722a') -# '2853da5d0e00f9603a8dc5fd78cf9837158c303e') + 'eea3a3fb334645cd8a1e2604dc6c6b024148722a' + '0934a4d695c2ab7c3ee3a396655f7f762f5fe8ca') sha256sums=('SKIP' 'a1efe2bb96470bc52faa747708b195a685dc454f3d9c91f6bf4d39ab94d3608a' - '2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68') -# '57e7eea1b355fd4e8a0ea984c74cfa4f9c9a990b03df9ee8c17dfc13d925a67c') + '2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68' + '7bc0722cb0db9eaccd30af075ec9f5267e4c1850f38d79a718313e322d9ed070') pkgver() { cd "$_pkgname" git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } -#prepare() { -# patch --directory="$_pkgname" --forward --strip=1 --input="${srcdir}/gpsd-version.patch" -#} +prepare() { + #patch --directory="$_pkgname" --forward --strip=1 --input="${srcdir}/gpsd-version.patch" + cd "$_pkgname" + git apply "${srcdir}"/487.patch +} build() { cd "$_pkgname"