* [PR PATCH] New package: retroforth-2024.1
@ 2024-10-29 14:38 Eloitor
2024-10-29 14:43 ` [PR PATCH] [Updated] " Eloitor
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Eloitor @ 2024-10-29 14:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 668 bytes --]
There is a new pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages retroforth
https://github.com/void-linux/void-packages/pull/52837
New package: retroforth-2024.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/52837.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroforth-52837.patch --]
[-- Type: text/x-diff, Size: 1642 bytes --]
From a5a9562d4c4943c9d14f2cb0fe06fe03965653ad Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Tue, 29 Oct 2024 15:37:33 +0100
Subject: [PATCH] New package: retroforth-2024.1
---
srcpkgs/retroforth/patches/mandir.patch | 12 ++++++++++++
srcpkgs/retroforth/template | 11 +++++++++++
2 files changed, 23 insertions(+)
create mode 100644 srcpkgs/retroforth/patches/mandir.patch
create mode 100644 srcpkgs/retroforth/template
diff --git a/srcpkgs/retroforth/patches/mandir.patch b/srcpkgs/retroforth/patches/mandir.patch
new file mode 100644
index 00000000000000..34bad96492ffb7
--- /dev/null
+++ b/srcpkgs/retroforth/patches/mandir.patch
@@ -0,0 +1,12 @@
+--- a/Configuration.mk
++++ b/Configuration.mk
+@@ -13,7 +13,7 @@ PREFIX ?= /usr/local
+ DATADIR ?= $(PREFIX)/share/RETRO12
+ DOCSDIR ?= $(PREFIX)/share/doc/RETRO12
+ EXAMPLESDIR ?= $(PREFIX)/share/examples/RETRO12
+-MANDIR ?= $(PREFIX)/man/man1
++MANDIR ?= $(PREFIX)/share/man/man1
+
+ # -------------------------------------------------------------
+
+
diff --git a/srcpkgs/retroforth/template b/srcpkgs/retroforth/template
new file mode 100644
index 00000000000000..424a01c235a36a
--- /dev/null
+++ b/srcpkgs/retroforth/template
@@ -0,0 +1,11 @@
+# Template file for 'retroforth'
+pkgname=retroforth
+version=2024.1
+revision=1
+build_style=gnu-makefile
+short_desc="modern, pragmatic Forth"
+maintainer="Eloi Torrents <eloitor@duck.com>"
+license="Custom:ISC-like"
+homepage="https://retroforth.org/"
+distfiles="https://retroforth.org/r/RETRO12-${version}.tar.gz"
+checksum=0058e50fea10ce60ce0fe39da75380d00f7832664cf9572aa55dd59b6eb3eec6
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] New package: retroforth-2024.1
2024-10-29 14:38 [PR PATCH] New package: retroforth-2024.1 Eloitor
@ 2024-10-29 14:43 ` Eloitor
2024-10-29 15:06 ` Eloitor
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Eloitor @ 2024-10-29 14:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 673 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages retroforth
https://github.com/void-linux/void-packages/pull/52837
New package: retroforth-2024.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/52837.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroforth-52837.patch --]
[-- Type: text/x-diff, Size: 1688 bytes --]
From c87819cf92c45060f9ab1868c2e82b40bc3a4613 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Tue, 29 Oct 2024 15:37:33 +0100
Subject: [PATCH] New package: retroforth-2024.1
---
srcpkgs/retroforth/patches/mandir.patch | 12 ++++++++++++
srcpkgs/retroforth/template | 15 +++++++++++++++
2 files changed, 27 insertions(+)
create mode 100644 srcpkgs/retroforth/patches/mandir.patch
create mode 100644 srcpkgs/retroforth/template
diff --git a/srcpkgs/retroforth/patches/mandir.patch b/srcpkgs/retroforth/patches/mandir.patch
new file mode 100644
index 00000000000000..34bad96492ffb7
--- /dev/null
+++ b/srcpkgs/retroforth/patches/mandir.patch
@@ -0,0 +1,12 @@
+--- a/Configuration.mk
++++ b/Configuration.mk
+@@ -13,7 +13,7 @@ PREFIX ?= /usr/local
+ DATADIR ?= $(PREFIX)/share/RETRO12
+ DOCSDIR ?= $(PREFIX)/share/doc/RETRO12
+ EXAMPLESDIR ?= $(PREFIX)/share/examples/RETRO12
+-MANDIR ?= $(PREFIX)/man/man1
++MANDIR ?= $(PREFIX)/share/man/man1
+
+ # -------------------------------------------------------------
+
+
diff --git a/srcpkgs/retroforth/template b/srcpkgs/retroforth/template
new file mode 100644
index 00000000000000..e66bcccd0be75e
--- /dev/null
+++ b/srcpkgs/retroforth/template
@@ -0,0 +1,15 @@
+# Template file for 'retroforth'
+pkgname=retroforth
+version=2024.1
+revision=1
+build_style=gnu-makefile
+short_desc="Modern, pragmatic Forth"
+maintainer="Eloi Torrents <eloitor@duck.com>"
+license="custom:ISC-like"
+homepage="https://retroforth.org/"
+distfiles="https://retroforth.org/r/RETRO12-${version}.tar.gz"
+checksum=0058e50fea10ce60ce0fe39da75380d00f7832664cf9572aa55dd59b6eb3eec6
+
+post_install() {
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] New package: retroforth-2024.1
2024-10-29 14:38 [PR PATCH] New package: retroforth-2024.1 Eloitor
2024-10-29 14:43 ` [PR PATCH] [Updated] " Eloitor
@ 2024-10-29 15:06 ` Eloitor
2024-10-30 15:26 ` [PR PATCH] [Updated] [WIP] " Eloitor
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Eloitor @ 2024-10-29 15:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 673 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages retroforth
https://github.com/void-linux/void-packages/pull/52837
New package: retroforth-2024.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/52837.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroforth-52837.patch --]
[-- Type: text/x-diff, Size: 2427 bytes --]
From fa1a35e780e523d325c09f6291cd05354db5b369 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Tue, 29 Oct 2024 15:37:33 +0100
Subject: [PATCH] New package: retroforth-2024.1
---
srcpkgs/retroforth/patches/cross.patch | 12 ++++++++++++
srcpkgs/retroforth/patches/mandir.patch | 12 ++++++++++++
srcpkgs/retroforth/template | 15 +++++++++++++++
3 files changed, 39 insertions(+)
create mode 100644 srcpkgs/retroforth/patches/cross.patch
create mode 100644 srcpkgs/retroforth/patches/mandir.patch
create mode 100644 srcpkgs/retroforth/template
diff --git a/srcpkgs/retroforth/patches/cross.patch b/srcpkgs/retroforth/patches/cross.patch
new file mode 100644
index 00000000000000..0a60ba8027015e
--- /dev/null
+++ b/srcpkgs/retroforth/patches/cross.patch
@@ -0,0 +1,12 @@
+--- a/Configuration.mk
++++ b/Configuration.mk
+@@ -94,7 +94,7 @@ DEVICES += interface/library.retro
+ # -------------------------------------------------------------
+
+ GLOSSARY ?= ./bin/retro tools/glossary.retro
+-ASSEMBLE ?= ./bin/retro-muri
++ASSEMBLE ?= ./tools/retro-muri/retro-muri.py
+ EXTEND ?= ./bin/retro-extend
+ EXPORT ?= ./bin/retro-embedimage
+ RETRO ?= ./bin/retro
+
diff --git a/srcpkgs/retroforth/patches/mandir.patch b/srcpkgs/retroforth/patches/mandir.patch
new file mode 100644
index 00000000000000..34bad96492ffb7
--- /dev/null
+++ b/srcpkgs/retroforth/patches/mandir.patch
@@ -0,0 +1,12 @@
+--- a/Configuration.mk
++++ b/Configuration.mk
+@@ -13,7 +13,7 @@ PREFIX ?= /usr/local
+ DATADIR ?= $(PREFIX)/share/RETRO12
+ DOCSDIR ?= $(PREFIX)/share/doc/RETRO12
+ EXAMPLESDIR ?= $(PREFIX)/share/examples/RETRO12
+-MANDIR ?= $(PREFIX)/man/man1
++MANDIR ?= $(PREFIX)/share/man/man1
+
+ # -------------------------------------------------------------
+
+
diff --git a/srcpkgs/retroforth/template b/srcpkgs/retroforth/template
new file mode 100644
index 00000000000000..e66bcccd0be75e
--- /dev/null
+++ b/srcpkgs/retroforth/template
@@ -0,0 +1,15 @@
+# Template file for 'retroforth'
+pkgname=retroforth
+version=2024.1
+revision=1
+build_style=gnu-makefile
+short_desc="Modern, pragmatic Forth"
+maintainer="Eloi Torrents <eloitor@duck.com>"
+license="custom:ISC-like"
+homepage="https://retroforth.org/"
+distfiles="https://retroforth.org/r/RETRO12-${version}.tar.gz"
+checksum=0058e50fea10ce60ce0fe39da75380d00f7832664cf9572aa55dd59b6eb3eec6
+
+post_install() {
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] New package: retroforth-2024.1
2024-10-29 14:38 [PR PATCH] New package: retroforth-2024.1 Eloitor
2024-10-29 14:43 ` [PR PATCH] [Updated] " Eloitor
2024-10-29 15:06 ` Eloitor
@ 2024-10-30 15:26 ` Eloitor
2024-10-30 15:30 ` Eloitor
2024-10-30 15:39 ` Eloitor
4 siblings, 0 replies; 6+ messages in thread
From: Eloitor @ 2024-10-30 15:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 679 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages retroforth
https://github.com/void-linux/void-packages/pull/52837
[WIP] New package: retroforth-2024.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/52837.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroforth-52837.patch --]
[-- Type: text/x-diff, Size: 4174 bytes --]
From 089ae059c279e55b673f0bccf97bf881ace9579e Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Tue, 29 Oct 2024 15:37:33 +0100
Subject: [PATCH] New package: retroforth-2024.1
---
srcpkgs/retroforth/patches/mandir.patch | 12 ++++
srcpkgs/retroforth/patches/python-tools.patch | 66 +++++++++++++++++++
srcpkgs/retroforth/template | 16 +++++
3 files changed, 94 insertions(+)
create mode 100644 srcpkgs/retroforth/patches/mandir.patch
create mode 100644 srcpkgs/retroforth/patches/python-tools.patch
create mode 100644 srcpkgs/retroforth/template
diff --git a/srcpkgs/retroforth/patches/mandir.patch b/srcpkgs/retroforth/patches/mandir.patch
new file mode 100644
index 00000000000000..34bad96492ffb7
--- /dev/null
+++ b/srcpkgs/retroforth/patches/mandir.patch
@@ -0,0 +1,12 @@
+--- a/Configuration.mk
++++ b/Configuration.mk
+@@ -13,7 +13,7 @@ PREFIX ?= /usr/local
+ DATADIR ?= $(PREFIX)/share/RETRO12
+ DOCSDIR ?= $(PREFIX)/share/doc/RETRO12
+ EXAMPLESDIR ?= $(PREFIX)/share/examples/RETRO12
+-MANDIR ?= $(PREFIX)/man/man1
++MANDIR ?= $(PREFIX)/share/man/man1
+
+ # -------------------------------------------------------------
+
+
diff --git a/srcpkgs/retroforth/patches/python-tools.patch b/srcpkgs/retroforth/patches/python-tools.patch
new file mode 100644
index 00000000000000..1b7f2cd32aee4b
--- /dev/null
+++ b/srcpkgs/retroforth/patches/python-tools.patch
@@ -0,0 +1,66 @@
+diff --git a/Configuration.mk b/Configuration.mk
+index adac510..98575ae 100644
+--- a/Configuration.mk
++++ b/Configuration.mk
+@@ -29,7 +29,7 @@ LIBDL ?=
+
+ OPTIONS ?=
+ OPTIONS += -DUSE_UTF32
+-OPTIONS += -DBIT64
++#OPTIONS += -DBIT64
+
+ # This helps improve performance on some systems.
+
+@@ -94,8 +94,8 @@ DEVICES += interface/library.retro
+ # -------------------------------------------------------------
+
+ GLOSSARY ?= ./bin/retro tools/glossary.retro
+-ASSEMBLE ?= ./bin/retro-muri
+-EXTEND ?= ./bin/retro-extend
++ASSEMBLE ?= ./tools/retro-muri.py
++EXTEND ?= ./tools/retro-extend.py
+ EXPORT ?= ./bin/retro-embedimage
+ RETRO ?= ./bin/retro
+
+diff --git a/tools/retro-extend.py b/tools/retro-extend.py
+index 1de8362..48e7149 100755
+--- a/tools/retro-extend.py
++++ b/tools/retro-extend.py
+@@ -353,7 +353,7 @@ class Retro:
+ Dictionary = dict()
+ header = self.memory[2]
+ while header != 0:
+- named = self.extract_string(header + 4)
++ named = self.extract_string(header + 5)
+ if not named in Dictionary:
+ Dictionary[named] = header
+ header = self.memory[header]
+@@ -366,7 +366,7 @@ class Retro:
+ header = self.memory[2]
+ Done = False
+ while header != 0 and not Done:
+- if named == self.extract_string(header + 4):
++ if named == self.extract_string(header + 5):
+ self.Dictionary[named] = header
+ Done = True
+ else:
+diff --git a/tools/retro-muri.py b/tools/retro-muri.py
+index c66b4d4..87d763d 100755
+--- a/tools/retro-muri.py
++++ b/tools/retro-muri.py
+@@ -137,13 +137,13 @@ def pass2():
+ def save(filename):
+ with open(filename, "wb") as file:
+ j = 0
+- while j < 1024:
++ while j < 1024 * 8:
+ file.write(struct.pack("i", image[j]))
+ j = j + 1
+
+
+ if __name__ == "__main__":
+- image.extend([0] * 1024)
++ image.extend([0] * 1024 * 8)
+ pass1()
+ pass2()
+ save("ngaImage")
diff --git a/srcpkgs/retroforth/template b/srcpkgs/retroforth/template
new file mode 100644
index 00000000000000..6a1c656a6a2a9c
--- /dev/null
+++ b/srcpkgs/retroforth/template
@@ -0,0 +1,16 @@
+# Template file for 'retroforth'
+pkgname=retroforth
+version=2024.1
+revision=1
+build_style=gnu-makefile
+hostmakedepends="python3"
+short_desc="Modern, pragmatic Forth"
+maintainer="Eloi Torrents <eloitor@duck.com>"
+license="custom:ISC-like"
+homepage="https://retroforth.org/"
+distfiles="https://retroforth.org/r/RETRO12-${version}.tar.gz"
+checksum=0058e50fea10ce60ce0fe39da75380d00f7832664cf9572aa55dd59b6eb3eec6
+
+post_install() {
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] New package: retroforth-2024.1
2024-10-29 14:38 [PR PATCH] New package: retroforth-2024.1 Eloitor
` (2 preceding siblings ...)
2024-10-30 15:26 ` [PR PATCH] [Updated] [WIP] " Eloitor
@ 2024-10-30 15:30 ` Eloitor
2024-10-30 15:39 ` Eloitor
4 siblings, 0 replies; 6+ messages in thread
From: Eloitor @ 2024-10-30 15:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 679 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages retroforth
https://github.com/void-linux/void-packages/pull/52837
[WIP] New package: retroforth-2024.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/52837.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroforth-52837.patch --]
[-- Type: text/x-diff, Size: 5056 bytes --]
From 9ac6424cf99d6730e3fc120499ee4cdc1d619793 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Tue, 29 Oct 2024 15:37:33 +0100
Subject: [PATCH] New package: retroforth-2024.1
---
.../patches/cross-gnumakefile.patch | 15 +++++
srcpkgs/retroforth/patches/mandir.patch | 12 ++++
srcpkgs/retroforth/patches/python-tools.patch | 66 +++++++++++++++++++
srcpkgs/retroforth/template | 16 +++++
4 files changed, 109 insertions(+)
create mode 100644 srcpkgs/retroforth/patches/cross-gnumakefile.patch
create mode 100644 srcpkgs/retroforth/patches/mandir.patch
create mode 100644 srcpkgs/retroforth/patches/python-tools.patch
create mode 100644 srcpkgs/retroforth/template
diff --git a/srcpkgs/retroforth/patches/cross-gnumakefile.patch b/srcpkgs/retroforth/patches/cross-gnumakefile.patch
new file mode 100644
index 00000000000000..730650ff5cfa52
--- /dev/null
+++ b/srcpkgs/retroforth/patches/cross-gnumakefile.patch
@@ -0,0 +1,15 @@
+diff --git a/GNUmakefile b/GNUmakefile
+index 93bd983..d1198c9 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -113,8 +113,8 @@ bin/retro-unu: tools/retro-unu.c
+ # basic image target
+
+ ngaImage: image/retro.muri image/retro.forth bin/retro-muri bin/retro-extend
+- ./bin/retro-muri image/retro.muri
+- ./bin/retro-extend ngaImage image/retro.forth image/build.retro
++ @$(ASSEMBLE) image/retro.muri
++ @$(EXTEND) ngaImage image/retro.forth image/build.retro
+
+ # minimal system
+
diff --git a/srcpkgs/retroforth/patches/mandir.patch b/srcpkgs/retroforth/patches/mandir.patch
new file mode 100644
index 00000000000000..34bad96492ffb7
--- /dev/null
+++ b/srcpkgs/retroforth/patches/mandir.patch
@@ -0,0 +1,12 @@
+--- a/Configuration.mk
++++ b/Configuration.mk
+@@ -13,7 +13,7 @@ PREFIX ?= /usr/local
+ DATADIR ?= $(PREFIX)/share/RETRO12
+ DOCSDIR ?= $(PREFIX)/share/doc/RETRO12
+ EXAMPLESDIR ?= $(PREFIX)/share/examples/RETRO12
+-MANDIR ?= $(PREFIX)/man/man1
++MANDIR ?= $(PREFIX)/share/man/man1
+
+ # -------------------------------------------------------------
+
+
diff --git a/srcpkgs/retroforth/patches/python-tools.patch b/srcpkgs/retroforth/patches/python-tools.patch
new file mode 100644
index 00000000000000..1b7f2cd32aee4b
--- /dev/null
+++ b/srcpkgs/retroforth/patches/python-tools.patch
@@ -0,0 +1,66 @@
+diff --git a/Configuration.mk b/Configuration.mk
+index adac510..98575ae 100644
+--- a/Configuration.mk
++++ b/Configuration.mk
+@@ -29,7 +29,7 @@ LIBDL ?=
+
+ OPTIONS ?=
+ OPTIONS += -DUSE_UTF32
+-OPTIONS += -DBIT64
++#OPTIONS += -DBIT64
+
+ # This helps improve performance on some systems.
+
+@@ -94,8 +94,8 @@ DEVICES += interface/library.retro
+ # -------------------------------------------------------------
+
+ GLOSSARY ?= ./bin/retro tools/glossary.retro
+-ASSEMBLE ?= ./bin/retro-muri
+-EXTEND ?= ./bin/retro-extend
++ASSEMBLE ?= ./tools/retro-muri.py
++EXTEND ?= ./tools/retro-extend.py
+ EXPORT ?= ./bin/retro-embedimage
+ RETRO ?= ./bin/retro
+
+diff --git a/tools/retro-extend.py b/tools/retro-extend.py
+index 1de8362..48e7149 100755
+--- a/tools/retro-extend.py
++++ b/tools/retro-extend.py
+@@ -353,7 +353,7 @@ class Retro:
+ Dictionary = dict()
+ header = self.memory[2]
+ while header != 0:
+- named = self.extract_string(header + 4)
++ named = self.extract_string(header + 5)
+ if not named in Dictionary:
+ Dictionary[named] = header
+ header = self.memory[header]
+@@ -366,7 +366,7 @@ class Retro:
+ header = self.memory[2]
+ Done = False
+ while header != 0 and not Done:
+- if named == self.extract_string(header + 4):
++ if named == self.extract_string(header + 5):
+ self.Dictionary[named] = header
+ Done = True
+ else:
+diff --git a/tools/retro-muri.py b/tools/retro-muri.py
+index c66b4d4..87d763d 100755
+--- a/tools/retro-muri.py
++++ b/tools/retro-muri.py
+@@ -137,13 +137,13 @@ def pass2():
+ def save(filename):
+ with open(filename, "wb") as file:
+ j = 0
+- while j < 1024:
++ while j < 1024 * 8:
+ file.write(struct.pack("i", image[j]))
+ j = j + 1
+
+
+ if __name__ == "__main__":
+- image.extend([0] * 1024)
++ image.extend([0] * 1024 * 8)
+ pass1()
+ pass2()
+ save("ngaImage")
diff --git a/srcpkgs/retroforth/template b/srcpkgs/retroforth/template
new file mode 100644
index 00000000000000..6a1c656a6a2a9c
--- /dev/null
+++ b/srcpkgs/retroforth/template
@@ -0,0 +1,16 @@
+# Template file for 'retroforth'
+pkgname=retroforth
+version=2024.1
+revision=1
+build_style=gnu-makefile
+hostmakedepends="python3"
+short_desc="Modern, pragmatic Forth"
+maintainer="Eloi Torrents <eloitor@duck.com>"
+license="custom:ISC-like"
+homepage="https://retroforth.org/"
+distfiles="https://retroforth.org/r/RETRO12-${version}.tar.gz"
+checksum=0058e50fea10ce60ce0fe39da75380d00f7832664cf9572aa55dd59b6eb3eec6
+
+post_install() {
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] New package: retroforth-2024.1
2024-10-29 14:38 [PR PATCH] New package: retroforth-2024.1 Eloitor
` (3 preceding siblings ...)
2024-10-30 15:30 ` Eloitor
@ 2024-10-30 15:39 ` Eloitor
4 siblings, 0 replies; 6+ messages in thread
From: Eloitor @ 2024-10-30 15:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 679 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages retroforth
https://github.com/void-linux/void-packages/pull/52837
[WIP] New package: retroforth-2024.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/52837.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroforth-52837.patch --]
[-- Type: text/x-diff, Size: 5526 bytes --]
From c6d86bc7cc942bd16fcb50d2b800ecda79bf0b22 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Tue, 29 Oct 2024 15:37:33 +0100
Subject: [PATCH] New package: retroforth-2024.1
---
.../patches/cross-gnumakefile.patch | 24 +++++++
srcpkgs/retroforth/patches/mandir.patch | 12 ++++
srcpkgs/retroforth/patches/python-tools.patch | 66 +++++++++++++++++++
srcpkgs/retroforth/template | 16 +++++
4 files changed, 118 insertions(+)
create mode 100644 srcpkgs/retroforth/patches/cross-gnumakefile.patch
create mode 100644 srcpkgs/retroforth/patches/mandir.patch
create mode 100644 srcpkgs/retroforth/patches/python-tools.patch
create mode 100644 srcpkgs/retroforth/template
diff --git a/srcpkgs/retroforth/patches/cross-gnumakefile.patch b/srcpkgs/retroforth/patches/cross-gnumakefile.patch
new file mode 100644
index 00000000000000..43f0d42efbd1e3
--- /dev/null
+++ b/srcpkgs/retroforth/patches/cross-gnumakefile.patch
@@ -0,0 +1,24 @@
+diff --git a/GNUmakefile b/GNUmakefile
+index 93bd983..50d7005 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -113,8 +113,8 @@ bin/retro-unu: tools/retro-unu.c
+ # basic image target
+
+ ngaImage: image/retro.muri image/retro.forth bin/retro-muri bin/retro-extend
+- ./bin/retro-muri image/retro.muri
+- ./bin/retro-extend ngaImage image/retro.forth image/build.retro
++ @$(ASSEMBLE) image/retro.muri
++ @$(EXTEND) ngaImage image/retro.forth image/build.retro
+
+ # minimal system
+
+@@ -130,7 +130,7 @@ update-extensions: bin/retro
+
+ vm/nga-c/image.c: ngaImage bin/retro-embedimage bin/retro-extend $(DEVICES) interface/retro-unix.retro
+ cp ngaImage rre.image
+- ./bin/retro-extend rre.image $(DEVICES) interface/retro-unix.retro
++ @$(EXTEND) rre.image $(DEVICES) interface/retro-unix.retro
+ ./bin/retro-embedimage rre.image >vm/nga-c/image.c
+
+ bin/retro: vm/nga-c/image.c vm/nga-c/retro.c package/list.forth package/load-extensions.retro
diff --git a/srcpkgs/retroforth/patches/mandir.patch b/srcpkgs/retroforth/patches/mandir.patch
new file mode 100644
index 00000000000000..34bad96492ffb7
--- /dev/null
+++ b/srcpkgs/retroforth/patches/mandir.patch
@@ -0,0 +1,12 @@
+--- a/Configuration.mk
++++ b/Configuration.mk
+@@ -13,7 +13,7 @@ PREFIX ?= /usr/local
+ DATADIR ?= $(PREFIX)/share/RETRO12
+ DOCSDIR ?= $(PREFIX)/share/doc/RETRO12
+ EXAMPLESDIR ?= $(PREFIX)/share/examples/RETRO12
+-MANDIR ?= $(PREFIX)/man/man1
++MANDIR ?= $(PREFIX)/share/man/man1
+
+ # -------------------------------------------------------------
+
+
diff --git a/srcpkgs/retroforth/patches/python-tools.patch b/srcpkgs/retroforth/patches/python-tools.patch
new file mode 100644
index 00000000000000..1b7f2cd32aee4b
--- /dev/null
+++ b/srcpkgs/retroforth/patches/python-tools.patch
@@ -0,0 +1,66 @@
+diff --git a/Configuration.mk b/Configuration.mk
+index adac510..98575ae 100644
+--- a/Configuration.mk
++++ b/Configuration.mk
+@@ -29,7 +29,7 @@ LIBDL ?=
+
+ OPTIONS ?=
+ OPTIONS += -DUSE_UTF32
+-OPTIONS += -DBIT64
++#OPTIONS += -DBIT64
+
+ # This helps improve performance on some systems.
+
+@@ -94,8 +94,8 @@ DEVICES += interface/library.retro
+ # -------------------------------------------------------------
+
+ GLOSSARY ?= ./bin/retro tools/glossary.retro
+-ASSEMBLE ?= ./bin/retro-muri
+-EXTEND ?= ./bin/retro-extend
++ASSEMBLE ?= ./tools/retro-muri.py
++EXTEND ?= ./tools/retro-extend.py
+ EXPORT ?= ./bin/retro-embedimage
+ RETRO ?= ./bin/retro
+
+diff --git a/tools/retro-extend.py b/tools/retro-extend.py
+index 1de8362..48e7149 100755
+--- a/tools/retro-extend.py
++++ b/tools/retro-extend.py
+@@ -353,7 +353,7 @@ class Retro:
+ Dictionary = dict()
+ header = self.memory[2]
+ while header != 0:
+- named = self.extract_string(header + 4)
++ named = self.extract_string(header + 5)
+ if not named in Dictionary:
+ Dictionary[named] = header
+ header = self.memory[header]
+@@ -366,7 +366,7 @@ class Retro:
+ header = self.memory[2]
+ Done = False
+ while header != 0 and not Done:
+- if named == self.extract_string(header + 4):
++ if named == self.extract_string(header + 5):
+ self.Dictionary[named] = header
+ Done = True
+ else:
+diff --git a/tools/retro-muri.py b/tools/retro-muri.py
+index c66b4d4..87d763d 100755
+--- a/tools/retro-muri.py
++++ b/tools/retro-muri.py
+@@ -137,13 +137,13 @@ def pass2():
+ def save(filename):
+ with open(filename, "wb") as file:
+ j = 0
+- while j < 1024:
++ while j < 1024 * 8:
+ file.write(struct.pack("i", image[j]))
+ j = j + 1
+
+
+ if __name__ == "__main__":
+- image.extend([0] * 1024)
++ image.extend([0] * 1024 * 8)
+ pass1()
+ pass2()
+ save("ngaImage")
diff --git a/srcpkgs/retroforth/template b/srcpkgs/retroforth/template
new file mode 100644
index 00000000000000..6a1c656a6a2a9c
--- /dev/null
+++ b/srcpkgs/retroforth/template
@@ -0,0 +1,16 @@
+# Template file for 'retroforth'
+pkgname=retroforth
+version=2024.1
+revision=1
+build_style=gnu-makefile
+hostmakedepends="python3"
+short_desc="Modern, pragmatic Forth"
+maintainer="Eloi Torrents <eloitor@duck.com>"
+license="custom:ISC-like"
+homepage="https://retroforth.org/"
+distfiles="https://retroforth.org/r/RETRO12-${version}.tar.gz"
+checksum=0058e50fea10ce60ce0fe39da75380d00f7832664cf9572aa55dd59b6eb3eec6
+
+post_install() {
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-10-30 15:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-10-29 14:38 [PR PATCH] New package: retroforth-2024.1 Eloitor
2024-10-29 14:43 ` [PR PATCH] [Updated] " Eloitor
2024-10-29 15:06 ` Eloitor
2024-10-30 15:26 ` [PR PATCH] [Updated] [WIP] " Eloitor
2024-10-30 15:30 ` Eloitor
2024-10-30 15:39 ` Eloitor
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).