update to v2.55

Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>

3 files changed, 15 insertions, 86 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e4836b6dd4ba..abee14316da0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
 pkgbase = uasm
 	pkgdesc = A free MASM-compatible assembler based on JWasm
-	pkgver = 2.52.r1.c612f83d97
-	pkgrel = 3
+	pkgver = 2.55
+	pkgrel = 1
 	url = http://www.terraspace.co.uk/uasm.html
 	arch = x86_64
 	license = custom:JWasm License
 	license = custom:Sybase Open Watcom Public License
-	source = uasm-2.52.r1.c612f83d97.tar.gz::https://github.com/Terraspace/UASM/archive/c612f83d97a0cb192dfd983676743dabf662ed51.tar.gz
+	source = uasm-2.55.tar.gz::https://github.com/Terraspace/UASM/archive/refs/tags/v2.55.tar.gz
 	source = uasm-nocolor
-	source = dbgcv.patch
-	sha256sums = e9d610360eb1e03be44261e1ae3c2286745e16976a285a402431ed54b36ccd24
+	sha256sums = ae0df97bedd0d3e74e9731ea27d73978b1914aae792d913a3c9029a4d5890192
 	sha256sums = 19ea1744abea546768544c5d12afbb6a3f86946c002f092871a6c9876ac1fbb5
-	sha256sums = df32228b7258abc8c3462601fcced228a5137e7ebc761863eb15edea240dc322
 
 pkgname = uasm
diff --git a/PKGBUILD b/PKGBUILD
index 8bc5f57a478c..d99195c78036 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,21 @@
 # Maintainer: Oleksandr Natalenko <oleksandr@natalenko.name>
-# Maintainer: Darren Ng <$(base64 --decode <<<VW4xR2ZuQGdtYWlsLmNvbQo=)>
-# Maintainer: Dan Bryant <$(base64 --decode <<<VanVzdGRhbjk2QGdtYWlsLmNvbQo=)>
+# Contributor: Darren Ng <$(base64 --decode <<<VW4xR2ZuQGdtYWlsLmNvbQo=)>
+# Contributor: Dan Bryant <$(base64 --decode <<<VanVzdGRhbjk2QGdtYWlsLmNvbQo=)>
 
 pkgname=uasm
 pkgdesc="A free MASM-compatible assembler based on JWasm"
 url=http://www.terraspace.co.uk/uasm.html
-_rel=1
-_rev=c612f83d97a0cb192dfd983676743dabf662ed51
-pkgver=2.52.r${_rel}.${_rev:0:10}
-pkgrel=3
+pkgver=2.55
+pkgrel=1
 arch=(x86_64)
 license=("custom:JWasm License" "custom:Sybase Open Watcom Public License")
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/Terraspace/UASM/archive/${_rev}.tar.gz
-		uasm-nocolor
-		dbgcv.patch)
-sha256sums=('e9d610360eb1e03be44261e1ae3c2286745e16976a285a402431ed54b36ccd24'
-            '19ea1744abea546768544c5d12afbb6a3f86946c002f092871a6c9876ac1fbb5'
-            'df32228b7258abc8c3462601fcced228a5137e7ebc761863eb15edea240dc322')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/Terraspace/UASM/archive/refs/tags/v${pkgver}.tar.gz
+		uasm-nocolor)
+sha256sums=('ae0df97bedd0d3e74e9731ea27d73978b1914aae792d913a3c9029a4d5890192'
+            '19ea1744abea546768544c5d12afbb6a3f86946c002f092871a6c9876ac1fbb5')
 
 prepare() {
-	cd UASM-${_rev}
-
-	# fix `dbgcv.c:*:*: fatal error: direct.h: No such file or directory`
-	patch -Np1 -i ../dbgcv.patch
-
-	# fix #151
-	sed -i 's|#ifndef _TYPES_H_INCLUDED|#ifndef _TYPES_H_INCLUDED_|g' H/types.h
+	cd UASM-${pkgver}
 
 	# enforce full RELRO
 	sed -i 's|-Wl,-Map,$(OUTD)/$(TARGET1).map$|-Wl,-Map,$(OUTD)/$(TARGET1).map -Wl,-z,now|g' gccLinux64.mak
@@ -35,13 +25,13 @@ prepare() {
 }
 
 build() {
-	cd UASM-${_rev}
+	cd UASM-${pkgver}
 
 	make -f gccLinux64.mak
 }
 
 package() {
-	cd UASM-${_rev}
+	cd UASM-${pkgver}
 
 	install -Dt "${pkgdir}"/usr/bin -m0755 GccUnixR/uasm ../uasm-nocolor
 	install -Dt "${pkgdir}"/usr/share/doc/${pkgname} -m0644 {Readme,History}.txt Doc/*
diff --git a/dbgcv.patch b/dbgcv.patch
deleted file mode 100644
index c523cd65e9e2..000000000000
--- a/dbgcv.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff '--color=auto' -Naur UASM-c612f83d97a0cb192dfd983676743dabf662ed51~/dbgcv.c UASM-c612f83d97a0cb192dfd983676743dabf662ed51/dbgcv.c
---- UASM-c612f83d97a0cb192dfd983676743dabf662ed51~/dbgcv.c	2021-04-02 17:57:14.000000000 +0200
-+++ UASM-c612f83d97a0cb192dfd983676743dabf662ed51/dbgcv.c	2021-07-20 14:31:39.634571179 +0200
-@@ -17,7 +17,24 @@
- #include <fixup.h>
- #include <dbgcv.h>
- #include <linnum.h>
-+#ifdef _WIN32
- #include <direct.h>
-+#endif
-+#ifdef __UNIX__
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <limits.h>
-+#endif
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+#define _MAX_PATH PATH_MAX
-+#ifndef _getcwd
-+#define _getcwd getcwd
-+#endif
-+#ifndef _pgmptr
-+#define _pgmptr "uasm"
-+#endif
- #include <picohash.h>
- 
- #define SIZE_CV_SEGBUF ( MAX_LINE_LEN * 4 )
-@@ -1252,7 +1269,9 @@
- #define USEMD5
- 
- #ifdef USEMD5
-+#ifndef BUFSIZ
- #define BUFSIZ 1024*4
-+#endif
- #define MD5_LENGTH ( sizeof( uint_32 ) + sizeof( uint_16 ) + 16 + sizeof( uint_16 ) )
- 
- static int calc_md5(const char* filename, unsigned char* sum)
-@@ -1575,12 +1594,20 @@
- 		len = strlen(p) + 1;
- 		s = strcpy(s, p) + len;
- 		*s++ = '\0';
-+		#ifdef _WIN32
- 		EnvBlock->reclen = (unsigned short)(s - cv.ps - 2);
-+		#else
-+		EnvBlock->reclen = (unsigned short)(s - (char*)cv.ps - 2);
-+		#endif
- 		cv.ps = s;
- 
- 		/* length needs to be added for each symbol */
- 
-+		#ifdef _WIN32
- 		cv.section->length += (s - start);
-+		#else
-+		cv.section->length += (s - (char*)start);
-+		#endif
- 
- 	}
- 	else {