Re: [PR PATCH] [Updated] [WIP] j: update to 9.5.1.

[Eloitor <Eloitor@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 886 bytes --]

There is an updated pull request by Eloitor against master on the void-packages repository

https://github.com/Eloitor/void-packages j
https://github.com/void-linux/void-packages/pull/47703

[WIP] j: update to 9.5.1.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

Currently build fails with

```
=> j-9.4.3_1: running post-install hook: 11-pkglint-elf-in-usrshare ...
=> ERROR: j-9.4.3_1: ELF files found in /usr/share:
=> ERROR:    /usr/share/j/tools/regex/raspberry/j32/libjpcre2.so
=> ERROR:    /usr/share/j/tools/regex/raspberry/j64/libjpcre2.so
=> ERROR:    /usr/share/j/tools/regex/libjpcre2.so
=> ERROR: j-9.4.3_1: cannot continue with installation!
```


A patch file from https://github.com/void-linux/void-packages/pull/47703.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-j-47703.patch --]
[-- Type: text/x-diff, Size: 3284 bytes --]

From d48d65aa82f54364f92d4c83d29fac53342452d0 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.5.1.

---
 srcpkgs/j/patches/fix-cip.c-includes.patch | 34 ----------------------
 srcpkgs/j/template                         | 22 +++++++-------
 2 files changed, 10 insertions(+), 46 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..63ef4fd99009e 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.5.1
 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=593249894579af87b325833678dfe8a35c937fe344dcc954a0ad0e31f167497a
 
 _jsz="j${XBPS_TARGET_WORDSIZE}"
 _jtype="release"
@@ -125,17 +123,17 @@ JC
 }
 
 do_install() {
-	vmkdir "${_jshare}" 0755
-	vcopy jlibrary/system "${_jshare}"
-	vcopy jlibrary/tools "${_jshare}"
-
 	vmkdir "${_jlib}" 0755
 	vcopy "bin/${_jpl}/*" "${_jlib}"
 
+	vcopy jlibrary/system "${_jlib}"
+	vcopy jlibrary/tools "${_jlib}"
+	vcopy jlibrary/addons "${_jlib}"
+
 	vmkdir "${_jetc}" 0755
 	vinstall "${FILESDIR}/profilex_template.ijs" 644 "${_jetc}"
 	vinstall "jlibrary/bin/profile.ijs.new" 644 "${_jetc}" profile.ijs
 
 	_jconsole_wrapper_script >bin/jc.sh
-	vbin "bin/jc.sh" jc
+	vbin "bin/jc.sh" jconsole
 }