From 53b12075344821d8fbcef1e30dd52e0954921b8d Mon Sep 17 00:00:00 2001
From: Muhammad Alfi Syahrin <malfisya.dev@hotmail.com>
Date: Mon, 22 Jan 2024 15:14:35 +0700
Subject: [PATCH] bombermaaan: Install appstream metadata

**Summary**

- Install appstream metadata (Part of https://github.com/getsolus/packages/issues/1389)
- Move icon install directory to hicolor

**Test Plan**

- Rebuild package
- Verify metadata with `appstream-builder --packages-dir=. --include-failed -v`

**Checklist**

- [x] Package was built and tested against unstable
---
 packages/b/bombermaaan/package.yml      | 18 ++++++++++++------
 packages/b/bombermaaan/pspec_x86_64.xml | 18 ++++++++++--------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/packages/b/bombermaaan/package.yml b/packages/b/bombermaaan/package.yml
index c01f5946ab6..1315f01258b 100644
--- a/packages/b/bombermaaan/package.yml
+++ b/packages/b/bombermaaan/package.yml
@@ -1,6 +1,6 @@
 name       : bombermaaan
 version    : 2.2.8.2275
-release    : 6
+release    : 7
 source     :
     - https://github.com/bjaraujo/Bombermaaan/archive/refs/tags/v2.2.8.2275.tar.gz : 34a867305d8db32797d0d103d915103be1fabd78305b1bad4b359de9976c35c0
 homepage   : https://github.com/bjaraujo/Bombermaaan
@@ -14,14 +14,20 @@ builddeps  :
     - pkgconfig(sdl2)
 setup      : |
     cd trunk
-    %cmake -DLOAD_RESOURCES_FROM_FILES:BOOL=ON
+    %cmake_ninja -DLOAD_RESOURCES_FROM_FILES:BOOL=ON
 build      : |
-    %make -C trunk
+    cd trunk
+    %ninja_build
 install    : |
-    install -Dm00755 trunk/bin/Bombermaaan $installdir/usr/share/Bombermaaan/bombermaaan
+    # Install binary file and game data to usr
+    install -Dm00755 trunk/solusBuildDir/bin/Bombermaaan $installdir/usr/share/Bombermaaan/bombermaaan
     install -dm00755 $installdir/usr/bin
     ln -sv ../share/Bombermaaan/bombermaaan $installdir/usr/bin/bombermaaan
     cp -r trunk/res/{images,sounds} $installdir/usr/share/Bombermaaan
     cp -r trunk/levels $installdir/usr/share/Bombermaaan
-    install -Dm00644 installers/bombermaaan.png -t $installdir/usr/share/pixmaps
-    install -Dm00644 installers/bombermaaan.desktop -t $installdir/usr/share/applications
+    # Install icon, desktop file and appstream metadata
+    install -Dm00644 installers/bombermaaan.png -t $installdir/usr/share/icons/hicolor/32x32/apps
+    install -Dm00644 installers/bombermaaan.svg -t $installdir/usr/share/icons/hicolor/scalable/apps
+    install -Dm00644 installers/bombermaaan.desktop $installdir/usr/share/applications/com.github.bjaraujo.Bombermaaan.desktop
+    sed -i 's/release version="2.1.8.2208" date="2021-01-24"/release version="2.2.8.2275" date="2023-12-24"/' installers/bombermaaan.appdata.xml #Update version accordingly
+    install -Dm00644 installers/bombermaaan.appdata.xml -t $installdir/usr/share/metainfo
diff --git a/packages/b/bombermaaan/pspec_x86_64.xml b/packages/b/bombermaaan/pspec_x86_64.xml
index bc65e9cf99a..b1d229e5b91 100644
--- a/packages/b/bombermaaan/pspec_x86_64.xml
+++ b/packages/b/bombermaaan/pspec_x86_64.xml
@@ -3,8 +3,8 @@
         <Name>bombermaaan</Name>
         <Homepage>https://github.com/bjaraujo/Bombermaaan</Homepage>
         <Packager>
-            <Name>Algent Albrahimi</Name>
-            <Email>algent@protonmail.com</Email>
+            <Name>Muhammad Alfi Syahrin</Name>
+            <Email>malfisya.dev@hotmail.com</Email>
         </Packager>
         <License>GPL-3.0-or-later</License>
         <PartOf>games.arcade</PartOf>
@@ -353,17 +353,19 @@
             <Path fileType="data">/usr/share/Bombermaaan/sounds/wall_clap_1.ogg</Path>
             <Path fileType="data">/usr/share/Bombermaaan/sounds/wall_clap_2.ogg</Path>
             <Path fileType="data">/usr/share/Bombermaaan/sounds/winner.ogg</Path>
-            <Path fileType="data">/usr/share/applications/bombermaaan.desktop</Path>
-            <Path fileType="data">/usr/share/pixmaps/bombermaaan.png</Path>
+            <Path fileType="data">/usr/share/applications/com.github.bjaraujo.Bombermaaan.desktop</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/32x32/apps/bombermaaan.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/scalable/apps/bombermaaan.svg</Path>
+            <Path fileType="data">/usr/share/metainfo/bombermaaan.appdata.xml</Path>
         </Files>
     </Package>
     <History>
-        <Update release="6">
-            <Date>2023-12-24</Date>
+        <Update release="7">
+            <Date>2024-01-22</Date>
             <Version>2.2.8.2275</Version>
             <Comment>Packaging update</Comment>
-            <Name>Algent Albrahimi</Name>
-            <Email>algent@protonmail.com</Email>
+            <Name>Muhammad Alfi Syahrin</Name>
+            <Email>malfisya.dev@hotmail.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file