From 8dfd5c5f3507f2a3680f9b0894cfe30c3891f453 Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Mon, 27 May 2024 21:38:55 -0400
Subject: [PATCH 1/2] Fix AppStream duplicate key error

---
 data/org.gnome.TwentyFortyEight.appdata.xml.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/data/org.gnome.TwentyFortyEight.appdata.xml.in b/data/org.gnome.TwentyFortyEight.appdata.xml.in
index 33c1e13..d31ba93 100644
--- a/data/org.gnome.TwentyFortyEight.appdata.xml.in
+++ b/data/org.gnome.TwentyFortyEight.appdata.xml.in
@@ -100,8 +100,9 @@
   ​  <release version="3.37.91" date="2020-08-28" type="development" urgency="low"/>
   </releases>
 
-  <custom>
-    <value key="Purism::form_factor">workstation</value>
-    <value key="Purism::form_factor">mobile</value>
-  </custom>
+  <recommends>
+    <control>touch</control>
+    <control>keyboard</control>
+    <control>pointing</control>
+  </recommends>
 </component>
-- 
GitLab


From 01d156bcf83e955dfc55a93ac280d6449ab84d89 Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Tue, 28 May 2024 20:47:58 -0400
Subject: [PATCH 2/2] Upstream flatpak URL and content rating updates

---
 .../org.gnome.TwentyFortyEight.appdata.xml.in | 41 ++++---------------
 1 file changed, 7 insertions(+), 34 deletions(-)

diff --git a/data/org.gnome.TwentyFortyEight.appdata.xml.in b/data/org.gnome.TwentyFortyEight.appdata.xml.in
index d31ba93..1a2e72a 100644
--- a/data/org.gnome.TwentyFortyEight.appdata.xml.in
+++ b/data/org.gnome.TwentyFortyEight.appdata.xml.in
@@ -40,10 +40,11 @@
     <id>org.gnome.gnome-2048.desktop</id>
   </provides>
   <launchable type="desktop-id">org.gnome.TwentyFortyEight.desktop</launchable>
-  <url type="homepage">https://wiki.gnome.org/Apps/2048</url>
+  <url type="homepage">https://gitlab.gnome.org/GNOME/gnome-2048</url>
   <url type="bugtracker">https://gitlab.gnome.org/GNOME/gnome-2048/issues</url>
-  <url type="donation">https://www.gnome.org/friends/</url>
-  <url type="translate">https://wiki.gnome.org/TranslationProject</url>
+  <url type="donation">https://www.gnome.org/donate/</url>
+  <url type="vcs-browser">https://gitlab.gnome.org/GNOME/gnome-2048</url>
+  <url type="translate">https://l10n.gnome.org/module/gnome-2048/</url>
   <update_contact>arnaud.bonatti_at_gmail.com</update_contact>
   <project_group>GNOME</project_group>
   <!-- this is a translatable version of project_group-->
@@ -64,40 +65,12 @@
   </requires>
   <translation type="gettext">gnome-2048</translation>
 
-  <content_rating type="oars-1.1">
-    <content_attribute id="violence-cartoon">none</content_attribute>
-    <content_attribute id="violence-fantasy">none</content_attribute>
-    <content_attribute id="violence-realistic">none</content_attribute>
-    <content_attribute id="violence-bloodshed">none</content_attribute>
-    <content_attribute id="violence-sexual">none</content_attribute>
-    <content_attribute id="violence-desecration">none</content_attribute>
-    <content_attribute id="violence-slavery">none</content_attribute>
-    <content_attribute id="violence-worship">none</content_attribute>
-    <content_attribute id="drugs-alcohol">none</content_attribute>
-    <content_attribute id="drugs-narcotics">none</content_attribute>
-    <content_attribute id="drugs-tobacco">none</content_attribute>
-    <content_attribute id="sex-nudity">none</content_attribute>
-    <content_attribute id="sex-themes">none</content_attribute>
-    <content_attribute id="sex-homosexuality">none</content_attribute>
-    <content_attribute id="sex-prostitution">none</content_attribute>
-    <content_attribute id="sex-adultery">none</content_attribute>
-    <content_attribute id="sex-appearance">none</content_attribute>
-    <content_attribute id="language-profanity">none</content_attribute>
-    <content_attribute id="language-humor">none</content_attribute>
-    <content_attribute id="language-discrimination">none</content_attribute>
-    <content_attribute id="social-chat">none</content_attribute>
-    <content_attribute id="social-info">none</content_attribute>
-    <content_attribute id="social-audio">none</content_attribute>
-    <content_attribute id="social-location">none</content_attribute>
-    <content_attribute id="social-contacts">none</content_attribute>
-    <content_attribute id="money-purchasing">none</content_attribute>
-    <content_attribute id="money-gambling">none</content_attribute>
-  </content_rating>
+  <content_rating type="oars-1.1" />
 
-  ​<releases>
+  <releases>
     <!-- should be kept in versioning inverted order -->
     <release version="3.38.2" date="2020-11-22" type="stable" urgency="medium"/>
-  ​  <release version="3.37.91" date="2020-08-28" type="development" urgency="low"/>
+    <release version="3.37.91" date="2020-08-28" type="development" urgency="low"/>
   </releases>
 
   <recommends>
-- 
GitLab