From b27dc58e506382437bedbd31135d546fc1f7a378 Mon Sep 17 00:00:00 2001
From: Muhammad Alfi Syahrin <malfisya.dev@hotmail.com>
Date: Wed, 6 Nov 2024 12:56:05 +0700
Subject: [PATCH] Undeprecate and Deprecate fonts

**Summary**

- Undeprecate font-firago
- Undeprecate font-weather-icons
- Deprecate :
    - font-firago-otf
    - font-firago-ttf
    - font-weather-icons-otf
	- font-weather-icons-ttf

Only land this PR after https://github.com/getsolus/packages/pull/4263 and https://github.com/getsolus/packages/pull/4264 get merged.
---
 repo_data/distribution.xml    | 6 ++++--
 repo_data/distribution.xml.in | 9 ++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/repo_data/distribution.xml b/repo_data/distribution.xml
index b819d7ace374..3cd3da354702 100644
--- a/repo_data/distribution.xml
+++ b/repo_data/distribution.xml
@@ -971,7 +971,6 @@
 		<Package>python-pyls-black</Package>
 		<Package>python3-jedi</Package>
 		<Package>python3-jedi-dbginfo</Package>
-		<Package>font-firago</Package>
 		<Package>font-ibm-plex</Package>
 		<Package>vte2-docs</Package>
 		<Package>gst-python-0.10</Package>
@@ -1183,7 +1182,6 @@
 		<Package>vala-panel-appmenu-devel</Package>
 		<Package>librsvg-docs</Package>
 		<Package>nautilus-terminal</Package>
-		<Package>font-weather-icons</Package>
 		<Package>nvidia-container-runtime</Package>
 		<Package>python-m2r</Package>
 		<Package>python-backports.entry_points_selectable</Package>
@@ -2727,5 +2725,9 @@
 		<Package>rpi-imager-dbginfo</Package>
 		<Package>barrier</Package>
 		<Package>barrier-dbginfo</Package>
+		<Package>font-firago-otf</Package>
+		<Package>font-firago-ttf</Package>
+		<Package>font-weather-icons-otf</Package>
+		<Package>font-weather-icons-ttf</Package>
 	</Obsoletes>
 </PISI>
\ No newline at end of file
diff --git a/repo_data/distribution.xml.in b/repo_data/distribution.xml.in
index 0aeac358a1a4..56b87f40fa7c 100644
--- a/repo_data/distribution.xml.in
+++ b/repo_data/distribution.xml.in
@@ -1351,7 +1351,6 @@
 		<Package>python3-jedi-dbginfo</Package>
 
 		<!-- Replaced with split otf and ttf packages -->
-		<Package>font-firago</Package>
 		<Package>font-ibm-plex</Package>
 
 		<!-- Old orphan package -->
@@ -1693,8 +1692,6 @@
 		<Package>vala-panel-appmenu-devel</Package>
 		<Package>librsvg-docs</Package>
 		<Package>nautilus-terminal</Package>
-		<!-- Splited later to -otf and -ttf -->
-		<Package>font-weather-icons</Package>
 
 		<!-- Integrated into nvidia-container-toolkit -->
 		<Package>nvidia-container-runtime</Package>
@@ -3640,5 +3637,11 @@
 		<!-- barrier is dead upstream -->
 		<Package>barrier</Package>
 		<Package>barrier-dbginfo</Package>
+
+		<!-- Only ship .otf file to fix appstream metainfo generation -->
+		<Package>font-firago-otf</Package>
+		<Package>font-firago-ttf</Package>
+		<Package>font-weather-icons-otf</Package>
+		<Package>font-weather-icons-ttf</Package>
 	</Obsoletes>
 </PISI>