From d9df0cc12548553afc36c77ac146190f1de1de00 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@duck.com>
Date: Mon, 11 Dec 2023 22:32:29 +0100
Subject: [PATCH] j: update to 9.4.3.

---
 srcpkgs/j/patches/fix-cip.c-includes.patch | 34 ----------------------
 srcpkgs/j/template                         | 25 +++++++++-------
 2 files changed, 15 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/j/patches/fix-cip.c-includes.patch

diff --git a/srcpkgs/j/patches/fix-cip.c-includes.patch b/srcpkgs/j/patches/fix-cip.c-includes.patch
deleted file mode 100644
index 7601d17006296..0000000000000
--- a/srcpkgs/j/patches/fix-cip.c-includes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/jsrc/cip.c	2020-01-30 13:31:22.463687182 +0900
-+++ b/jsrc/cip.c	2020-01-30 13:33:47.707458248 +0900
-@@ -3,9 +3,9 @@
- /*                                                                         */
- /* Conjunctions: Inner Product                                             */
- 
--#include "../../jsource/jsrc/j.h"
--#include "../../jsource/jsrc/vasm.h"
--#include "../../jsource/jsrc/gemm.h"
-+#include "j.h"
-+#include "vasm.h"
-+#include "gemm.h"
- 
- #define MAXAROWS 384  // max rows of a that we can process to stay in L2 cache   a strip is m*CACHEHEIGHT, z strip is m*CACHEWIDTH   this is wired to 128*3 - check if you chage
- 
-@@ -1057,15 +1057,15 @@
-  switch(c){
-   case CPLUSDOT:
- #define F |=
--#include "../../jsource/jsrc/cip_t.h"
-+#include "cip_t.h"
-    break;
-   case CSTARDOT:
- #define F &=
--#include "../../jsource/jsrc/cip_t.h"
-+#include "cip_t.h"
-    break;
-   case CNE:
- #define F ^=
--#include "../../jsource/jsrc/cip_t.h"
-+#include "cip_t.h"
-    break;
-  }
-  R z;
diff --git a/srcpkgs/j/template b/srcpkgs/j/template
index 95aa0710684dc..ebce84f0cd88d 100644
--- a/srcpkgs/j/template
+++ b/srcpkgs/j/template
@@ -1,18 +1,16 @@
 # Template file for 'j'
 pkgname=j
-version=901.f
+reverts=901.f_1
+version=9.4.3
 revision=1
-_vmaj="${version%.*}"
-_vmin="${version#${_vmaj}}"
-_vrel=${_vmaj}-release${_vmin:+-}${_vmin#.}
 archs="aarch64* armv[67]* i686* x86_64*"
-makedepends="libedit-devel libgomp-devel"
+makedepends="libedit-devel libgomp-devel nasm"
 short_desc="Modern, high-performance, ASCII-based successor to APL"
 maintainer="B. Wilson <x@wilsonb.com>"
 license="GPL-3.0-or-later"
 homepage="https://jsoftware.com/"
-distfiles="https://github.com/jsoftware/jsource/archive/j${_vrel}.tar.gz"
-checksum=6b1cdcc1a0c3d955e400cf676f115de51ef9d1da495d08721ee999f48f6f9209
+distfiles="https://github.com/jsoftware/jsource/archive/refs/tags/${version}.tar.gz"
+checksum=55098a399e010bd8ae5e74523316959506ff69efa839098dddadd8960f6eaf55
 
 _jsz="j${XBPS_TARGET_WORDSIZE}"
 _jtype="release"
@@ -125,13 +123,20 @@ JC
 }
 
 do_install() {
+	vmkdir "${_jlib}" 0755
+	ls jlibrary/tools/regex
+	vcopy jlibrary/tools/regex/libjpcre2.so "${_jlib}"
+	vcopy jlibrary/tools/regex/raspberry/j32/libjpcre2.so "${_jlib}"
+	vcopy jlibrary/tools/regex/raspberry/j64/libjpcre2.so "${_jlib}"
+	rm jlibrary/tools/regex/libjpcre2.so
+	rm jlibrary/tools/regex/raspberry/j32/libjpcre2.so
+	rm jlibrary/tools/regex/raspberry/j64/libjpcre2.so
+	vcopy "bin/${_jpl}/*" "${_jlib}"
+
 	vmkdir "${_jshare}" 0755
 	vcopy jlibrary/system "${_jshare}"
 	vcopy jlibrary/tools "${_jshare}"
 
-	vmkdir "${_jlib}" 0755
-	vcopy "bin/${_jpl}/*" "${_jlib}"
-
 	vmkdir "${_jetc}" 0755
 	vinstall "${FILESDIR}/profilex_template.ijs" 644 "${_jetc}"
 	vinstall "jlibrary/bin/profile.ijs.new" 644 "${_jetc}" profile.ijs