Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New package: logisim-evolution-3.8.0 #41603

Merged
merged 1 commit into from
Jan 18, 2023

Conversation

voidbert
Copy link
Contributor

Testing the changes

  • I tested the changes in this PR: YES

New package

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

@classabbyamp classabbyamp added the new-package This PR adds a new package label Jan 12, 2023
@voidbert
Copy link
Contributor Author

@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.

@classabbyamp
Copy link
Member

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

srcpkgs/logisim-evolution/template Outdated Show resolved Hide resolved
srcpkgs/logisim-evolution/template Outdated Show resolved Hide resolved
srcpkgs/logisim-evolution/template Outdated Show resolved Hide resolved
srcpkgs/logisim-evolution/template Outdated Show resolved Hide resolved
srcpkgs/logisim-evolution/template Outdated Show resolved Hide resolved
srcpkgs/logisim-evolution/template Outdated Show resolved Hide resolved
srcpkgs/logisim-evolution/template Outdated Show resolved Hide resolved
@voidbert voidbert force-pushed the logisim-evolution branch 2 times, most recently from a53fb80 to 71299c8 Compare January 13, 2023 15:38
Copy link
Member

@classabbyamp classabbyamp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also add the mimeinfo file:

vinstall support/Flatpak/com.github.reds.LogisimEvolution.desktop 0644 usr/share/mime/packages

srcpkgs/logisim-evolution/files/logisim-evolution Outdated Show resolved Hide resolved
srcpkgs/logisim-evolution/template Outdated Show resolved Hide resolved
srcpkgs/logisim-evolution/template Outdated Show resolved Hide resolved
srcpkgs/logisim-evolution/template Outdated Show resolved Hide resolved
srcpkgs/logisim-evolution/template Outdated Show resolved Hide resolved
@classabbyamp
Copy link
Member

to summarise:

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

@classabbyamp classabbyamp merged commit 70dacae into void-linux:master Jan 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
new-package This PR adds a new package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants