bzflag: Add appstream metadata

**Summary** - Added appstream metadata (Part of getsolus#1389) - Move icon file to hicolor **Test Plan** - Build the package - Verify with `appstream-builder --packages-dir=. --include-failed -v` **Checklist** - [x] Package was built and tested against unstable
malfisya · Jan 22, 2024 · 1e074c7 · 1e074c7
1 parent 23f744d
commit 1e074c7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/packages/b/bzflag/abi_used_symbols b/packages/b/bzflag/abi_used_symbols
@@ -197,8 +197,10 @@ libc.so.6:__fdelt_chk
 libc.so.6:__fprintf_chk
 libc.so.6:__fread_chk
 libc.so.6:__h_errno_location
-libc.so.6:__isoc99_fscanf
-libc.so.6:__isoc99_sscanf
+libc.so.6:__isoc23_fscanf
+libc.so.6:__isoc23_sscanf
+libc.so.6:__isoc23_strtol
+libc.so.6:__isoc23_strtoul
 libc.so.6:__libc_single_threaded
 libc.so.6:__libc_start_main
 libc.so.6:__printf_chk
@@ -326,8 +328,6 @@ libc.so.6:strrchr
 libc.so.6:strspn
 libc.so.6:strstr
 libc.so.6:strtod
-libc.so.6:strtol
-libc.so.6:strtoul
 libc.so.6:time
 libc.so.6:tolower
 libc.so.6:toupper
@@ -384,7 +384,6 @@ libm.so.6:sin
 libm.so.6:sincos
 libm.so.6:sincosf
 libm.so.6:sinf
-libm.so.6:sqrt
 libm.so.6:sqrtf
 libm.so.6:tanf
 libncursesw.so.6:COLS
@@ -428,7 +427,6 @@ libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE5rfindEPKcm
 libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE5rfindEPKcmm
 libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE5rfindEcm
 libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6substrEmm
-libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7compareEPKc
 libstdc++.so.6:_ZNSdD2Ev
 libstdc++.so.6:_ZNSi10_M_extractIdEERSiRT_
 libstdc++.so.6:_ZNSi10_M_extractIfEERSiRT_
@@ -492,8 +490,6 @@ libstdc++.so.6:_ZNSt7__cxx1119basic_ostringstreamIcSt11char_traitsIcESaIcEED1Ev
 libstdc++.so.6:_ZNSt8__detail15_List_node_base11_M_transferEPS0_S1_
 libstdc++.so.6:_ZNSt8__detail15_List_node_base7_M_hookEPS0_
 libstdc++.so.6:_ZNSt8__detail15_List_node_base9_M_unhookEv
-libstdc++.so.6:_ZNSt8ios_base4InitC1Ev
-libstdc++.so.6:_ZNSt8ios_base4InitD1Ev
 libstdc++.so.6:_ZNSt8ios_baseC2Ev
 libstdc++.so.6:_ZNSt8ios_baseD2Ev
 libstdc++.so.6:_ZNSt9basic_iosIcSt11char_traitsIcEE4initEPSt15basic_streambufIcS1_E
@@ -508,6 +504,7 @@ libstdc++.so.6:_ZSt18_Rb_tree_incrementPSt18_Rb_tree_node_base
 libstdc++.so.6:_ZSt19__throw_logic_errorPKc
 libstdc++.so.6:_ZSt20__throw_length_errorPKc
 libstdc++.so.6:_ZSt20__throw_out_of_rangePKc
+libstdc++.so.6:_ZSt21ios_base_library_initv
 libstdc++.so.6:_ZSt24__throw_out_of_range_fmtPKcz
 libstdc++.so.6:_ZSt25__throw_bad_function_callv
 libstdc++.so.6:_ZSt28_Rb_tree_rebalance_for_erasePSt18_Rb_tree_node_baseRS_

diff --git a/packages/b/bzflag/package.yml b/packages/b/bzflag/package.yml
@@ -1,8 +1,9 @@
 name       : bzflag
 version    : 2.4.26
-release    : 18
+release    : 19
 source     :
     - https://github.com/BZFlag-Dev/bzflag/archive/v2.4.26.tar.gz : 0e010b03a80181923c6e23a8003ff9fae96b29158148ca766654659d1d2330b5
+    - https://raw.githubusercontent.com/flathub/org.bzflag.BZFlag/master/org.bzflag.BZFlag.appdata.xml : ea1eaf6d3a62b700ce3f4e868ec53516b123b42ca31b1fbbdef49142c4a6eacc
 homepage   : https://www.bzflag.org
 license    :
     - LGPL-2.1-or-later
@@ -27,9 +28,11 @@ build      : |
     %make
 install    : |
     %make_install
-
-    install -Dm00644 $pkgfiles/bzflag.desktop $installdir/usr/share/applications/bzflag.desktop
-    install -Dm00644 data/bzflag-48x48.png $installdir/usr/share/pixmaps/bzflag.png
-
+    # Install desktop file, icons, and appstream metadata
+    install -Dm00644 $pkgfiles/bzflag.desktop $installdir/usr/share/applications/org.bzflag.BZFlag.desktop
+    install -Dm00644 data/bzflag-48x48.png $installdir/usr/share/icons/hicolor/48x48/apps/bzflag.png
+    install -Dm00644 data/bzflag-256x256.png $installdir/usr/share/icons/hicolor/256x256/apps/bzflag.png
+    install -Dm00644 $sources/org.bzflag.BZFlag.appdata.xml -t $installdir/usr/share/metainfo/
+    # Install services
     install -Dm00644 $pkgfiles/bzflag.sysusers $installdir/%libdir%/sysusers.d/bzflag.conf
     install -Dm00644 $pkgfiles/bzflag.service $installdir/%libdir%/systemd/system/bzflag.service
diff --git a/packages/b/bzflag/pspec_x86_64.xml b/packages/b/bzflag/pspec_x86_64.xml
@@ -3,8 +3,8 @@
         <Name>bzflag</Name>
         <Homepage>https://www.bzflag.org</Homepage>
         <Packager>
-            <Name>Reilly Brogan</Name>
-            <Email>solus@reillybrogan.com</Email>
+            <Name>Muhammad Alfi Syahrin</Name>
+            <Email>malfisya.dev@hotmail.com</Email>
         </Packager>
         <License>LGPL-2.1-or-later</License>
         <License>MPL-2.0</License>
@@ -59,7 +59,7 @@
             <Path fileType="library">/usr/lib64/bzflag/wwzones.so</Path>
             <Path fileType="library">/usr/lib64/systemd/system/bzflag.service</Path>
             <Path fileType="library">/usr/lib64/sysusers.d/bzflag.conf</Path>
-            <Path fileType="data">/usr/share/applications/bzflag.desktop</Path>
+            <Path fileType="data">/usr/share/applications/org.bzflag.BZFlag.desktop</Path>
             <Path fileType="data">/usr/share/bzflag/automatic_icon.png</Path>
             <Path fileType="data">/usr/share/bzflag/blend_flash.png</Path>
             <Path fileType="data">/usr/share/bzflag/blue_basetop.png</Path>
@@ -231,20 +231,22 @@
             <Path fileType="data">/usr/share/bzflag/wall.png</Path>
             <Path fileType="data">/usr/share/bzflag/water.png</Path>
             <Path fileType="data">/usr/share/bzflag/zone_ground.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/256x256/apps/bzflag.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/48x48/apps/bzflag.png</Path>
             <Path fileType="man">/usr/share/man/man5/bzw.5</Path>
             <Path fileType="man">/usr/share/man/man6/bzadmin.6</Path>
             <Path fileType="man">/usr/share/man/man6/bzflag.6</Path>
             <Path fileType="man">/usr/share/man/man6/bzfs.6</Path>
-            <Path fileType="data">/usr/share/pixmaps/bzflag.png</Path>
+            <Path fileType="data">/usr/share/metainfo/org.bzflag.BZFlag.appdata.xml</Path>
         </Files>
     </Package>
     <History>
-        <Update release="18">
-            <Date>2023-10-14</Date>
+        <Update release="19">
+            <Date>2024-01-22</Date>
             <Version>2.4.26</Version>
             <Comment>Packaging update</Comment>
-            <Name>Reilly Brogan</Name>
-            <Email>solus@reillybrogan.com</Email>
+            <Name>Muhammad Alfi Syahrin</Name>
+            <Email>malfisya.dev@hotmail.com</Email>
         </Update>
     </History>
 </PISI>