Fixed clean chroot build, now using upstream desktop entry

4 files changed, 10 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4631f2fe8fe6..e7e85289ae4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = veloren-git
 	pkgdesc = An open-world, open-source multiplayer voxel RPG
-	pkgver = 0.8.0.r0.bce6e1c6e
+	pkgver = 0.8.0.r476.a5c76a6d3
 	pkgrel = 1
 	url = https://veloren.net/
 	arch = x86_64
 	arch = i686
 	license = GPL3
-	makedepends = systemd-libs
-	makedepends = alsa-lib
+	makedepends = systemd
 	makedepends = git
 	makedepends = git-lfs
 	makedepends = rustup
@@ -24,15 +23,9 @@ pkgbase = veloren-git
 	provides = veloren
 	conflicts = veloren-git
 	conflicts = veloren
-	noextract = veloren-voxygen.desktop
-	noextract = voxygen.png
 	options = !strip
 	source = veloren-git::git+https://gitlab.com/veloren/veloren.git
-	source = veloren-voxygen.desktop
-	source = voxygen.png
 	sha512sums = SKIP
-	sha512sums = 27488b6d59c1f7cd397b9457ad32e7aedd5245559d6cdd02bb102747eb8bf24305b6671a994b8853be0ac49099982aa7e3ff43be527ffc1083bb02a94980b489
-	sha512sums = b5e5cbf28ab0e335f5a0fc93511fc9936360432a36e35cc876761601abacf257299deb0af6b3d9081143b700f6663c4f603970155dd4dacedb7a9672cde1dc94
 
 pkgname = veloren-git
 
diff --git a/PKGBUILD b/PKGBUILD
index cdb390754536..b139f7babfda 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 export GIT_LFS_SKIP_SMUDGE=1
 pkgname=veloren-git
-pkgver=0.8.0.r0.bce6e1c6e
+pkgver=0.8.0.r476.a5c76a6d3
 pkgrel=1
 pkgdesc="An open-world, open-source multiplayer voxel RPG"
 arch=('x86_64' 'i686')
@@ -10,19 +10,13 @@ url='https://veloren.net/'
 license=('GPL3')
 options=('!strip') # This makes debugging issues easier sometimes, comment out if small package size is needed
 depends=('systemd-libs' 'alsa-lib' 'libxcb')
-makedepends=('systemd-libs' 'alsa-lib' 'git' 'git-lfs' 'rustup' 'cairo' 'pango' 'atk' 'gdk-pixbuf2' 'python' 'openssl')
+makedepends=('systemd' 'git' 'git-lfs' 'rustup' 'cairo' 'pango' 'atk' 'gdk-pixbuf2' 'python' 'openssl')
 provides=("$pkgname" 'veloren')
 conflicts=("$pkgname" 'veloren')
 _repo='https://gitlab.com/veloren/veloren.git'
-source=(
-    "$pkgname"::"git+$_repo"
-    'veloren-voxygen.desktop'
-    'voxygen.png'
-)
-noextract=('veloren-voxygen.desktop' 'voxygen.png')
-sha512sums=('SKIP'
-            '27488b6d59c1f7cd397b9457ad32e7aedd5245559d6cdd02bb102747eb8bf24305b6671a994b8853be0ac49099982aa7e3ff43be527ffc1083bb02a94980b489'
-            'b5e5cbf28ab0e335f5a0fc93511fc9936360432a36e35cc876761601abacf257299deb0af6b3d9081143b700f6663c4f603970155dd4dacedb7a9672cde1dc94')
+source=("$pkgname"::"git+$_repo")
+noextract=()
+sha512sums=('SKIP')
 
 pkgver() {
     cd "$srcdir/$pkgname"
@@ -48,6 +42,7 @@ package() {
     install -D "$srcdir/$pkgname/target/release/veloren-server-cli" -t "$pkgdir/usr/bin"
     mkdir -p "$pkgdir/usr/share/veloren"
     cp -a "$srcdir/$pkgname/assets" "$pkgdir/usr/share/veloren/"
-    install -D "$srcdir/veloren-voxygen.desktop" -t "$pkgdir/usr/share/applications"
-    install -Dm 644 "$srcdir/voxygen.png" -t "$pkgdir/usr/share/pixmaps/"
+    install -Dm 644 "$srcdir/$pkgname/assets/voxygen/net.veloren.veloren.desktop" -t "$pkgdir/usr/share/applications"
+    install -Dm 644 "$srcdir/$pkgname/assets/voxygen/net.veloren.veloren.png" -t "$pkgdir/usr/share/pixmaps/"
+    install -Dm 644 "$srcdir/$pkgname/assets/voxygen/net.veloren.veloren.metainfo.xml" -t "$pkgdir/usr/share/metainfo"
 }
diff --git a/veloren-voxygen.desktop b/veloren-voxygen.desktop
deleted file mode 100644
index 97dc4ad07973..000000000000
--- a/veloren-voxygen.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Voxygen
-Comment=Official client for Veloren - the open-world, open-source multiplayer voxel RPG
-Exec=veloren-voxygen
-Path=/tmp
-Categories=Game
-Keywords=veloren
-Icon=voxygen.png
-Terminal=true
diff --git a/voxygen.png b/voxygen.png
deleted file mode 100644
index 51c297966bc1..000000000000
--- a/voxygen.png
+++ /dev/null