Update to 11.1.8

Also remove image conversion and desktop file generation,
add the respective pre-converted and pre-generated files.

6 files changed, 48 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a0a6af2be76b..0f24c887c20c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ddnet
 	pkgdesc = DDraceNetwork, a mod of Teeworlds
-	pkgver = 11.1.4
+	pkgver = 11.1.8
 	pkgrel = 1
 	url = https://ddnet.tw
 	arch = x86_64
@@ -8,8 +8,6 @@ pkgbase = ddnet
 	license = CCPL:by-nc-sa
 	checkdepends = gtest
 	makedepends = cmake
-	makedepends = imagemagick
-	makedepends = gendesk
 	makedepends = python
 	depends = alsa-lib
 	depends = sdl2
@@ -23,8 +21,16 @@ pkgbase = ddnet
 	provides = teeworlds-ddnet
 	conflicts = teeworlds-ddnet
 	replaces = teeworlds-ddnet
-	source = https://ddnet.tw/downloads/DDNet-11.1.4.tar.xz
-	sha256sums = 3654c730814fab5c8a5a541c143429b2b6259005b3c6f75eaec0e527ccd1f605
+	source = https://ddnet.tw/downloads/DDNet-11.1.8.tar.xz
+	source = ddnet.desktop
+	source = ddnet-server.desktop
+	source = DDNet.png
+	source = DDNet-Server.png
+	sha256sums = f8116f074d19fbd953ebd8fa204c63d5665a20120a6c71f81e793fb78e1243c2
+	sha256sums = fc8c27e129f92c5dddf96a079306a2439c8cc14d4b8ce719c5fa2f59aceee367
+	sha256sums = fc8c27e129f92c5dddf96a079306a2439c8cc14d4b8ce719c5fa2f59aceee367
+	sha256sums = 1dc83efd9fdab2597fc4d41358628422a9550d4d23b60d273f2f30cf7b76dfaa
+	sha256sums = e4083f1c40569146caabd21b8f24fdd7862e2f3040552e9c6a260df603249274
 
 pkgname = ddnet
 
diff --git a/DDNet-Server.png b/DDNet-Server.png
new file mode 100644
index 000000000000..45d0c2217960
--- /dev/null
+++ b/DDNet-Server.png
diff --git a/DDNet.png b/DDNet.png
new file mode 100644
index 000000000000..c31756d360dd
--- /dev/null
+++ b/DDNet.png
diff --git a/PKGBUILD b/PKGBUILD
index 7dd6c5964b52..a221d977aba4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,33 @@
 # Maintainer: Rafael Fontenelle <rafaelff@gnome.org>
 
 pkgname=ddnet
-pkgver=11.1.4
+pkgver=11.1.8
 pkgrel=1
 pkgdesc="DDraceNetwork, a mod of Teeworlds"
 arch=('x86_64')
 url="https://ddnet.tw"
 license=('custom:BSD' 'CCPL:by-nc-sa')
 depends=('alsa-lib' 'sdl2' 'freetype2' 'opusfile' 'curl' 'glew' 'wavpack')
-makedepends=('cmake' 'imagemagick' 'gendesk' 'python')
+makedepends=('cmake' 'python')
 checkdepends=('gtest')
 optdepends=('ddnet-skins: more skins for your tee'
             'ddnet-maps-git: have all DDNet maps available offline')
 provides=('teeworlds-ddnet')
 conflicts=('teeworlds-ddnet')
 replaces=('teeworlds-ddnet')
-source=("https://ddnet.tw/downloads/DDNet-$pkgver.tar.xz")
-sha256sums=('3654c730814fab5c8a5a541c143429b2b6259005b3c6f75eaec0e527ccd1f605')
+source=("https://ddnet.tw/downloads/DDNet-$pkgver.tar.xz"
+        'ddnet.desktop' 'ddnet-server.desktop'
+        'DDNet.png' 'DDNet-Server.png')
+sha256sums=('f8116f074d19fbd953ebd8fa204c63d5665a20120a6c71f81e793fb78e1243c2'
+            'fc8c27e129f92c5dddf96a079306a2439c8cc14d4b8ce719c5fa2f59aceee367'
+            'fc8c27e129f92c5dddf96a079306a2439c8cc14d4b8ce719c5fa2f59aceee367'
+            '1dc83efd9fdab2597fc4d41358628422a9550d4d23b60d273f2f30cf7b76dfaa'
+            'e4083f1c40569146caabd21b8f24fdd7862e2f3040552e9c6a260df603249274')
 
-prepare() {
+build() {
     [ -d build ] && rm -rf build
     mkdir build
-    cd build
-
-      # Client
-    convert "../DDNet-$pkgver/other/icons/DDNet.ico" DDNet.png
-    gendesk -f -n --pkgname "DDNet" --pkgdesc "$pkgdesc" \
-        --name 'DDNet' --categories 'Game;ArcadeGame'
 
-      # Server
-      # Requires 'ddnet-maps-git' package for using DDNet maps
-      # Requires a mysql-like database package for score/ranking
-    convert "../DDNet-$pkgver/other/icons/DDNet-Server.ico" DDNet-Server.png
-    gendesk -f -n --pkgname "DDNet-Server" --pkgdesc "DDNet Server"          \
-        --name 'DDNet Server' --categories 'Game;ArcadeGame' --terminal=true \
-        --exec='sh -c "cd /usr/share/ddnet/data && DDNet-Server"'
-}
-
-build() {
     cd build
     cmake ../DDNet-$pkgver -DCMAKE_BUILD_TYPE=Release
     make all tools
@@ -83,10 +73,12 @@ package() {
     rm -rf "$pkgdir/usr/share/ddnet/data/languages/scripts/"
 
       # Install desktop and icon files
-    install -Dm644 DDNet.desktop        "$pkgdir/usr/share/applications/ddnet.desktop"
-    install -Dm644 DDNet-Server.desktop "$pkgdir/usr/share/applications/ddnet-server.desktop"
-    install -Dm644 DDNet-5.png          "$pkgdir/usr/share/pixmaps/DDNet.png"
-    install -Dm644 DDNet-Server-8.png   "$pkgdir/usr/share/pixmaps/DDNet-Server.png"
+    install -d -m755 "$pkgdir/usr/share/applications/"
+    install -d -m755 "$pkgdir/usr/share/pixmaps/"
+    install -m644 "$srcdir/ddnet.desktop"        "$pkgdir/usr/share/applications/"
+    install -m644 "$srcdir/ddnet-server.desktop" "$pkgdir/usr/share/applications/"
+    install -m644 "$srcdir/DDNet.png"            "$pkgdir/usr/share/pixmaps/"
+    install -m644 "$srcdir/DDNet-Server.png"     "$pkgdir/usr/share/pixmaps/"
 
       # Install license files
     install -Dm644 ../DDNet-$pkgver/license.txt "$pkgdir/usr/share/licenses/$pkgname/license.txt"
diff --git a/ddnet-server.desktop b/ddnet-server.desktop
new file mode 100644
index 000000000000..995d541bcaaa
--- /dev/null
+++ b/ddnet-server.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=DDNet Server
+Comment=DDNet Server
+Exec=sh -c "cd /usr/share/ddnet/data && DDNet-Server"
+Icon=DDNet-Server
+Terminal=true
+StartupNotify=false
+Categories=Game;ArcadeGame;
diff --git a/ddnet.desktop b/ddnet.desktop
new file mode 100644
index 000000000000..995d541bcaaa
--- /dev/null
+++ b/ddnet.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=DDNet Server
+Comment=DDNet Server
+Exec=sh -c "cd /usr/share/ddnet/data && DDNet-Server"
+Icon=DDNet-Server
+Terminal=true
+StartupNotify=false
+Categories=Game;ArcadeGame;