Fix apone (checksum changes, use git)

2 files changed, 17 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 413363e9446b..f5c82bd1ec51 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,18 +9,19 @@ pkgbase = chipmachine
 	makedepends = cmake
 	makedepends = ninja
 	makedepends = vim
+	makedepends = git
 	depends = mpg123
 	depends = glew
 	depends = glfw
 	depends = curl
 	source = chipmachine-1.3c.tar.gz::https://github.com/sasq64/chipmachine/archive/v1.3c.tar.gz
-	source = apone.tar.gz::https://github.com/sasq64/apone/archive/d320e07159a35f47cbc81ea45f145c27a976f98c.tar.gz
-	source = chipmachine-two-missing-std-specifiers.patch::https://github.com/sasq64/chipmachine/commit/31181465d5c8ba87efa6450c149dc00acffe0f6d.patch
-	source = chipmachine-fixed-against-latest-apone.patch::https://github.com/sasq64/chipmachine/commit/44ed091a4305b2231595bd7f62c11803eb66aeb7.patch
+	source = chipmachine-1.3c-two-missing-std-specifiers.patch::https://github.com/sasq64/chipmachine/commit/31181465d5c8ba87efa6450c149dc00acffe0f6d.patch
+	source = chipmachine-1.3c-fixed-against-latest-apone.patch::https://github.com/sasq64/chipmachine/commit/44ed091a4305b2231595bd7f62c11803eb66aeb7.patch
+	source = git+https://github.com/sasq64/apone.git#commit=d320e07159a35f47cbc81ea45f145c27a976f98c
 	sha256sums = fe83080035a6ba23917a79b9133e29b2b934e7711fb21e8039eff3a9411fd354
-	sha256sums = fc9e60c3b57065ec0b65dff649aa4bd4212e3ec8c496326be63d9cf5fe427499
 	sha256sums = 7dc76d37e016a5109efb471b30b3c46246ea231ad3cd6e45bd8a6a438cccfd44
 	sha256sums = 531db4559b7cb57e20409e26d500aa82dc8e6c03aa437547affdd88c5cb03997
+	sha256sums = SKIP
 
 pkgname = chipmachine
 
diff --git a/PKGBUILD b/PKGBUILD
index 810c34551e3f..e7e7d9cacc2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,6 @@
 # Maintainer: Michael Straube <straubem@gmx.de>
 # Contributor: Sebastian Wolf <fatmike303 at googlemail dot com>
 
-_aponecommit=d320e07159a35f47cbc81ea45f145c27a976f98c
-_patchcommit1=31181465d5c8ba87efa6450c149dc00acffe0f6d
-_patchcommit2=44ed091a4305b2231595bd7f62c11803eb66aeb7
-
 pkgname=chipmachine
 pkgver=1.3c
 pkgrel=1
@@ -13,27 +9,29 @@ arch=('i686' 'x86_64')
 url='https://github.com/sasq64/chipmachine'
 license=('MIT')
 depends=('mpg123' 'glew' 'glfw' 'curl')
-makedepends=('cmake' 'ninja' 'vim')
+makedepends=('cmake' 'ninja' 'vim' 'git')
+_aponecommit=d320e07159a35f47cbc81ea45f145c27a976f98c
+_patch1commit=31181465d5c8ba87efa6450c149dc00acffe0f6d
+_patch2commit=44ed091a4305b2231595bd7f62c11803eb66aeb7
 source=("$pkgname-$pkgver.tar.gz::https://github.com/sasq64/$pkgname/archive/v$pkgver.tar.gz"
-        "apone.tar.gz::https://github.com/sasq64/apone/archive/$_aponecommit.tar.gz"
-        "$pkgname-two-missing-std-specifiers.patch::https://github.com/sasq64/$pkgname/commit/$_patchcommit1.patch"
-        "$pkgname-fixed-against-latest-apone.patch::https://github.com/sasq64/$pkgname/commit/$_patchcommit2.patch")
+        "$pkgname-1.3c-two-missing-std-specifiers.patch::https://github.com/sasq64/$pkgname/commit/$_patch1commit.patch"
+        "$pkgname-1.3c-fixed-against-latest-apone.patch::https://github.com/sasq64/$pkgname/commit/$_patch2commit.patch"
+        "git+https://github.com/sasq64/apone.git#commit=$_aponecommit")
 sha256sums=('fe83080035a6ba23917a79b9133e29b2b934e7711fb21e8039eff3a9411fd354'
-            'fc9e60c3b57065ec0b65dff649aa4bd4212e3ec8c496326be63d9cf5fe427499'
             '7dc76d37e016a5109efb471b30b3c46246ea231ad3cd6e45bd8a6a438cccfd44'
-            '531db4559b7cb57e20409e26d500aa82dc8e6c03aa437547affdd88c5cb03997')
+            '531db4559b7cb57e20409e26d500aa82dc8e6c03aa437547affdd88c5cb03997'
+            'SKIP')
 
 prepare() {
   cd $pkgname-$pkgver
 
   # https://github.com/sasq64/chipmachine/commit/3118146
-  patch -p1 -i ../chipmachine-two-missing-std-specifiers.patch
+  patch -p1 -i ../chipmachine-1.3c-two-missing-std-specifiers.patch
 
   # https://github.com/sasq64/chipmachine/commit/44ed091
-  patch -p1 -i ../chipmachine-fixed-against-latest-apone.patch
+  patch -p1 -i ../chipmachine-1.3c-fixed-against-latest-apone.patch
 
-  ln -s "$srcdir"/apone-$_aponecommit ../apone
-  mkdir ../build
+  mkdir -p ../build
 }
 
 build() {