From 5ee1e0dd86329b4587c06a307984c28be82d8563 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 21 Feb 2019 13:57:31 +0100 Subject: alpine: use patch instead of git cherry-pick --- alpine/PKGBUILD | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'alpine/PKGBUILD') diff --git a/alpine/PKGBUILD b/alpine/PKGBUILD index 2eaebfeef..2ef8189ed 100644 --- a/alpine/PKGBUILD +++ b/alpine/PKGBUILD @@ -6,7 +6,7 @@ pkgname=alpine pkgver=2.21.999.r71.08fcd1b _commit=${pkgver##*.} -pkgrel=1 +pkgrel=2 arch=("i686" "x86_64") pkgdesc="Apache licensed PINE mail user agent" url="http://alpine.freeiz.com" @@ -20,12 +20,16 @@ provides=("pine") conflicts=("pine" "re-alpine") replaces=("pine") options=("!makeflags") -source=("alpine::git+https://git.eckner.net/Erich/alpine#commit=${_commit}") -sha512sums=('SKIP') +source=( + "alpine::git+https://git.eckner.net/Erich/alpine#commit=${_commit}" + 'topal-patch.patch' +) +sha512sums=('SKIP' + 'bc7a3143cb2f7d79438c49b89bfdc52db7473521a7870ad621ecba96fff2f1688f4f3d58def9b8d57f8beba4e1e9c8b193f9281571e0564538ca7c7db16f0027') prepare() { cd "${srcdir}/${pkgname}" - git cherry-pick origin/topal-patch^ origin/topal-patch + patch -p1 -i "${srcdir}/topal-patch.patch" } pkgver() { -- cgit v1.2.3-70-g09d2