From 05f8c257b74ee83b74e250fcbc11ae5f59519eaa Mon Sep 17 00:00:00 2001
From: Alessandro Astone <ales.astone@gmail.com>
Date: Fri, 29 Sep 2023 16:26:14 +0200
Subject: [PATCH] Fix issues with AppStream metadata

* Some tools break when the first line is not the xml header

* Some tools require the icon to not be a symlink. There should be no
  more users of ./data/AppIcon.png so just move it to its location

* Update contact information.
  (How did that translation URL end up in there?)

* Remove too large screenshot
---
 Makefile                             |  2 +-
 data/id.waydro.waydroid.metainfo.xml | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index b58aebe..cc62595 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ install:
 	install -d $(INSTALL_APPS_DIR) $(INSTALL_METAINFO_DIR) $(INSTALL_ICONS_DIR)/hicolor/512x512/apps
 	cp -a data tools waydroid.py $(INSTALL_WAYDROID_DIR)
 	ln -sf $(WAYDROID_DIR)/waydroid.py $(INSTALL_BIN_DIR)/waydroid
-	ln -sf $(WAYDROID_DIR)/data/AppIcon.png $(INSTALL_ICONS_DIR)/hicolor/512x512/apps/waydroid.png
+	mv $(INSTALL_WAYDROID_DIR)/data/AppIcon.png $(INSTALL_ICONS_DIR)/hicolor/512x512/apps/waydroid.png
 	mv $(INSTALL_WAYDROID_DIR)/data/*.desktop $(INSTALL_APPS_DIR)
 	mv $(INSTALL_WAYDROID_DIR)/data/*.metainfo.xml $(INSTALL_METAINFO_DIR)
 	cp dbus/id.waydro.Container.conf $(INSTALL_DBUS_DIR)/system.d/
diff --git a/data/id.waydro.waydroid.metainfo.xml b/data/id.waydro.waydroid.metainfo.xml
index f62bbeb..186801c 100644
--- a/data/id.waydro.waydroid.metainfo.xml
+++ b/data/id.waydro.waydroid.metainfo.xml
@@ -1,5 +1,5 @@
-<!-- Copyright 2023 Waydroid -->
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2023 Waydroid -->
 <component type="desktop-application">
   <id>id.waydro.waydroid</id>
 
@@ -13,10 +13,9 @@
   <url type="homepage">https://waydro.id/</url>
   <url type="bugtracker">https://github.com/waydroid/waydroid/issues</url>
   <url type="faq">https://docs.waydro.id/faq</url>
-  <url type="help">https://matrix.to/#/#waydroid:mrcyjanek.net</url>
+  <url type="help">https://matrix.to/#/#waydroid:matrix.org</url>
   <url type="donation">https://opencollective.com/waydroid/donate</url>
-  <url type="translate">https://gaijinent.com/contacts</url>
-  <url type="contact">https://matrix.to/#/#waydroid:mrcyjanek.net</url>
+  <url type="contact">https://matrix.to/#/#waydroid:matrix.org</url>
 
   <supports>
     <control>pointing</control>
@@ -36,9 +35,6 @@
     <screenshot type="default">
       <image>https://waydro.id/assets/images/hero/main_landing.jpeg</image>
     </screenshot>
-    <screenshot>
-      <image>https://waydro.id/assets/images/hero/Group%201.png</image>
-    </screenshot>
     <screenshot>
       <image>https://waydro.id/assets/images/hero/clean_desktop.jpeg</image>
     </screenshot>
-- 
2.47.3