upgpkg: blockbench 4.6.4-1

Adopt package

Signed-off-by: txtsd <code@ihavea.quest>

4 files changed, 58 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74fe3cbaed71..14a2457bff43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,18 @@
 pkgbase = blockbench
-	pkgdesc = A free, modern block model editor.
-	pkgver = 4.0.3
+	pkgdesc = A low-poly 3D model editor
+	pkgver = 4.6.4
 	pkgrel = 1
 	url = https://blockbench.net/
 	arch = x86_64
-	license = MIT
-	depends = gtk3
-	depends = libnotify
-	depends = nss
-	depends = libxss
-	depends = libxtst
-	depends = xdg-utils
-	depends = at-spi2-core
-	depends = libutil-linux
-	depends = libappindicator-gtk3
-	depends = libsecret
-	source = https://github.com/JannisX11/blockbench/releases/download/v4.0.3/Blockbench_4.0.3.deb
-	sha512sums = bbc6ccef6438d09e89dba276ee22c6ea8fb94171dbadecdce4dae5c0e35723236defa4bb5b2e25625c73b565cef9dd13253bf3c8acd6944c8dd6e0bcccbe7dbc
+	license = GPL3
+	makedepends = git
+	makedepends = npm
+	depends = electron
+	provides = blockbench
+	conflicts = blockbench
+	source = blockbench::git+https://github.com/JannisX11/blockbench.git#tag=v4.6.4
+	source = blockbench.desktop
+	sha256sums = SKIP
+	sha256sums = 74731a9f68dbef112c93dafee1a1a8665b9de0816f94643169419ad838dbf66c
 
 pkgname = blockbench
diff --git a/.gitignore b/.gitignore
index c9374ee2c96b..5d6a7618e801 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.pkg*
 src
 pkg
+blockbench
diff --git a/PKGBUILD b/PKGBUILD
index 685cc575a872..2371f88140d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,47 @@
-# Maintainer: mrAppleXZ <mr.applexz@gmail.com> 
+# Maintainer: txtsd <aur.archlinux@ihavea.quest>
+# Contributor: mrAppleXZ <mr.applexz@gmail.com> 
 
 pkgname=blockbench
-pkgname_orig=Blockbench
-pkgver=4.0.3
+_pkgname=Blockbench
+pkgver=4.6.4
 pkgrel=1
-pkgdesc="A free, modern block model editor."
+pkgdesc="A low-poly 3D model editor"
 arch=('x86_64')
 url="https://blockbench.net/"
-license=('MIT')
-depends=('gtk3' 'libnotify' 'nss' 'libxss' 'libxtst' 'xdg-utils' 'at-spi2-core' 'libutil-linux' 'libappindicator-gtk3' 'libsecret')
-source=("https://github.com/JannisX11/blockbench/releases/download/v${pkgver}/Blockbench_${pkgver}.deb")
-sha512sums=('bbc6ccef6438d09e89dba276ee22c6ea8fb94171dbadecdce4dae5c0e35723236defa4bb5b2e25625c73b565cef9dd13253bf3c8acd6944c8dd6e0bcccbe7dbc')
+license=('GPL3')
+depends=('electron')
+provides=(blockbench)
+conflicts=(blockbench)
 
-package() {
-  msg2 "Extracting the data.tar.xz..."
-  bsdtar -xf data.tar.xz -C "$pkgdir/"
+_pkgname=blockbench
+_electron=electron
+_electronDist=/usr/lib/${_electron}
+_electronVersion=$(cat ${_electronDist}/version)
 
-  msg2 "Moving the files..."
-  mv "${pkgdir}/opt/${pkgname_orig}" "${pkgdir}/opt/${pkgname}"
+depends=("${_electron}")
+makedepends=(git npm)
+source=("${_pkgname}::git+https://github.com/JannisX11/blockbench.git#tag=v${pkgver}"
+        "${_pkgname}.desktop")
+sha256sums=('SKIP'
+            '74731a9f68dbef112c93dafee1a1a8665b9de0816f94643169419ad838dbf66c')
 
-  mkdir -p "${pkgdir}/usr/share/pixmaps/"
-  mv "${pkgdir}/usr/share/icons/hicolor/0x0/apps/blockbench.png" "${pkgdir}/usr/share/pixmaps/"
-  rm -r "${pkgdir}/usr/share/icons"
+prepare() {
+  cd "${srcdir}/${_pkgname}"
+  npm install
+}
 
-  sed -i "s:/opt/${pkgname_orig}:/opt/${pkgname}:" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+build() {
+  cd "${srcdir}/${_pkgname}"
+  npm run dist -- --linux --x64 --dir -c.electronDist=${_electronDist} -c.electronVersion=${_electronVersion}
+}
 
-  mkdir -p "${pkgdir}/usr/bin"
-  ln -s "/opt/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+package() {
+  install -d "${pkgdir}/usr/"{bin,share/{pixmaps,applications}}
+  install -d "${pkgdir}/${_electronDist}/resources"
+  echo -e "#!/bin/bash\nexec ${_electron} ${_electronDist}/resources/${_pkgname}.asar \"\$@\"" > "${pkgdir}/usr/bin/${_pkgname}"
+  chmod 755 "${pkgdir}/usr/bin/${_pkgname}"
+  install "${srcdir}/${_pkgname}/icon.png" "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
+  install "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+  install "${srcdir}/${_pkgname}/dist/linux-unpacked/resources/app.asar" "${pkgdir}/${_electronDist}/resources/${_pkgname}.asar"
+  cp -r "${srcdir}/${_pkgname}/dist/linux-unpacked/resources/app.asar.unpacked" "${pkgdir}/${_electronDist}/resources/${_pkgname}.asar.unpacked"
 }
diff --git a/blockbench.desktop b/blockbench.desktop
new file mode 100644
index 000000000000..67a7d6069e48
--- /dev/null
+++ b/blockbench.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Blockbench
+Exec=/usr/bin/blockbench %f
+Terminal=false
+Type=Application
+Icon=blockbench
+StartupWMClass=Blockbench
+Comment=Low-poly modeling and animation software
+Categories=Graphics|3DGraphics;