Cleaned up everything and added dependencies

1 files changed, 20 insertions, 33 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6316f271fd3d..96967e04f51f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,26 +6,22 @@ pkgver=0.3.0
 pkgrel=1
 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'
-)
-provides=("$pkgname")
-conflicts=("$pkgname" "veloren")
-_repo_url="https://gitlab.com/veloren/veloren.git"
+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" 'veloren')
+conflicts=("$pkgname" 'veloren')
+_repo='https://gitlab.com/veloren/veloren.git'
 source=(
-    "$pkgname"::"git+$_repo_url"
-    "veloren-voxygen.desktop"
-    "voxygen.png"
+    "$pkgname"::"git+$_repo"
+    'veloren-voxygen.desktop'
+    'voxygen.png'
 )
-noextract=("veloren-voxygen.desktop" "voxygen.png")
+noextract=('veloren-voxygen.desktop' 'voxygen.png')
 sha512sums=('SKIP'
-            'fac3e0f636e691b872cd68e3b67af021ee748da96246ba38543570b092bbf9dab686d62f838fafa50ce407ac39fe0710420148c424fd526873a05a259158d2d9'
+            '27488b6d59c1f7cd397b9457ad32e7aedd5245559d6cdd02bb102747eb8bf24305b6671a994b8853be0ac49099982aa7e3ff43be527ffc1083bb02a94980b489'
             'b5e5cbf28ab0e335f5a0fc93511fc9936360432a36e35cc876761601abacf257299deb0af6b3d9081143b700f6663c4f603970155dd4dacedb7a9672cde1dc94')
 
 pkgver() {
@@ -36,31 +32,22 @@ pkgver() {
 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" -t "$pkgdir/usr/bin"
+    install -D "$srcdir/$pkgname/target/release/veloren-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/"
 }