* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
@ 2023-01-12 17:16 ` classabbyamp
2023-01-12 17:16 ` classabbyamp
` (26 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-12 17:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 463 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1068385910
Comment:
we should be using the upstream one: https://github.com/logisim-evolution/logisim-evolution/blob/v3.8.0/support/Flatpak/com.github.reds.LogisimEvolution.desktop (which may need a patch but that's better than vendoring)
in the same directory, there's a shared-mime-info file that might be good to include too
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
2023-01-12 17:16 ` [PR REVIEW] " classabbyamp
@ 2023-01-12 17:16 ` classabbyamp
2023-01-12 17:16 ` classabbyamp
` (25 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-12 17:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1068388054
Comment:
```suggestion
homepage="https://github.com/logisim-evolution/logisim-evolution"
changelog="https://github.com/logisim-evolution/logisim-evolution/raw/master/CHANGES.md"
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
2023-01-12 17:16 ` [PR REVIEW] " classabbyamp
2023-01-12 17:16 ` classabbyamp
@ 2023-01-12 17:16 ` classabbyamp
2023-01-12 17:22 ` voidbert
` (24 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-12 17:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1068387818
Comment:
we should be building this ourselves, not using prebuilt artifacts
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (2 preceding siblings ...)
2023-01-12 17:16 ` classabbyamp
@ 2023-01-12 17:22 ` voidbert
2023-01-12 21:24 ` [PR PATCH] [Updated] " voidbert
` (23 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: voidbert @ 2023-01-12 17:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
New review comment by voidbert on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1068396819
Comment:
Thank you for the guidance! I am still an xbps packaging newbie. I'll address these issues and update the PR.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (3 preceding siblings ...)
2023-01-12 17:22 ` voidbert
@ 2023-01-12 21:24 ` voidbert
2023-01-12 22:24 ` voidbert
` (22 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: voidbert @ 2023-01-12 21:24 UTC (permalink / raw)
To: ml
[-- 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: 6823 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/2] 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/2] 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
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (4 preceding siblings ...)
2023-01-12 21:24 ` [PR PATCH] [Updated] " voidbert
@ 2023-01-12 22:24 ` voidbert
2023-01-12 22:34 ` voidbert
` (21 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: voidbert @ 2023-01-12 22:24 UTC (permalink / raw)
To: ml
[-- 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
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (5 preceding siblings ...)
2023-01-12 22:24 ` voidbert
@ 2023-01-12 22:34 ` voidbert
2023-01-13 0:49 ` classabbyamp
` (20 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: voidbert @ 2023-01-12 22:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
New comment by voidbert on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#issuecomment-1381068531
Comment:
@classabbyamp I have fixed all problems. Though, `xlint` is still complaining about my email (likely commit email), when I have entered my real email on the maintainer field. Is that OK? If not, what should I do? `git config --global user.email` didn't work.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (6 preceding siblings ...)
2023-01-12 22:34 ` voidbert
@ 2023-01-13 0:49 ` classabbyamp
2023-01-13 1:10 ` [PR REVIEW] " classabbyamp
` (19 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-13 0:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 292 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#issuecomment-1381166890
Comment:
yes, it's talking about the email git is using to commit. it's still erroring because you added more commits instead of amending and/or squashing
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (7 preceding siblings ...)
2023-01-13 0:49 ` classabbyamp
@ 2023-01-13 1:10 ` classabbyamp
2023-01-13 1:10 ` classabbyamp
` (18 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-13 1:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1068816617
Comment:
don't include sed here, it should already be there.
why is tar needed?
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (8 preceding siblings ...)
2023-01-13 1:10 ` [PR REVIEW] " classabbyamp
@ 2023-01-13 1:10 ` classabbyamp
2023-01-13 1:10 ` classabbyamp
` (17 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-13 1:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 225 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1068815952
Comment:
use vinstall instead, and this should go in `usr/lib/$pkgname/` instead
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (9 preceding siblings ...)
2023-01-13 1:10 ` classabbyamp
@ 2023-01-13 1:10 ` classabbyamp
2023-01-13 1:10 ` classabbyamp
` (16 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-13 1:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1068811406
Comment:
do this as a patch instead, and don't override do_patch()
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (10 preceding siblings ...)
2023-01-13 1:10 ` classabbyamp
@ 2023-01-13 1:10 ` classabbyamp
2023-01-13 1:10 ` classabbyamp
` (15 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-13 1:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1068818111
Comment:
use vinstall, and this should go in /usr/share/icons/hicolor/scalable/apps/ with a name that matches the Icon= line in the desktop file
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (11 preceding siblings ...)
2023-01-13 1:10 ` classabbyamp
@ 2023-01-13 1:10 ` classabbyamp
2023-01-13 1:10 ` classabbyamp
` (14 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-13 1:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1068818167
Comment:
vinstall
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (12 preceding siblings ...)
2023-01-13 1:10 ` classabbyamp
@ 2023-01-13 1:10 ` classabbyamp
2023-01-13 1:10 ` classabbyamp
` (13 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-13 1:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1068818322
Comment:
should not be needed if using vinstall/vbin
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (13 preceding siblings ...)
2023-01-13 1:10 ` classabbyamp
@ 2023-01-13 1:10 ` classabbyamp
2023-01-13 15:27 ` [PR PATCH] [Updated] " voidbert
` (12 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-13 1:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1068817719
Comment:
use `vbin $FILESDIR/logisim-evolution` then sed after
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (14 preceding siblings ...)
2023-01-13 1:10 ` classabbyamp
@ 2023-01-13 15:27 ` voidbert
2023-01-13 15:38 ` voidbert
` (11 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: voidbert @ 2023-01-13 15:27 UTC (permalink / raw)
To: ml
[-- 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: 3630 bytes --]
From a53fb80e2bf71bde0122b89349abf215593ba45f 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] New package: logisim-evolution-3.8.0
---
.../logisim-evolution/files/logisim-evolution | 6 ++++
.../patches/desktop-entry.patch | 25 +++++++++++++++
srcpkgs/logisim-evolution/template | 31 +++++++++++++++++++
3 files changed, 62 insertions(+)
create mode 100644 srcpkgs/logisim-evolution/files/logisim-evolution
create mode 100644 srcpkgs/logisim-evolution/patches/desktop-entry.patch
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..1039e777fbba
--- /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/lib/@PKGNAME@/logisim-evolution-@VERSION@-all.jar $@
+
diff --git a/srcpkgs/logisim-evolution/patches/desktop-entry.patch b/srcpkgs/logisim-evolution/patches/desktop-entry.patch
new file mode 100644
index 000000000000..b9efff1f2c45
--- /dev/null
+++ b/srcpkgs/logisim-evolution/patches/desktop-entry.patch
@@ -0,0 +1,25 @@
+From 4bbbb9d2fecbc4f0b357ec2a7dd28da5f7698c54 Mon Sep 17 00:00:00 2001
+From: voidbert <humbertogilgomes@protonmail.com>
+Date: Fri, 13 Jan 2023 14:13:41 +0000
+Subject: [PATCH] Desktop entry update
+
+---
+ support/Flatpak/com.github.reds.LogisimEvolution.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/support/Flatpak/com.github.reds.LogisimEvolution.desktop b/support/Flatpak/com.github.reds.LogisimEvolution.desktop
+index 60a3521ac..312e80f35 100644
+--- a/support/Flatpak/com.github.reds.LogisimEvolution.desktop
++++ b/support/Flatpak/com.github.reds.LogisimEvolution.desktop
+@@ -2,7 +2,7 @@
+ Name=Logisim Evolution
+ GenericName=Logisim Logic Circuit Simulator
+ Comment=Digital Logic Circuit Simulator
+-Exec=LogisimEvolution.sh
++Exec=logisim-evolution
+ Icon=com.github.reds.LogisimEvolution
+ Terminal=false
+ Type=Application
+--
+2.39.0
+
diff --git a/srcpkgs/logisim-evolution/template b/srcpkgs/logisim-evolution/template
new file mode 100644
index 000000000000..b59cd3c71681
--- /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
+hostmakedepends="openjdk17 gradle"
+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"
+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_build() {
+ export JAVA_HOME=/usr/lib/jvm/openjdk17
+ gradle --no-daemon shadowJar
+}
+
+do_install() {
+ vinstall build/libs/logisim-evolution-${version}-all.jar 0644 usr/lib/${pkgname}
+
+ vbin ${FILESDIR}/logisim-evolution
+ sed -i -e "s/@VERSION@/${version}/g" -e "s/@PKGNAME@/${pkgname}/g" \
+ ${DESTDIR}/usr/bin/logisim-evolution
+
+ vinstall artwork/logisim-evolution-icon.svg 0644 \
+ usr/share/icons/hicolor/apps com.github.reds.LogisimEvolution.svg
+ vinstall support/Flatpak/com.github.reds.LogisimEvolution.desktop 0644 \
+ usr/share/applications
+}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (15 preceding siblings ...)
2023-01-13 15:27 ` [PR PATCH] [Updated] " voidbert
@ 2023-01-13 15:38 ` voidbert
2023-01-17 18:10 ` [PR REVIEW] " classabbyamp
` (10 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: voidbert @ 2023-01-13 15:38 UTC (permalink / raw)
To: ml
[-- 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: 3625 bytes --]
From 71299c81238d35103a78deff071012ec79126ac1 Mon Sep 17 00:00:00 2001
From: Humberto Gomes <humbertogilgomes@protonmail.com>
Date: Thu, 12 Jan 2023 17:02:16 +0000
Subject: [PATCH] New package: logisim-evolution-3.8.0
---
.../logisim-evolution/files/logisim-evolution | 6 ++++
.../patches/desktop-entry.patch | 25 +++++++++++++++
srcpkgs/logisim-evolution/template | 31 +++++++++++++++++++
3 files changed, 62 insertions(+)
create mode 100644 srcpkgs/logisim-evolution/files/logisim-evolution
create mode 100644 srcpkgs/logisim-evolution/patches/desktop-entry.patch
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..1039e777fbba
--- /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/lib/@PKGNAME@/logisim-evolution-@VERSION@-all.jar $@
+
diff --git a/srcpkgs/logisim-evolution/patches/desktop-entry.patch b/srcpkgs/logisim-evolution/patches/desktop-entry.patch
new file mode 100644
index 000000000000..b9efff1f2c45
--- /dev/null
+++ b/srcpkgs/logisim-evolution/patches/desktop-entry.patch
@@ -0,0 +1,25 @@
+From 4bbbb9d2fecbc4f0b357ec2a7dd28da5f7698c54 Mon Sep 17 00:00:00 2001
+From: voidbert <humbertogilgomes@protonmail.com>
+Date: Fri, 13 Jan 2023 14:13:41 +0000
+Subject: [PATCH] Desktop entry update
+
+---
+ support/Flatpak/com.github.reds.LogisimEvolution.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/support/Flatpak/com.github.reds.LogisimEvolution.desktop b/support/Flatpak/com.github.reds.LogisimEvolution.desktop
+index 60a3521ac..312e80f35 100644
+--- a/support/Flatpak/com.github.reds.LogisimEvolution.desktop
++++ b/support/Flatpak/com.github.reds.LogisimEvolution.desktop
+@@ -2,7 +2,7 @@
+ Name=Logisim Evolution
+ GenericName=Logisim Logic Circuit Simulator
+ Comment=Digital Logic Circuit Simulator
+-Exec=LogisimEvolution.sh
++Exec=logisim-evolution
+ Icon=com.github.reds.LogisimEvolution
+ Terminal=false
+ Type=Application
+--
+2.39.0
+
diff --git a/srcpkgs/logisim-evolution/template b/srcpkgs/logisim-evolution/template
new file mode 100644
index 000000000000..b59cd3c71681
--- /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
+hostmakedepends="openjdk17 gradle"
+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"
+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_build() {
+ export JAVA_HOME=/usr/lib/jvm/openjdk17
+ gradle --no-daemon shadowJar
+}
+
+do_install() {
+ vinstall build/libs/logisim-evolution-${version}-all.jar 0644 usr/lib/${pkgname}
+
+ vbin ${FILESDIR}/logisim-evolution
+ sed -i -e "s/@VERSION@/${version}/g" -e "s/@PKGNAME@/${pkgname}/g" \
+ ${DESTDIR}/usr/bin/logisim-evolution
+
+ vinstall artwork/logisim-evolution-icon.svg 0644 \
+ usr/share/icons/hicolor/apps com.github.reds.LogisimEvolution.svg
+ vinstall support/Flatpak/com.github.reds.LogisimEvolution.desktop 0644 \
+ usr/share/applications
+}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (16 preceding siblings ...)
2023-01-13 15:38 ` voidbert
@ 2023-01-17 18:10 ` classabbyamp
2023-01-17 18:10 ` classabbyamp
` (9 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-17 18:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 283 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1072584731
Comment:
```suggestion
vinstall build/libs/logisim-evolution-${version}-all.jar 0644 usr/lib/logisim-evolution logisim-evolution.jar
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (17 preceding siblings ...)
2023-01-17 18:10 ` [PR REVIEW] " classabbyamp
@ 2023-01-17 18:10 ` classabbyamp
2023-01-17 18:10 ` classabbyamp
` (8 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-17 18:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1072585967
Comment:
```suggestion
```
not necessary with the simplification
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (18 preceding siblings ...)
2023-01-17 18:10 ` classabbyamp
@ 2023-01-17 18:10 ` classabbyamp
2023-01-17 18:10 ` classabbyamp
` (7 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-17 18:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 303 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1072583152
Comment:
```suggestion
$JAVA_HOME/bin/java -jar /usr/lib/logisim-evolution/logisim-evolution.jar $@
```
let's remove the version here to make things simpler
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (19 preceding siblings ...)
2023-01-17 18:10 ` classabbyamp
@ 2023-01-17 18:10 ` classabbyamp
2023-01-17 18:10 ` classabbyamp
` (6 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-17 18:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 460 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1072587876
Comment:
I don't see a need to put line continuations here, just make them one line
```suggestion
vinstall artwork/logisim-evolution-icon.svg 0644 usr/share/icons/hicolor/apps com.github.reds.LogisimEvolution.svg
vinstall support/Flatpak/com.github.reds.LogisimEvolution.desktop 0644 usr/share/applications
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (20 preceding siblings ...)
2023-01-17 18:10 ` classabbyamp
@ 2023-01-17 18:10 ` classabbyamp
2023-01-17 18:16 ` classabbyamp
` (5 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-17 18:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 249 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1072603389
Comment:
```suggestion
usr/share/icons/hicolor/scalable/apps com.github.reds.LogisimEvolution.svg
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (21 preceding siblings ...)
2023-01-17 18:10 ` classabbyamp
@ 2023-01-17 18:16 ` classabbyamp
2023-01-18 12:46 ` [PR PATCH] [Updated] " voidbert
` (4 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-17 18:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2160 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#issuecomment-1385836929
Comment:
to summarise:
```patch
From 528ba136392986688f1bfb7c4327fcf9125e1035 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Jan 2023 13:15:15 -0500
Subject: [PATCH] pr review
diff --git a/srcpkgs/logisim-evolution/files/logisim-evolution b/srcpkgs/logisim-evolution/files/logisim-evolution
index 1039e777fb..7fdaedabdd 100644
--- a/srcpkgs/logisim-evolution/files/logisim-evolution
+++ b/srcpkgs/logisim-evolution/files/logisim-evolution
@@ -1,6 +1,4 @@
#!/bin/sh
export JAVA_HOME=/usr/lib/jvm/openjdk17
-$JAVA_HOME/bin/java -jar \
- /usr/lib/@PKGNAME@/logisim-evolution-@VERSION@-all.jar $@
-
+$JAVA_HOME/bin/java -jar /usr/lib/logisim-evolution/logisim-evolution.jar $@
diff --git a/srcpkgs/logisim-evolution/template b/srcpkgs/logisim-evolution/template
index b59cd3c716..b89cacbb82 100644
--- a/srcpkgs/logisim-evolution/template
+++ b/srcpkgs/logisim-evolution/template
@@ -18,14 +18,11 @@ do_build() {
}
do_install() {
- vinstall build/libs/logisim-evolution-${version}-all.jar 0644 usr/lib/${pkgname}
+ vinstall build/libs/logisim-evolution-${version}-all.jar 0644 usr/lib/logisim-evolution logisim-evolution.jar
vbin ${FILESDIR}/logisim-evolution
- sed -i -e "s/@VERSION@/${version}/g" -e "s/@PKGNAME@/${pkgname}/g" \
- ${DESTDIR}/usr/bin/logisim-evolution
- vinstall artwork/logisim-evolution-icon.svg 0644 \
- usr/share/icons/hicolor/apps com.github.reds.LogisimEvolution.svg
- vinstall support/Flatpak/com.github.reds.LogisimEvolution.desktop 0644 \
- usr/share/applications
+ vinstall artwork/logisim-evolution-icon.svg 0644 usr/share/icons/hicolor/scalable/apps com.github.reds.LogisimEvolution.svg
+ vinstall support/Flatpak/com.github.reds.LogisimEvolution.desktop 0644 usr/share/applications
+ vinstall support/Flatpak/com.github.reds.LogisimEvolution.desktop 0644 usr/share/mime/packages
}
--
2.39.0
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (22 preceding siblings ...)
2023-01-17 18:16 ` classabbyamp
@ 2023-01-18 12:46 ` voidbert
2023-01-18 20:12 ` [PR REVIEW] " classabbyamp
` (3 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: voidbert @ 2023-01-18 12:46 UTC (permalink / raw)
To: ml
[-- 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: 3631 bytes --]
From 0ec9aec0190c49aa61a6b916b83069a19cf57fa6 Mon Sep 17 00:00:00 2001
From: Humberto Gomes <humbertogilgomes@protonmail.com>
Date: Thu, 12 Jan 2023 17:02:16 +0000
Subject: [PATCH] New package: logisim-evolution-3.8.0
---
.../logisim-evolution/files/logisim-evolution | 5 ++++
.../patches/desktop-entry.patch | 25 +++++++++++++++++
srcpkgs/logisim-evolution/template | 28 +++++++++++++++++++
3 files changed, 58 insertions(+)
create mode 100644 srcpkgs/logisim-evolution/files/logisim-evolution
create mode 100644 srcpkgs/logisim-evolution/patches/desktop-entry.patch
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..0be63c6ec1da
--- /dev/null
+++ b/srcpkgs/logisim-evolution/files/logisim-evolution
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export JAVA_HOME=/usr/lib/jvm/openjdk17
+$JAVA_HOME/bin/java -jar /usr/lib/logisim-evolution/logisim-evolution.jar $@
+
diff --git a/srcpkgs/logisim-evolution/patches/desktop-entry.patch b/srcpkgs/logisim-evolution/patches/desktop-entry.patch
new file mode 100644
index 000000000000..b9efff1f2c45
--- /dev/null
+++ b/srcpkgs/logisim-evolution/patches/desktop-entry.patch
@@ -0,0 +1,25 @@
+From 4bbbb9d2fecbc4f0b357ec2a7dd28da5f7698c54 Mon Sep 17 00:00:00 2001
+From: voidbert <humbertogilgomes@protonmail.com>
+Date: Fri, 13 Jan 2023 14:13:41 +0000
+Subject: [PATCH] Desktop entry update
+
+---
+ support/Flatpak/com.github.reds.LogisimEvolution.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/support/Flatpak/com.github.reds.LogisimEvolution.desktop b/support/Flatpak/com.github.reds.LogisimEvolution.desktop
+index 60a3521ac..312e80f35 100644
+--- a/support/Flatpak/com.github.reds.LogisimEvolution.desktop
++++ b/support/Flatpak/com.github.reds.LogisimEvolution.desktop
+@@ -2,7 +2,7 @@
+ Name=Logisim Evolution
+ GenericName=Logisim Logic Circuit Simulator
+ Comment=Digital Logic Circuit Simulator
+-Exec=LogisimEvolution.sh
++Exec=logisim-evolution
+ Icon=com.github.reds.LogisimEvolution
+ Terminal=false
+ Type=Application
+--
+2.39.0
+
diff --git a/srcpkgs/logisim-evolution/template b/srcpkgs/logisim-evolution/template
new file mode 100644
index 000000000000..6512b920f6b0
--- /dev/null
+++ b/srcpkgs/logisim-evolution/template
@@ -0,0 +1,28 @@
+# Template file for 'logisim-evolution'
+pkgname=logisim-evolution
+version=3.8.0
+revision=1
+hostmakedepends="openjdk17 gradle"
+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"
+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_build() {
+ export JAVA_HOME=/usr/lib/jvm/openjdk17
+ gradle --no-daemon shadowJar
+}
+
+do_install() {
+ vinstall build/libs/logisim-evolution-${version}-all.jar 0644 usr/lib/logisim-evolution logisim-evolution.jar
+
+ vbin ${FILESDIR}/logisim-evolution
+
+ vinstall artwork/logisim-evolution-icon.svg 0644 usr/share/icons/hicolor/scalable/apps com.github.reds.LogisimEvolution.svg
+ vinstall support/Flatpak/com.github.reds.LogisimEvolution.desktop 0644 usr/share/mime/packages
+ vinstall support/Flatpak/com.github.reds.LogisimEvolution.desktop 0644 usr/share/applications
+}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (23 preceding siblings ...)
2023-01-18 12:46 ` [PR PATCH] [Updated] " voidbert
@ 2023-01-18 20:12 ` classabbyamp
2023-01-18 22:35 ` [PR PATCH] [Updated] " voidbert
` (2 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-18 20:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 284 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1074028151
Comment:
```suggestion
vinstall support/Flatpak/com.github.reds.LogisimEvolution.xml 0644 usr/share/mime/packages
```
my bad -- i typo'd
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (24 preceding siblings ...)
2023-01-18 20:12 ` [PR REVIEW] " classabbyamp
@ 2023-01-18 22:35 ` voidbert
2023-01-18 22:36 ` [PR REVIEW] " voidbert
2023-01-18 23:33 ` [PR PATCH] [Merged]: " classabbyamp
27 siblings, 0 replies; 29+ messages in thread
From: voidbert @ 2023-01-18 22:35 UTC (permalink / raw)
To: ml
[-- 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: 3627 bytes --]
From 281eb579c09923a351bd432bf5f1c833fc3d154d Mon Sep 17 00:00:00 2001
From: Humberto Gomes <humbertogilgomes@protonmail.com>
Date: Thu, 12 Jan 2023 17:02:16 +0000
Subject: [PATCH] New package: logisim-evolution-3.8.0
---
.../logisim-evolution/files/logisim-evolution | 5 ++++
.../patches/desktop-entry.patch | 25 +++++++++++++++++
srcpkgs/logisim-evolution/template | 28 +++++++++++++++++++
3 files changed, 58 insertions(+)
create mode 100644 srcpkgs/logisim-evolution/files/logisim-evolution
create mode 100644 srcpkgs/logisim-evolution/patches/desktop-entry.patch
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..0be63c6ec1da
--- /dev/null
+++ b/srcpkgs/logisim-evolution/files/logisim-evolution
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export JAVA_HOME=/usr/lib/jvm/openjdk17
+$JAVA_HOME/bin/java -jar /usr/lib/logisim-evolution/logisim-evolution.jar $@
+
diff --git a/srcpkgs/logisim-evolution/patches/desktop-entry.patch b/srcpkgs/logisim-evolution/patches/desktop-entry.patch
new file mode 100644
index 000000000000..b9efff1f2c45
--- /dev/null
+++ b/srcpkgs/logisim-evolution/patches/desktop-entry.patch
@@ -0,0 +1,25 @@
+From 4bbbb9d2fecbc4f0b357ec2a7dd28da5f7698c54 Mon Sep 17 00:00:00 2001
+From: voidbert <humbertogilgomes@protonmail.com>
+Date: Fri, 13 Jan 2023 14:13:41 +0000
+Subject: [PATCH] Desktop entry update
+
+---
+ support/Flatpak/com.github.reds.LogisimEvolution.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/support/Flatpak/com.github.reds.LogisimEvolution.desktop b/support/Flatpak/com.github.reds.LogisimEvolution.desktop
+index 60a3521ac..312e80f35 100644
+--- a/support/Flatpak/com.github.reds.LogisimEvolution.desktop
++++ b/support/Flatpak/com.github.reds.LogisimEvolution.desktop
+@@ -2,7 +2,7 @@
+ Name=Logisim Evolution
+ GenericName=Logisim Logic Circuit Simulator
+ Comment=Digital Logic Circuit Simulator
+-Exec=LogisimEvolution.sh
++Exec=logisim-evolution
+ Icon=com.github.reds.LogisimEvolution
+ Terminal=false
+ Type=Application
+--
+2.39.0
+
diff --git a/srcpkgs/logisim-evolution/template b/srcpkgs/logisim-evolution/template
new file mode 100644
index 000000000000..0900b1601810
--- /dev/null
+++ b/srcpkgs/logisim-evolution/template
@@ -0,0 +1,28 @@
+# Template file for 'logisim-evolution'
+pkgname=logisim-evolution
+version=3.8.0
+revision=1
+hostmakedepends="openjdk17 gradle"
+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"
+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_build() {
+ export JAVA_HOME=/usr/lib/jvm/openjdk17
+ gradle --no-daemon shadowJar
+}
+
+do_install() {
+ vinstall build/libs/logisim-evolution-${version}-all.jar 0644 usr/lib/logisim-evolution logisim-evolution.jar
+
+ vbin ${FILESDIR}/logisim-evolution
+
+ vinstall artwork/logisim-evolution-icon.svg 0644 usr/share/icons/hicolor/scalable/apps com.github.reds.LogisimEvolution.svg
+ vinstall support/Flatpak/com.github.reds.LogisimEvolution.xml 0644 usr/share/mime/packages
+ vinstall support/Flatpak/com.github.reds.LogisimEvolution.desktop 0644 usr/share/applications
+}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (25 preceding siblings ...)
2023-01-18 22:35 ` [PR PATCH] [Updated] " voidbert
@ 2023-01-18 22:36 ` voidbert
2023-01-18 23:33 ` [PR PATCH] [Merged]: " classabbyamp
27 siblings, 0 replies; 29+ messages in thread
From: voidbert @ 2023-01-18 22:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New review comment by voidbert on void-packages repository
https://github.com/void-linux/void-packages/pull/41603#discussion_r1080635851
Comment:
No problem. And thanks for your patience!
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Merged]: New package: logisim-evolution-3.8.0
2023-01-12 17:03 [PR PATCH] New package: logisim-evolution-3.8.0 voidbert
` (26 preceding siblings ...)
2023-01-18 22:36 ` [PR REVIEW] " voidbert
@ 2023-01-18 23:33 ` classabbyamp
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2023-01-18 23:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1043 bytes --]
There's a merged pull request on the void-packages repository
New package: logisim-evolution-3.8.0
https://github.com/void-linux/void-packages/pull/41603
Description:
<!-- 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
^ permalink raw reply [flat|nested] 29+ messages in thread