diff --git a/.SRCINFO b/.SRCINFO index d0ba1f19ed493..94c277b986c35 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,22 +1,20 @@ pkgbase = hmcl-beta-bin pkgdesc = A Minecraft Launcher which is multi-functional, cross-platform and popular. - pkgver = 3.6.12.283 - pkgrel = 2 + pkgver = 3.6.14.286 + pkgrel = 1 url = https://github.com/huanghongxun/HMCL arch = any - license = GPL3 + license = GPL-3.0-or-later depends = java-runtime - depends = gtk2 + depends = hicolor-icon-theme provides = hmcl conflicts = hmcl - noextract = hmcl-beta-bin-3.6.12.283-2.sh + noextract = hmcl-beta-bin-3.6.14.286-1.sh source = hmcl.desktop - source = hmcl.png - source = LICENSE::https://raw.githubusercontent.com/HMCL-dev/HMCL/refs/heads/main/LICENSE - source = hmcl-beta-bin-3.6.12.283-2.sh::https://github.com/HMCL-dev/HMCL/releases/download/v3.6.12.283/HMCL-3.6.12.283.sh + source = hmcl-launch-script + source = hmcl-beta-bin-3.6.14.286-1.jar::https://github.com/HMCL-dev/HMCL/releases/download/v3.6.14.286/HMCL-3.6.14.286.jar sha256sums = ef5edb4285293c77162374e15f01f3540c7f511f6d9ab5b7244c4b01eb8512de - sha256sums = 29120471641c51aae3ee84f8bcc16e1e4148c153085f71ccb9680415007f82ad - sha256sums = 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 - sha256sums = bdfbf7f07e61dbbc161b9198711bb1802d854e824b440fe923610a6d74252dab + sha256sums = 296914106dac2d07c9ce2bc92a91568830534332e9bf7554ea591f22efa357df + sha256sums = b5646657a1abcbc8963067d7c17fe699b948c47fb27dbc18c512b2e3aa7086f1 pkgname = hmcl-beta-bin diff --git a/.gitignore b/.gitignore index 180b3d08a3ba1..5b235e54d76a9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ !PKGBUILD !.SRCINFO !hmcl.desktop -!hmcl.png +!hmcl-launch-script diff --git a/PKGBUILD b/PKGBUILD index a5fc05ce6de68..af2dbf7cbf6e4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,29 +2,44 @@ # Maintainer: Jia Yin pkgname=hmcl-beta-bin -pkgver=3.6.12.283 -pkgrel=2 +pkgver=3.6.14.286 +pkgrel=1 pkgdesc="A Minecraft Launcher which is multi-functional, cross-platform and popular." arch=('any') url="https://github.com/huanghongxun/HMCL" -license=('GPL3') -depends=('java-runtime' 'gtk2') +license=('GPL-3.0-or-later') +depends=('java-runtime' 'hicolor-icon-theme') provides=('hmcl') conflicts=('hmcl') source=("hmcl.desktop" - "hmcl.png" - "LICENSE::https://raw.githubusercontent.com/HMCL-dev/HMCL/refs/heads/main/LICENSE" - "${pkgname}-${pkgver}-${pkgrel}.sh::https://github.com/HMCL-dev/HMCL/releases/download/v${pkgver}/HMCL-${pkgver}.sh") + "hmcl-launch-script" + "${pkgname}-${pkgver}-${pkgrel}.jar::https://github.com/HMCL-dev/HMCL/releases/download/v${pkgver}/HMCL-${pkgver}.jar") sha256sums=('ef5edb4285293c77162374e15f01f3540c7f511f6d9ab5b7244c4b01eb8512de' - '29120471641c51aae3ee84f8bcc16e1e4148c153085f71ccb9680415007f82ad' - '3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986' - 'bdfbf7f07e61dbbc161b9198711bb1802d854e824b440fe923610a6d74252dab') + '296914106dac2d07c9ce2bc92a91568830534332e9bf7554ea591f22efa357df' + 'b5646657a1abcbc8963067d7c17fe699b948c47fb27dbc18c512b2e3aa7086f1') noextract=("${pkgname}-${pkgver}-${pkgrel}.sh") -package() { - install -Dm755 "${pkgname}-${pkgver}-${pkgrel}.sh" "${pkgdir}/usr/bin/${pkgname}" - install -Dm644 "hmcl.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -Dm644 "hmcl.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" - install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +prepare() { + # extract icons from jar + # Thanks to @Misaka13514 + local _iconfile + for _iconfile in icon.png icon@2x.png icon@4x.png icon@8x.png; do + jar -xf "${pkgname}-${pkgver}-${pkgrel}.jar" "assets/img/${_iconfile}" + done +} + +package() { + install -Dm644 "${pkgname}-${pkgver}-${pkgrel}.jar" "${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar" + install -Dm755 "hmcl-launch-script" "${pkgdir}/usr/bin/${pkgname}" + install -Dm644 "hmcl.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # install icons + local _icon _iconfile + for _icon in 32:icon.png 64:icon@2x.png 128:icon@4x.png 256:icon@8x.png; do + _iconfile=${_icon#*:} + _icon=${_icon%:*} + install -Dm644 "assets/img/${_iconfile}" "${pkgdir}/usr/share/icons/hicolor/${_icon}x${_icon}/apps/${pkgname}.png" + done } diff --git a/hmcl-launch-script b/hmcl-launch-script new file mode 100644 index 0000000000000..7bfd8a6338b76 --- /dev/null +++ b/hmcl-launch-script @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/java -jar '/usr/share/java/hmcl-beta-bin/hmcl-beta-bin.jar' "$@" diff --git a/hmcl.png b/hmcl.png deleted file mode 100644 index e07a90daa627e..0000000000000 Binary files a/hmcl.png and /dev/null differ