Update to 12.5, add autoexec_server.cfg and use provided icons and .desktop files for the client

2 files changed, 12 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 73bafb32a01b..fe0e9067efb2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ddnet-git
 	pkgdesc = DDraceNetwork, a cooperative racing mod of Teeworlds
-	pkgver = 12.1.r32.g826a7781a
+	pkgver = 12.5.r15.g9c9264db8
 	pkgrel = 1
 	url = https://ddnet.tw
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 3fa2e351d276..9ea0fe4c2ae7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Rafael Fontenelle <rafaelff@gnome.org>
 
 pkgname=ddnet-git
-pkgver=12.1.r32.g826a7781a
+pkgver=12.5.r15.g9c9264db8
 pkgrel=1
 pkgdesc="DDraceNetwork, a cooperative racing mod of Teeworlds"
 arch=('x86_64')
@@ -41,24 +41,19 @@ prepare() {
     cd prep
 
       # Extract icons in .png from .ico (name must be lowercase)
-    convert ../ddnet/other/icons/DDNet-Server.ico ddnet-server.png
-    convert ../ddnet/other/icons/DDNet.ico        ddnet.png
-
-      # Generate .desktop files
-    gendesk --pkgname="DDNet" --pkgdesc="DDNet"           \
-            --icon="ddnet" --categories="Game;ArcadeGame" \
-            --mimetypes="x-scheme-handler/ddnet"          \
-            --exec="DDNet %u"
+    convert ../DDNet-$pkgver/other/icons/DDNet-Server.ico ddnet-server.png
+
+      # Generate the server .desktop file
     gendesk --pkgname="DDNet-Server" --name="DDNet Server"          \
             --pkgdesc="DDNet Server" --terminal=true                \
             --icon="ddnet-server"    --categories="Game;ArcadeGame" \
-            --exec='sh -c "cd /usr/share/ddnet/data && DDNet-Server"'
+            --exec='sh -c "DDNet-Server -f /usr/share/ddnet/autoexec_server.cfg"'
 
       # Create icon files' structure, for installing in package(). How:
       # For each png file, check its dimensions (e.g. 128 x 128) using
       # the output of 'file' command. Then double-check the 's' as a
       # number, then install it into  a "size/filename.png" notation
-    for f in ddnet-?.png ddnet-server-?.png; do
+    for f in ddnet-server-?.png; do
         s=$(file $f | cut -d' ' -f5)
         if [ ! -z "${s##*[!0-9]*}" ]; then
             install -Dm644 $f ${s}x${s}/apps/${f/-[0-9]/}
@@ -67,6 +62,7 @@ prepare() {
     done
 }
 
+
 build() {
     cd build
     cmake ../ddnet                  \
@@ -88,7 +84,6 @@ package() {
 
       # Install desktop files and folder
     install -dvm755 "$pkgdir/usr/share/applications/"
-    install -vm644 prep/DDNet.desktop        "$pkgdir/usr/share/applications/"
     install -vm644 prep/DDNet-Server.desktop "$pkgdir/usr/share/applications/"
 
       # Install icon files and folders
@@ -96,6 +91,10 @@ package() {
         install -Dvm644 $f "$pkgdir/usr/share/icons/hicolor"/${f/prep\/}
     done
 
+      # Install Server default configuration file
+    install -dvm755 "$pkgdir/usr/share/ddnet/"
+    install -vm644 DDNet-$pkgver/autoexec_server.cfg "$pkgdir/usr/share/ddnet/"
+
       # Install license file
     install -dvm755 "$pkgdir/usr/share/licenses/$pkgname/"
     install -vm644 ddnet/license.txt  "$pkgdir/usr/share/licenses/$pkgname/"