version 1.8d

3 files changed, 8 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c443824a0bce..1e13436bfa02 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 # Generated by mksrcinfo v8
-# Mon Jul  3 20:51:33 UTC 2017
+# Tue Aug 21 13:55:18 UTC 2018
 pkgbase = vasm
 	pkgdesc = Portable and retargetable 6502 6800 arm c16x jagrisc m68k ppc test tr3200 vidcore x86 z80 assembler.
-	pkgver = 1.8
+	pkgver = 1.8d
 	pkgrel = 1
 	url = http://sun.hasenbraten.de/vasm/
 	arch = i686
 	arch = x86_64
 	license = custom
-	source = http://server.owl.de/~frank/tags/vasm1_8.tar.gz
-	source = patch-cpus_test_cpu.c.patch
-	md5sums = 8ac42c171c84d1460119f28cca601467
-	md5sums = 46a0705ebc82b4290dc73acdcc53fc73
+	source = http://server.owl.de/~frank/tags/vasm1_8d.tar.gz
+	md5sums = 03c2715f4c15330d3fde4b23b02b5c60
 
 pkgname = vasm
 
diff --git a/PKGBUILD b/PKGBUILD
index 683a00587df8..946afd60edca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,18 @@
 #
 # Maintainer: uffe Jakobsen <_uffe_-at-_uffe_-_dot_-_org>
 
-_pkgver="1_8"
+_pkgver="1_8d"
 
 pkgname=vasm
-pkgver=1.8
+pkgver=1.8d
 pkgrel=1
 pkgdesc="Portable and retargetable 6502 6800 arm c16x jagrisc m68k ppc test tr3200 vidcore x86 z80 assembler."
 arch=('i686' 'x86_64')
 url="http://sun.hasenbraten.de/vasm/"
 license=('custom')
 depends=()
-source=(http://server.owl.de/~frank/tags/${pkgname}${_pkgver}.tar.gz
-	patch-cpus_test_cpu.c.patch)
-md5sums=('8ac42c171c84d1460119f28cca601467'
-         '46a0705ebc82b4290dc73acdcc53fc73')
-
+source=(http://server.owl.de/~frank/tags/${pkgname}${_pkgver}.tar.gz)
+md5sums=('03c2715f4c15330d3fde4b23b02b5c60')
 
 CPU_LIST="6502 6800 arm c16x jagrisc m68k ppc test tr3200 vidcore x86 z80"
 SYNTAX_LIST="std madmac mot oldstyle" # test
@@ -26,7 +23,6 @@ OUTPUT_LIST="aout bin elf hunk test tos vobj"
 prepare()
 {
   cd ${srcdir}/${pkgname}
-  patch -p0 -i "${srcdir}/patch-cpus_test_cpu.c.patch"
 }
 
 build()
diff --git a/patch-cpus_test_cpu.c.patch b/patch-cpus_test_cpu.c.patch
deleted file mode 100644
index 91272904f31d..000000000000
--- a/patch-cpus_test_cpu.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpus/test/cpu.c.orig	2017-07-03 22:42:42.091904513 +0200
-+++ cpus/test/cpu.c	2017-07-03 22:46:05.875845459 +0200
-@@ -188,7 +188,7 @@
-   size_t size=instruction_size(p,sec,pc);
-   dblock *db=new_dblock();
-   int c=opt_inst(p,sec,pc);
--  char *d;
-+  unsigned char *d;
-   taddr val;
-   db->size=size;
-   d=db->data=mymalloc(size);