Added dependencies, major cleanup

3 files changed, 30 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c5703c5727d..86fbb309f4bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = veloren
 	pkgdesc = An open-world, open-source multiplayer voxel RPG
 	pkgver = 0.3.0
-	pkgrel = 6
+	pkgrel = 7
 	url = https://veloren.net/
 	arch = x86_64
 	arch = i686
@@ -9,6 +9,12 @@ pkgbase = veloren
 	makedepends = git
 	makedepends = git-lfs
 	makedepends = rustup
+	makedepends = cairo
+	makedepends = alsa-lib
+	makedepends = pango
+	makedepends = atk
+	makedepends = gdk-pixbuf2
+	depends = gtk3
 	provides = veloren
 	conflicts = veloren
 	noextract = veloren-voxygen.desktop
@@ -18,7 +24,7 @@ pkgbase = veloren
 	source = veloren-voxygen.desktop
 	source = voxygen.png
 	sha512sums = SKIP
-	sha512sums = 312439719c23326eee6c04b216c2a16219c3804bdb451b763eb726062a40f364e32f9c9a608086bb92dcb9b24d938a37f1f05229faf20602a9e1756219fcaad3
+	sha512sums = 27488b6d59c1f7cd397b9457ad32e7aedd5245559d6cdd02bb102747eb8bf24305b6671a994b8853be0ac49099982aa7e3ff43be527ffc1083bb02a94980b489
 	sha512sums = b5e5cbf28ab0e335f5a0fc93511fc9936360432a36e35cc876761601abacf257299deb0af6b3d9081143b700f6663c4f603970155dd4dacedb7a9672cde1dc94
 
 pkgname = veloren
diff --git a/PKGBUILD b/PKGBUILD
index 3ad70d17df70..fce7a179b4b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,61 +1,48 @@
 # Maintainer: Mckol <mckol363@gmail.com>
+# Contributor: Jean Lucas <jean@4ray.co>
 
-export GIT_LFS_SKIP_SMUDGE=1
+export GIT_LFS_SKIP_SMUDGE=1 # This is to prevent Git LFS errors 
 pkgname=veloren
 pkgver=0.3.0
-pkgrel=6
-pkgdesc="An open-world, open-source multiplayer voxel RPG"
+pkgrel=7
+pkgdesc='An open-world, open-source multiplayer voxel RPG'
 arch=('x86_64' 'i686')
-url="https://veloren.net/"
+url='https://veloren.net/'
 license=('GPL3')
-options=('!strip')
-depends=()
-makedepends=(
-    'git'
-    'git-lfs'
-    'rustup'
-)
+options=('!strip') # This makes debugging issues easier sometimes, comment out if small package size is needed
+depends=('gtk3')
+makedepends=('git' 'git-lfs' 'rustup' 'cairo' 'alsa-lib' 'pango' 'atk' 'gdk-pixbuf2')
 provides=("$pkgname")
 conflicts=("$pkgname")
-_repo_url="https://gitlab.com/veloren/veloren.git"
+_repo='https://gitlab.com/veloren/veloren.git'
 source=(
-    "$pkgname"::"git+$_repo_url#tag=v0.3.0"
-    "veloren-voxygen.desktop"
-    "voxygen.png"
+    "$pkgname"::"git+$_repo#tag=v$pkgver"
+    'veloren-voxygen.desktop'
+    'voxygen.png'
 )
-noextract=("veloren-voxygen.desktop" "voxygen.png")
+noextract=('veloren-voxygen.desktop' 'voxygen.png')
 sha512sums=('SKIP'
-            '312439719c23326eee6c04b216c2a16219c3804bdb451b763eb726062a40f364e32f9c9a608086bb92dcb9b24d938a37f1f05229faf20602a9e1756219fcaad3'
+            '27488b6d59c1f7cd397b9457ad32e7aedd5245559d6cdd02bb102747eb8bf24305b6671a994b8853be0ac49099982aa7e3ff43be527ffc1083bb02a94980b489'
             'b5e5cbf28ab0e335f5a0fc93511fc9936360432a36e35cc876761601abacf257299deb0af6b3d9081143b700f6663c4f603970155dd4dacedb7a9672cde1dc94')
 
 prepare() {
     unset GIT_LFS_SKIP_SMUDGE
     cd "$srcdir/$pkgname"
-    git remote set-url origin "$_repo_url"
+    git remote set-url origin "$_repo"
     git lfs install
     git lfs fetch
     git lfs checkout
 }
 
 build() {
-    cd "$srcdir/$pkgname/voxygen"
-    cargo build --release
-    cd "$srcdir/$pkgname/server-cli"
-    cargo build --release
+    cd "$srcdir/$pkgname"
+    cargo build --release --bin veloren-voxygen --bin veloren-server-cli
 }
 
 package() {
+    install -D "$srcdir/$pkgname/target/release/veloren-{voxygen,server-cli}" -t "$pkgdir/usr/bin"
     mkdir -p "$pkgdir/usr/share/veloren"
-    mkdir -p "$pkgdir/usr/bin"
-    cp -r "$srcdir/$pkgname/assets" "$pkgdir/usr/share/veloren/"
-    cp -r "$srcdir/$pkgname/voxygen/shaders" "$pkgdir/usr/share/veloren/"
-    cp "$srcdir/$pkgname/target/release/veloren-voxygen" "$pkgdir/usr/bin/"
-    chmod +x "$pkgdir/usr/bin/veloren-voxygen"
-    cp "$srcdir/$pkgname/target/release/veloren-server-cli" "$pkgdir/usr/bin/"
-    chmod +x "$pkgdir/usr/bin/veloren-server-cli"
-
-    mkdir -p "$pkgdir/usr/share/pixmaps"
-    mkdir -p "$pkgdir/usr/share/applications"
-    cp "$srcdir/veloren-voxygen.desktop" "$pkgdir/usr/share/applications"
-    cp "$srcdir/voxygen.png" "$pkgdir/usr/share/pixmaps/"
+    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/"
 }
diff --git a/veloren-voxygen.desktop b/veloren-voxygen.desktop
index f0b0a0d08771..97dc4ad07973 100755
--- a/veloren-voxygen.desktop
+++ b/veloren-voxygen.desktop
@@ -1,12 +1,10 @@
 [Desktop Entry]
-Version=1.2
 Type=Application
 Name=Voxygen
-Comment=Official Veloren Client
+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
-Hidden=false