upgpkg: gdlauncher-bin 2.0.9-1

4 files changed, 109 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aaaeb527b164..10c27dca1fc9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,39 @@
 pkgbase = gdlauncher-bin
-	pkgdesc = GDLauncher is simple, yet powerful Minecraft custom launcher with a strong focus on the user experience
-	pkgver = 1.1.30
+	pkgdesc = A simple, yet powerful Minecraft custom launcher with a strong focus on the user experience (binary release)
+	pkgver = 2.0.9
 	pkgrel = 1
-	url = https://gdevs.io
+	url = https://gdlauncher.com
 	arch = x86_64
-	license = GPL3
-	makedepends = tar
-	makedepends = xz
-	depends = libnotify
-	depends = libxss
-	depends = libxtst
-	depends = libindicator-gtk3
-	depends = libappindicator-gtk3
+	license = BUSL-1.1
 	provides = gdlauncher
 	conflicts = gdlauncher
-	conflicts = gdlauncher-beta
-	conflicts = gdlauncher-beta-bin
-	conflicts = gdlauncher-appimage
-	conflicts = gdlauncher-git
-	conflicts = gdlauncher-classic
-	source_x86_64 = GDLauncher-1.1.30.deb::https://github.com/gorilla-devs/GDLauncher/releases/download/v1.1.30/GDLauncher-linux-setup.deb
-	md5sums_x86_64 = 1253e2cdb07104000094f16df1d55cdb
+	source = gdlauncher-bin-2.0.9.AppImage::https://cdn-raw.gdl.gg/launcher/GDLauncher__2.0.9__linux__x64.AppImage
+	source = LICENSE::https://raw.githubusercontent.com/gorilla-devs/GDLauncher-Carbon/develop/LICENSE
+	b2sums = c204a57f936b0aacf3d63f5df47b77e33c29ee7ad19d9a92a14024eee08187fe701356f3ded6445f09da9ed2f69cb1ff32f5f03373fcd87b5ec886bae3f55738
+	b2sums = 93aed8a6736b73bc8ce08847d9dc895c0e14310125811ea43fbfe9977faa186c4d8f8ffcf88a2a17ab8ae34ab82e1ffbe84e1c590456d4bef46e552b5f80cee7
 
 pkgname = gdlauncher-bin
+	depends = alsa-lib
+	depends = at-spi2-core
+	depends = cairo
+	depends = dbus
+	depends = expat
+	depends = gcc-libs
+	depends = glib2
+	depends = glibc
+	depends = gtk3
+	depends = hicolor-icon-theme
+	depends = libcups
+	depends = libdrm
+	depends = libx11
+	depends = libxcomposite
+	depends = libxdamage
+	depends = libxext
+	depends = libxfixes
+	depends = libxkbcommon
+	depends = libxrandr
+	depends = libxcb
+	depends = mesa
+	depends = nspr
+	depends = nss
+	depends = pango
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index fae8897c8eb6..000000000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-* eol=lf
diff --git a/.gitignore b/.gitignore
index f2f39317e0b5..4367ae4a50ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-GDLauncher-*.deb
-gdlauncher-bin-*-x86_64.pkg.tar.zst
-.directory
-pkg
-src
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index a3b9309981a9..ee12be52dff0 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,81 @@
-# Maintainer: S Stewart <tda@null.net>
-# Maintainer: Cranky Supertoon <crankysupertoon@gmail.com>
-# Special thanks to RyanTheAllmighty for making hyper-appimage
-pkgname="gdlauncher-bin"
-_pkgname="gdlauncher"
-pkgver="1.1.30"
+# Maintainer: Ivan Gabaldon <aur[at]inetol.net>
+# Contributor: S Stewart <tda@null.net>
+# Contributor: Cranky Supertoon <crankysupertoon@gmail.com>
+
+pkgname=gdlauncher-bin
+pkgver=2.0.9
 pkgrel=1
+pkgdesc='A simple, yet powerful Minecraft custom launcher with a strong focus on the user experience (binary release)'
 arch=('x86_64')
-pkgdesc="GDLauncher is simple, yet powerful Minecraft custom launcher with a strong focus on the user experience"
-url="https://gdevs.io"
-license=('GPL3')
-makedepends=('tar' 'xz')
-depends=('libnotify' 'libxss' 'libxtst' 'libindicator-gtk3' 'libappindicator-gtk3')
-provides=('gdlauncher')
-conflicts=('gdlauncher' 'gdlauncher-beta' 'gdlauncher-beta-bin' 'gdlauncher-appimage' 'gdlauncher-git' 'gdlauncher-classic')
-source_x86_64=("GDLauncher-${pkgver}.deb::https://github.com/gorilla-devs/GDLauncher/releases/download/v${pkgver}/GDLauncher-linux-setup.deb")
-md5sums_x86_64=('1253e2cdb07104000094f16df1d55cdb')
+url=https://gdlauncher.com
+license=('BUSL-1.1')
+provides=("${pkgname//-bin}")
+conflicts=("${pkgname//-bin}")
+source=("$pkgname-$pkgver.AppImage::https://cdn-raw.gdl.gg/launcher/GDLauncher__${pkgver}__linux__x64.AppImage"
+        "LICENSE::https://raw.githubusercontent.com/gorilla-devs/GDLauncher-Carbon/develop/LICENSE")
+b2sums=('c204a57f936b0aacf3d63f5df47b77e33c29ee7ad19d9a92a14024eee08187fe701356f3ded6445f09da9ed2f69cb1ff32f5f03373fcd87b5ec886bae3f55738'
+        '93aed8a6736b73bc8ce08847d9dc895c0e14310125811ea43fbfe9977faa186c4d8f8ffcf88a2a17ab8ae34ab82e1ffbe84e1c590456d4bef46e552b5f80cee7')
+
+prepare() {
+    chmod +x "$pkgname-$pkgver.AppImage" && "./$pkgname-$pkgver.AppImage" --appimage-extract
+
+    # Convert
+    cd squashfs-root/
+
+    mv "@gddesktop" "${pkgname//-bin}"
+
+    mv "@gddesktop.desktop" "${pkgname//-bin}.desktop"
+    sed -i -e "s|Exec=.*|Exec=/usr/bin/${pkgname//-bin} --dummy-flag %U|" -e "s|Icon=.*|Icon=${pkgname//-bin}|" -e '/X-AppImage-Version=.*/d' "${pkgname//-bin}.desktop"
+
+    mv usr/share/icons/hicolor/0x0/apps/@gddesktop.png "${pkgname//-bin}.png"
+
+    cat ../LICENSE > LICENSE
+
+    rm -rf {usr/,"@gd"*,.DirIcon,AppRun}
+
+    find . -type d -exec chmod 755 {} \;
+    find . -type f -exec chmod 644 {} \;
+    chmod 755 {chrome-sandbox,chrome_crashpad_handler,"${pkgname//-bin}",*.so,*.so.*}
+    chmod 755 resources/{"app.asar.unpacked/node_modules/@sentry/cli-linux-x64/bin/sentry-cli",binaries/core_module,app.asar}
+}
 
 package() {
-    # Extract data folder from .deb archive
-    tar xf "${srcdir}/data.tar.xz" --directory=$pkgdir
+    depends=('alsa-lib'
+             'at-spi2-core'
+             'cairo'
+             'dbus'
+             'expat'
+             'gcc-libs'
+             'glib2'
+             'glibc'
+             'gtk3'
+             'hicolor-icon-theme'
+             'libcups'
+             'libdrm'
+             'libx11'
+             'libxcomposite'
+             'libxdamage'
+             'libxext'
+             'libxfixes'
+             'libxkbcommon'
+             'libxrandr'
+             'libxcb'
+             'mesa'
+             'nspr'
+             'nss'
+             'pango')
+
+    install -d "$pkgdir/opt/${pkgname//-bin}/"
+    cp -a squashfs-root/. "$pkgdir/opt/${pkgname//-bin}/"
+
+    install -d "$pkgdir/usr/bin/"
+    ln -s "/opt/${pkgname//-bin}/${pkgname//-bin}" "$pkgdir/usr/bin/${pkgname//-bin}"
 
-    # fix file permissions - all files as 644 - directories as 755
-    find "${pkgdir}/"{opt,usr} -type d -exec chmod 755 {} \;
-    find "${pkgdir}/"{opt,usr} -type f -exec chmod 644 {} \;
+    install -d "$pkgdir/usr/share/applications/"
+    ln -s "/opt/${pkgname//-bin}/${pkgname//-bin}.desktop" "$pkgdir/usr/share/applications/${pkgname//-bin}.desktop"
 
-    # make sure the main and 7za binary have the right permissions
-    chmod a+x "${pkgdir}/opt/GDLauncher/"{${_pkgname},7za}
+    install -d "$pkgdir/usr/share/icons/hicolor/2048x2048/apps/"
+    ln -s "/opt/${pkgname//-bin}/${pkgname//-bin}.png" "$pkgdir/usr/share/icons/hicolor/2048x2048/apps/${pkgname//-bin}.png"
 
-    # link the binary
-    install -d -m755 "${pkgdir}/usr/bin/"
-    ln -sr "${pkgdir}/opt/GDLauncher/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
+    install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/${pkgname//-bin}/"
 }