diff --git a/.github/workflows/aur-publish.yml b/.github/workflows/aur-publish.yml index df79a68..b505aad 100644 --- a/.github/workflows/aur-publish.yml +++ b/.github/workflows/aur-publish.yml @@ -94,6 +94,10 @@ jobs: sed -i "s/^pkgver=.*/pkgver=${PKGVER}/" packaging/aur/kst4contest/PKGBUILD sed -i "s/^sha256sums=.*/sha256sums=('${SHA_SRC}')/" packaging/aur/kst4contest/PKGBUILD + # A new pkgver supersedes any rebuild-only pkgrel bumps made in between. + sed -i "s/^pkgrel=.*/pkgrel=1/" packaging/aur/kst4contest-bin/PKGBUILD + sed -i "s/^pkgrel=.*/pkgrel=1/" packaging/aur/kst4contest/PKGBUILD + # kst4contest-git: Basis aus pom.xml, Suffix aus git BASE_VER=$(grep -m1 '' pom.xml \ | sed 's/.*\(.*\)<\/version>.*/\1/' | sed 's/[-.]nightly//') diff --git a/.github/workflows/nightly-artifacts.yml b/.github/workflows/nightly-artifacts.yml index 5daba82..d45ab8b 100644 --- a/.github/workflows/nightly-artifacts.yml +++ b/.github/workflows/nightly-artifacts.yml @@ -126,7 +126,7 @@ jobs: jpackage \ --type app-image \ --name KST4Contest \ - --icon src/main/resources/icons/kst4contest.png \ + --icon packaging/icons/kst4contest.png \ --input target/dist-libs \ --main-jar app.jar \ --main-class kst4contest.view.Kst4ContestApplication \ @@ -213,7 +213,7 @@ jobs: jpackage \ --type deb \ --name KST4Contest \ - --icon src/main/resources/icons/kst4contest.png \ + --icon packaging/icons/kst4contest.png \ --input target/dist-libs \ --main-jar app.jar \ --main-class kst4contest.view.Kst4ContestApplication \ @@ -274,7 +274,7 @@ jobs: jpackage \ --type rpm \ --name KST4Contest \ - --icon src/main/resources/icons/kst4contest.png \ + --icon packaging/icons/kst4contest.png \ --input target/dist-libs \ --main-jar app.jar \ --main-class kst4contest.view.Kst4ContestApplication \ @@ -337,7 +337,7 @@ jobs: jpackage \ --type app-image \ --name KST4Contest \ - --icon src/main/resources/icons/kst4contest.png \ + --icon packaging/icons/kst4contest.png \ --input target/dist-libs \ --main-jar app.jar \ --main-class kst4contest.view.Kst4ContestApplication \ @@ -457,7 +457,7 @@ jobs: jpackage \ --type app-image \ --name KST4Contest \ - --icon src/main/resources/icons/kst4contest.png \ + --icon packaging/icons/kst4contest.png \ --input target/dist-libs \ --main-jar app.jar \ --main-class kst4contest.view.Kst4ContestApplication \ diff --git a/.github/workflows/tagged-release.yml b/.github/workflows/tagged-release.yml index 56e3a4c..0541144 100644 --- a/.github/workflows/tagged-release.yml +++ b/.github/workflows/tagged-release.yml @@ -104,7 +104,7 @@ jobs: jpackage \ --type app-image \ --name KST4Contest \ - --icon src/main/resources/icons/kst4contest.png \ + --icon packaging/icons/kst4contest.png \ --input target/dist-libs \ --main-jar app.jar \ --main-class kst4contest.view.Kst4ContestApplication \ @@ -184,7 +184,7 @@ jobs: jpackage \ --type deb \ --name KST4Contest \ - --icon src/main/resources/icons/kst4contest.png \ + --icon packaging/icons/kst4contest.png \ --input target/dist-libs \ --main-jar app.jar \ --main-class kst4contest.view.Kst4ContestApplication \ @@ -238,7 +238,7 @@ jobs: jpackage \ --type rpm \ --name KST4Contest \ - --icon src/main/resources/icons/kst4contest.png \ + --icon packaging/icons/kst4contest.png \ --input target/dist-libs \ --main-jar app.jar \ --main-class kst4contest.view.Kst4ContestApplication \ @@ -292,7 +292,7 @@ jobs: jpackage \ --type app-image \ --name KST4Contest \ - --icon src/main/resources/icons/kst4contest.png \ + --icon packaging/icons/kst4contest.png \ --input target/dist-libs \ --main-jar app.jar \ --main-class kst4contest.view.Kst4ContestApplication \ @@ -403,7 +403,7 @@ jobs: jpackage \ --type app-image \ --name KST4Contest \ - --icon src/main/resources/icons/kst4contest.png \ + --icon packaging/icons/kst4contest.png \ --input target/dist-libs \ --main-jar app.jar \ --main-class kst4contest.view.Kst4ContestApplication \ diff --git a/packaging/aur/kst4contest-git/PKGBUILD b/packaging/aur/kst4contest-git/PKGBUILD index 4452949..bd00963 100644 --- a/packaging/aur/kst4contest-git/PKGBUILD +++ b/packaging/aur/kst4contest-git/PKGBUILD @@ -37,6 +37,7 @@ build() { jpackage \ --type app-image \ --name KST4Contest \ + --icon packaging/icons/kst4contest.png \ --input target/dist-libs \ --main-jar app.jar \ --main-class kst4contest.view.Kst4ContestApplication \ diff --git a/packaging/aur/kst4contest/.SRCINFO b/packaging/aur/kst4contest/.SRCINFO index e077129..b58256b 100644 --- a/packaging/aur/kst4contest/.SRCINFO +++ b/packaging/aur/kst4contest/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = kst4contest pkgdesc = ON4KST Chat Client for VHF/UHF contest operation pkgver = 1.41.1 - pkgrel = 1 + pkgrel = 2 url = https://github.com/praktimarc/kst4contest arch = x86_64 license = GPL-3.0-only diff --git a/packaging/aur/kst4contest/PKGBUILD b/packaging/aur/kst4contest/PKGBUILD index 7ce00d8..fd46c98 100644 --- a/packaging/aur/kst4contest/PKGBUILD +++ b/packaging/aur/kst4contest/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Wagner pkgname=kst4contest pkgver=1.41.1 -pkgrel=1 +pkgrel=2 pkgdesc="ON4KST Chat Client for VHF/UHF contest operation" arch=('x86_64') url="https://github.com/praktimarc/kst4contest" @@ -34,9 +34,17 @@ build() { else ADD_MODULES="$(sed -n 's:.*\(.*\).*:\1:p' pom.xml | paste -sd,)" fi + # Same story for the packaging icon: without --icon jpackage silently ships + # its own Duke placeholder, but tarballs older than v1.42.0 have no icon to + # point at, so only pass the flag when the file is actually there. + ICON_ARGS=() + if [ -f packaging/icons/kst4contest.png ]; then + ICON_ARGS=(--icon packaging/icons/kst4contest.png) + fi jpackage \ --type app-image \ --name KST4Contest \ + "${ICON_ARGS[@]}" \ --input target/dist-libs \ --main-jar app.jar \ --main-class kst4contest.view.Kst4ContestApplication \ diff --git a/packaging/icons/kst4contest.icns b/packaging/icons/kst4contest.icns index 3523178..40e7e7b 100644 Binary files a/packaging/icons/kst4contest.icns and b/packaging/icons/kst4contest.icns differ diff --git a/packaging/icons/kst4contest.ico b/packaging/icons/kst4contest.ico index 1540fd8..0485aac 100644 Binary files a/packaging/icons/kst4contest.ico and b/packaging/icons/kst4contest.ico differ diff --git a/packaging/icons/kst4contest.png b/packaging/icons/kst4contest.png index 7cd97c5..9df649b 100644 Binary files a/packaging/icons/kst4contest.png and b/packaging/icons/kst4contest.png differ diff --git a/packaging/icons/kst4contest.svg b/packaging/icons/kst4contest.svg new file mode 100644 index 0000000..077f851 --- /dev/null +++ b/packaging/icons/kst4contest.svg @@ -0,0 +1,9 @@ + + + KST + + + + + + \ No newline at end of file diff --git a/src/main/resources/icons/kst4contest.icns b/src/main/resources/icons/kst4contest.icns index 3523178..40e7e7b 100644 Binary files a/src/main/resources/icons/kst4contest.icns and b/src/main/resources/icons/kst4contest.icns differ diff --git a/src/main/resources/icons/kst4contest.ico b/src/main/resources/icons/kst4contest.ico index 1540fd8..0485aac 100644 Binary files a/src/main/resources/icons/kst4contest.ico and b/src/main/resources/icons/kst4contest.ico differ diff --git a/src/main/resources/icons/kst4contest.png b/src/main/resources/icons/kst4contest.png index 7cd97c5..9df649b 100644 Binary files a/src/main/resources/icons/kst4contest.png and b/src/main/resources/icons/kst4contest.png differ