Update to 11.9, convert icons, gen desktop

Changes in this commit:
 - Update pkgver to 11.9
 - Update pkgdesc using text from the project's GitHub page
 - Remove icon and desktop files from source()
 - Extract icon files from their .ico files (requires imagemagick)
 - Generate .desktop files (requires gendesk)
 - Install icon files in /usr/share/icons/hicolor/ subdirectories
 - Run 'install' verbosely

6 files changed, 60 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 00aeab413c03..5fca902cc16c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ddnet
-	pkgdesc = DDraceNetwork, a mod of Teeworlds
-	pkgver = 11.8
+	pkgdesc = DDraceNetwork, a cooperative racing mod of Teeworlds
+	pkgver = 11.9
 	pkgrel = 1
 	url = https://ddnet.tw
 	arch = x86_64
@@ -9,6 +9,8 @@ pkgbase = ddnet
 	checkdepends = gtest
 	makedepends = cmake
 	makedepends = python
+	makedepends = imagemagick
+	makedepends = gendesk
 	depends = sdl2
 	depends = freetype2
 	depends = opusfile
@@ -17,16 +19,8 @@ pkgbase = ddnet
 	depends = wavpack
 	optdepends = ddnet-skins: more skins for your tee
 	optdepends = ddnet-maps-git: have all DDNet maps available offline
-	source = https://ddnet.tw/downloads/DDNet-11.8.tar.xz
-	source = ddnet.desktop
-	source = ddnet-server.desktop
-	source = DDNet.png
-	source = DDNet-Server.png
-	sha256sums = 638abfa2c71208935bb4f91aeddda1f7589437e000d5f0bb4524f2643c06e5b8
-	sha256sums = c60de83f47b5981e79dc0d028c1fe239c898f6319653b94bb74e578cf699a216
-	sha256sums = fc8c27e129f92c5dddf96a079306a2439c8cc14d4b8ce719c5fa2f59aceee367
-	sha256sums = 1dc83efd9fdab2597fc4d41358628422a9550d4d23b60d273f2f30cf7b76dfaa
-	sha256sums = e4083f1c40569146caabd21b8f24fdd7862e2f3040552e9c6a260df603249274
+	source = https://ddnet.tw/downloads/DDNet-11.9.tar.xz
+	sha256sums = 25a8982c7a5ad3bb5ceb9daab42f5f33ab48fd2d51b22073b838405715211bb3
 
 pkgname = ddnet
 
diff --git a/DDNet-Server.png b/DDNet-Server.png
deleted file mode 100644
index 45d0c2217960..000000000000
--- a/DDNet-Server.png
+++ /dev/null
diff --git a/DDNet.png b/DDNet.png
deleted file mode 100644
index c31756d360dd..000000000000
--- a/DDNet.png
+++ /dev/null
diff --git a/PKGBUILD b/PKGBUILD
index bacc4588f98f..c85fee29e08e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,56 @@
 # Maintainer: Rafael Fontenelle <rafaelff@gnome.org>
 
 pkgname=ddnet
-pkgver=11.8
+pkgver=11.9
 pkgrel=1
-pkgdesc="DDraceNetwork, a mod of Teeworlds"
+pkgdesc="DDraceNetwork, a cooperative racing mod of Teeworlds"
 arch=('x86_64')
 url="https://ddnet.tw"
 license=('custom:BSD' 'CCPL:by-nc-sa')
 depends=('sdl2' 'freetype2' 'opusfile' 'curl' 'glew' 'wavpack')
-makedepends=('cmake' 'python')
+makedepends=('cmake' 'python' 'imagemagick' 'gendesk')
 checkdepends=('gtest')
 optdepends=('ddnet-skins: more skins for your tee'
             'ddnet-maps-git: have all DDNet maps available offline')
-source=("https://ddnet.tw/downloads/DDNet-$pkgver.tar.xz"
-        'ddnet.desktop' 'ddnet-server.desktop'
-        'DDNet.png' 'DDNet-Server.png')
-sha256sums=('638abfa2c71208935bb4f91aeddda1f7589437e000d5f0bb4524f2643c06e5b8'
-            'c60de83f47b5981e79dc0d028c1fe239c898f6319653b94bb74e578cf699a216'
-            'fc8c27e129f92c5dddf96a079306a2439c8cc14d4b8ce719c5fa2f59aceee367'
-            '1dc83efd9fdab2597fc4d41358628422a9550d4d23b60d273f2f30cf7b76dfaa'
-            'e4083f1c40569146caabd21b8f24fdd7862e2f3040552e9c6a260df603249274')
+source=("https://ddnet.tw/downloads/DDNet-$pkgver.tar.xz")
+sha256sums=('25a8982c7a5ad3bb5ceb9daab42f5f33ab48fd2d51b22073b838405715211bb3')
 
-build() {
+prepare() {
     [ -d build ] && rm -rf build
-    mkdir build
+    mkdir -p build/prep
+    cd build/prep
+
+      # Extract icons in .png from .ico (name must be lowercase)
+    convert ../../DDNet-$pkgver/other/icons/DDNet-Server.ico ddnet-server.png
+    convert ../../DDNet-$pkgver/other/icons/DDNet.ico        ddnet.png
+
+      # Generate .desktop files
+    gendesk --pkgname="DDNet" --pkgdesc="DDNet" \
+            --icon="ddnet" --categories="Game;ArcadeGame"
+    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"'
+
+      # 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
+        s=$(file $f | cut -d' ' -f5)
+        if [ ! -z "${s##*[!0-9]*}" ]; then
+            install -Dm644 $f ${s}x${s}/apps/${f/-[0-9]/}
+            rm $f
+        fi
+    done
+}
 
+build() {
     cd build
-    cmake ../DDNet-$pkgver        \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DAUTOUPDATE=OFF
+    cmake ../DDNet-$pkgver          \
+        -DCMAKE_BUILD_TYPE=Release  \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DAUTOUPDATE=OFF
     make all tools
 }
 
@@ -38,17 +59,20 @@ check() {
 }
 
 package() {
-    make install DESTDIR="$pkgdir" -C build
-
-      # Install desktop and icon files
-    install -d -m755 "$pkgdir/usr/share/applications/"
-    install -d -m755 "$pkgdir/usr/share/pixmaps/"
-    install -m644 ddnet.desktop        "$pkgdir/usr/share/applications/"
-    install -m644 ddnet-server.desktop "$pkgdir/usr/share/applications/"
-    install -m644 DDNet.png            "$pkgdir/usr/share/pixmaps/"
-    install -m644 DDNet-Server.png     "$pkgdir/usr/share/pixmaps/"
-
-      # Install license files
-    install -d -m755 "$pkgdir/usr/share/licenses/$pkgname/"
-    install -Dm644 DDNet-$pkgver/license.txt  "$pkgdir/usr/share/licenses/$pkgname/"
+    cd build
+    make install DESTDIR="$pkgdir"
+
+      # 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
+    for f in $(find prep -type f -name '*.png'); do
+        install -Dvm644 $f "$pkgdir/usr/share/icons/hicolor"/${f/prep\/}
+    done
+
+      # Install license file
+    install -dm755 "$pkgdir/usr/share/licenses/$pkgname/"
+    install -vm644 ../DDNet-$pkgver/license.txt  "$pkgdir/usr/share/licenses/$pkgname/"
 }
diff --git a/ddnet-server.desktop b/ddnet-server.desktop
deleted file mode 100644
index 995d541bcaaa..000000000000
--- a/ddnet-server.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[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
deleted file mode 100644
index a33579dd4e06..000000000000
--- a/ddnet.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=DDNet Client
-Comment=DDNet Client
-Exec=DDNet
-Icon=DDNet
-Terminal=false
-StartupNotify=false
-Categories=Game;ArcadeGame;