Re: [PR PATCH] [Updated] New package: logisim-evolution-3.8.0

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

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

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

https://github.com/voidbert/void-packages logisim-evolution
https://github.com/void-linux/void-packages/pull/41603

New package: logisim-evolution-3.8.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### 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**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl



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

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

From 16853e1c93563cbb460d2435ab33be1ceaacdc18 Mon Sep 17 00:00:00 2001
From: voidbert <50591320+voidbert@users.noreply.github.com>
Date: Thu, 12 Jan 2023 17:02:16 +0000
Subject: [PATCH 1/3] New package: logisim-evolution-3.8.0

---
 .../logisim-evolution/files/logisim-evolution |  6 ++++
 .../files/logisim-evolution.desktop           | 12 +++++++
 srcpkgs/logisim-evolution/template            | 31 +++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/logisim-evolution/files/logisim-evolution
 create mode 100644 srcpkgs/logisim-evolution/files/logisim-evolution.desktop
 create mode 100644 srcpkgs/logisim-evolution/template

diff --git a/srcpkgs/logisim-evolution/files/logisim-evolution b/srcpkgs/logisim-evolution/files/logisim-evolution
new file mode 100644
index 000000000000..6b61f17d93ca
--- /dev/null
+++ b/srcpkgs/logisim-evolution/files/logisim-evolution
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+export JAVA_HOME=/usr/lib/jvm/openjdk17
+$JAVA_HOME/bin/java -jar \
+	/usr/share/logisim-evolution/logisim-evolution-@VERSION@-all.jar $@
+
diff --git a/srcpkgs/logisim-evolution/files/logisim-evolution.desktop b/srcpkgs/logisim-evolution/files/logisim-evolution.desktop
new file mode 100644
index 000000000000..a68afe79edb3
--- /dev/null
+++ b/srcpkgs/logisim-evolution/files/logisim-evolution.desktop
@@ -0,0 +1,12 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Type=Application
+Version=@VERSION@
+Name=Logisim Evolution
+Comment=Digital logic design tool and simulator
+Exec=@DESTDIR@/usr/bin/logisim-evolution/Logisim-evolution
+Icon=@DESTDIR@/usr/share/logisim-evolution/Logisim-evolution.png
+Terminal=false
+MimeType=application/prs.cburch.logisim
+Categories=Development;Electronics
+
diff --git a/srcpkgs/logisim-evolution/template b/srcpkgs/logisim-evolution/template
new file mode 100644
index 000000000000..9fa0bec91988
--- /dev/null
+++ b/srcpkgs/logisim-evolution/template
@@ -0,0 +1,31 @@
+# Template file for 'logisim-evolution'
+pkgname=logisim-evolution
+version=3.8.0
+revision=1
+build_style=fetch
+depends="openjdk17-jre"
+short_desc="Digital logic design tool and simulator"
+maintainer="voidbert <humbertogilgomes@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/logisim-evolution/logisim-evolution"
+distfiles="
+ https://github.com/logisim-evolution/logisim-evolution/releases/download/v${version}/logisim-evolution-${version}-all.jar
+ https://raw.githubusercontent.com/logisim-evolution/logisim-evolution/v${version}/artwork/logisim-evolution-icon.svg"
+checksum="4c59be7dadc2329d0e3219ca05ce9c2c858641b206fcea4e3821bb79aef06c2c
+ 0cd4629a1345b7a8cb763aafee8d9c373dfc2ba5e77afc43d2b1b29b29b7c41b"
+
+do_install() {
+	vmkdir usr/share/logisim-evolution
+	vcopy "logisim-evolution-${version}-all.jar" usr/share/logisim-evolution
+	vcopy "logisim-evolution-icon.svg" usr/share/logisim-evolution
+
+	vmkdir usr/share/applications
+	sed -e "s/@VERSION@/${version}/g" -e "s:@DESTDIR@:${DESTDIR}:g" \
+		${FILESDIR}/logisim-evolution.desktop > \
+		${DESTDIR}/usr/share/applications/logisim-evolution.desktop
+
+	vmkdir usr/bin
+	sed -e "s/@VERSION@/${version}/g" ${FILESDIR}/logisim-evolution > \
+		${DESTDIR}/usr/bin/logisim-evolution
+	chmod 0755 ${DESTDIR}/usr/bin/logisim-evolution
+}

From 2c0ea6837702ba8f2533ba8c55a22ec44f6d1851 Mon Sep 17 00:00:00 2001
From: voidbert <50591320+voidbert@users.noreply.github.com>
Date: Thu, 12 Jan 2023 21:25:32 +0000
Subject: [PATCH 2/3] logisim-evolution: building from source

---
 .../files/logisim-evolution.desktop           | 12 -------
 srcpkgs/logisim-evolution/template            | 35 +++++++++++--------
 2 files changed, 21 insertions(+), 26 deletions(-)
 delete mode 100644 srcpkgs/logisim-evolution/files/logisim-evolution.desktop

diff --git a/srcpkgs/logisim-evolution/files/logisim-evolution.desktop b/srcpkgs/logisim-evolution/files/logisim-evolution.desktop
deleted file mode 100644
index a68afe79edb3..000000000000
--- a/srcpkgs/logisim-evolution/files/logisim-evolution.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Type=Application
-Version=@VERSION@
-Name=Logisim Evolution
-Comment=Digital logic design tool and simulator
-Exec=@DESTDIR@/usr/bin/logisim-evolution/Logisim-evolution
-Icon=@DESTDIR@/usr/share/logisim-evolution/Logisim-evolution.png
-Terminal=false
-MimeType=application/prs.cburch.logisim
-Categories=Development;Electronics
-
diff --git a/srcpkgs/logisim-evolution/template b/srcpkgs/logisim-evolution/template
index 9fa0bec91988..923160ef1645 100644
--- a/srcpkgs/logisim-evolution/template
+++ b/srcpkgs/logisim-evolution/template
@@ -1,31 +1,38 @@
 # Template file for 'logisim-evolution'
 pkgname=logisim-evolution
 version=3.8.0
-revision=1
-build_style=fetch
+revision=2
+makedepends="openjdk17 gradle sed tar"
 depends="openjdk17-jre"
 short_desc="Digital logic design tool and simulator"
 maintainer="voidbert <humbertogilgomes@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/logisim-evolution/logisim-evolution"
-distfiles="
- https://github.com/logisim-evolution/logisim-evolution/releases/download/v${version}/logisim-evolution-${version}-all.jar
- https://raw.githubusercontent.com/logisim-evolution/logisim-evolution/v${version}/artwork/logisim-evolution-icon.svg"
-checksum="4c59be7dadc2329d0e3219ca05ce9c2c858641b206fcea4e3821bb79aef06c2c
- 0cd4629a1345b7a8cb763aafee8d9c373dfc2ba5e77afc43d2b1b29b29b7c41b"
+changelog="https://github.com/logisim-evolution/logisim-evolution/raw/master/CHANGES.md"
+distfiles="https://github.com/logisim-evolution/logisim-evolution/archive/refs/tags/v${version}.tar.gz"
+checksum=7a49558a490a0df886b3ea488f12e4ea887a2ec8c278872dca39b2bebfaed3ee
+
+do_patch() {
+	sed -i -e "s:Icon=.*:Icon=${DESTDIR}/usr/share/applications:g" \
+	       -e "s:Exec=.*:Exec=${DESTDIR}/usr/bin/logisim-evolution:g" \
+	       support/Flatpak/com.github.reds.LogisimEvolution.desktop
+}
+
+do_build() {
+	gradle --no-daemon shadowJar
+}
 
 do_install() {
 	vmkdir usr/share/logisim-evolution
-	vcopy "logisim-evolution-${version}-all.jar" usr/share/logisim-evolution
-	vcopy "logisim-evolution-icon.svg" usr/share/logisim-evolution
-
 	vmkdir usr/share/applications
-	sed -e "s/@VERSION@/${version}/g" -e "s:@DESTDIR@:${DESTDIR}:g" \
-		${FILESDIR}/logisim-evolution.desktop > \
-		${DESTDIR}/usr/share/applications/logisim-evolution.desktop
-
 	vmkdir usr/bin
+
+	vcopy build/libs/logisim-evolution-${version}-all.jar usr/share/logisim-evolution
+
 	sed -e "s/@VERSION@/${version}/g" ${FILESDIR}/logisim-evolution > \
 		${DESTDIR}/usr/bin/logisim-evolution
 	chmod 0755 ${DESTDIR}/usr/bin/logisim-evolution
+
+	vcopy artwork/logisim-evolution-icon.svg usr/share/logisim-evolution
+	vcopy support/Flatpak/com.github.reds.LogisimEvolution.desktop usr/share/applications
 }

From 256717076a15b30c76c8712111bfce9515972442 Mon Sep 17 00:00:00 2001
From: voidbert <humbertogilgomes@protonmail.com>
Date: Thu, 12 Jan 2023 22:25:27 +0000
Subject: [PATCH 3/3] logisim-evolution: ARM builds working

---
 srcpkgs/logisim-evolution/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/logisim-evolution/template b/srcpkgs/logisim-evolution/template
index 923160ef1645..ceb9b12c8892 100644
--- a/srcpkgs/logisim-evolution/template
+++ b/srcpkgs/logisim-evolution/template
@@ -1,8 +1,8 @@
 # Template file for 'logisim-evolution'
 pkgname=logisim-evolution
 version=3.8.0
-revision=2
-makedepends="openjdk17 gradle sed tar"
+revision=3
+hostmakedepends="openjdk17 gradle sed tar"
 depends="openjdk17-jre"
 short_desc="Digital logic design tool and simulator"
 maintainer="voidbert <humbertogilgomes@protonmail.com>"
@@ -19,6 +19,7 @@ do_patch() {
 }
 
 do_build() {
+	export JAVA_HOME=/usr/lib/jvm/openjdk17
 	gradle --no-daemon shadowJar
 }