development/xa: Updated for version 2.3.10.

Signed-off-by: B. Watson <yalhcru@gmail.com>

4 files changed, 13 insertions, 44 deletions

diff --git a/development/xa/dxa-malloc-patch.txt b/development/xa/dxa-malloc-patch.txt
deleted file mode 100644
index 895ac7b454bf..000000000000
--- a/development/xa/dxa-malloc-patch.txt
+++ /dev/null
@@ -1,21 +0,0 @@
---- label.c.orig	2006-11-01 18:23:28.000000000 +0200
-+++ label.c	2010-08-31 21:45:43.000000000 +0300
-@@ -40,7 +40,7 @@
- #include "opcodes.h"
- 
- label *labeltable;
--char defaultlabel[5];
-+char defaultlabel[6];
- unsigned numLabels = 0;
- 
- #ifndef __STDC__
-@@ -55,7 +55,7 @@
-   label *entry;
-   char *buffer;
- 
--  if (!((buffer = malloc (strlen (name)))))
-+  if (!((buffer = malloc (strlen (name) + 1))))
-     return;
- 
-   entry = numLabels ?
-
diff --git a/development/xa/dxa-valgrind-patch.txt b/development/xa/dxa-valgrind-patch.txt
deleted file mode 100644
index 92a5658f69d3..000000000000
--- a/development/xa/dxa-valgrind-patch.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tools/dxa-0.1.3/scan.c b/tools/dxa-0.1.3/scan.c
-index e7855f8..586d31b 100644
---- a/tools/dxa-0.1.3/scan.c
-+++ b/tools/dxa-0.1.3/scan.c
-@@ -597,6 +597,7 @@ int ScanSpecified (void)
-                        (unsigned int)entry->address);
-                return 1;
-        }
-+    entry = FindNextEntryType (NULL, ~0, RTN_SURE);
-     DeleteEntry (entry);
-   }
-
diff --git a/development/xa/xa.SlackBuild b/development/xa/xa.SlackBuild
index 1a0ce5e185fb..ffe7d9fba6e8 100644
--- a/development/xa/xa.SlackBuild
+++ b/development/xa/xa.SlackBuild
@@ -6,6 +6,12 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20191129 bkw:
+# - update for xa-2.3.10 and dxa-0.1.4
+# - remove the patches for dxa, 0.1.4 has all the fixes applied
+# - switch to naptime URLs since upstream breaks download links
+#   every time a new release comes out
+
 # 20170711 bkw:
 # - update for xa-2.3.8
 # - REALLY remove unused *.txt.1 copies of the patches (wtf?)
@@ -18,12 +24,12 @@
 # they were included in the script tarball all along.
 
 PRGNAM=xa
-VERSION=${VERSION:-2.3.8}
+VERSION=${VERSION:-2.3.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 # dxa is a separate distribution with its own version number
-DXAVER=0.1.3
+DXAVER=0.1.4
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -85,10 +91,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 tar xvf $CWD/dxa-$DXAVER.tar.gz
 cd dxa-$DXAVER
 
-# These patches took a minute to figure out how to apply
-patch -l < $CWD/dxa-valgrind-patch.txt
-patch -p0 < $CWD/dxa-malloc-patch.txt
-
 # Can't see a disadvantage to enabling the --long-options
 sed -i "s,-O6,$SLKCFLAGS -DLONG_OPTIONS," Makefile
 
diff --git a/development/xa/xa.info b/development/xa/xa.info
index acc41774b260..0d0565fcfc76 100644
--- a/development/xa/xa.info
+++ b/development/xa/xa.info
@@ -1,10 +1,10 @@
 PRGNAM="xa"
-VERSION="2.3.8"
+VERSION="2.3.10"
 HOMEPAGE="http://www.floodgap.com/retrotech/xa/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/xa-2.3.8.tar.gz \
-          http://ponce.cc/slackware/sources/repo/dxa-0.1.3.tar.gz"
-MD5SUM="884c3dc5bcc8e8f10b05a6907781623d \
-        4fb88a7eda5939472b3a1d1c48b057fc"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/xa-2.3.10.tar.gz \
+          http://urchlay.naptime.net/~urchlay/src/dxa-0.1.4.tar.gz"
+MD5SUM="14265129071922dd964d89599775d13e \
+        3a7993751bcb94e5f9081cc2f27eee1d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""