81a1195
From eb9d0e103f92ddec1bf9b113f7d6a91321a19130 Mon Sep 17 00:00:00 2001
81a1195
From: Julian Hofer <julianhofer@gnome.org>
81a1195
Date: Sat, 13 Aug 2022 20:56:58 +0200
81a1195
Subject: [PATCH] Fix appdata and icon installation
81a1195
81a1195
- Appdata used invalid tags
81a1195
- Icon was not installed
81a1195
---
81a1195
 org.geeqie.Geeqie.appdata.xml.in              | 9 ++++-----
81a1195
 src/icons/meson.build                         | 2 ++
81a1195
 src/icons/svg/{gqview_icon.svg => geeqie.svg} | 0
81a1195
 src/icons/svg/meson.build                     | 7 +++++++
81a1195
 4 files changed, 13 insertions(+), 5 deletions(-)
81a1195
 rename src/icons/svg/{gqview_icon.svg => geeqie.svg} (100%)
81a1195
 create mode 100644 src/icons/svg/meson.build
81a1195
81a1195
diff --git a/org.geeqie.Geeqie.appdata.xml.in b/org.geeqie.Geeqie.appdata.xml.in
81a1195
index 2c8dbdd5..e52a1986 100644
81a1195
--- a/org.geeqie.Geeqie.appdata.xml.in
81a1195
+++ b/org.geeqie.Geeqie.appdata.xml.in
81a1195
@@ -7,12 +7,12 @@
81a1195
   <_name>Geeqie</_name>
81a1195
   <_summary>A lightweight image viewer</_summary>
81a1195
   <description>
81a1195
-    <_p>
81a1195
+    

81a1195
           Geeqie is a lightweight image viewer for Linux, BSDs and compatibles.
81a1195
-        </_p>
81a1195
-    <_p>
81a1195
+    

81a1195
+    

81a1195
           It can be used as a simple, fast, database-free image viewer, but equally it can be used to manage large collections of images.
81a1195
-        </_p>
81a1195
+    

81a1195
   </description>
81a1195
   <screenshots>
81a1195
     <screenshot type="default">
81a1195
@@ -35,4 +35,3 @@
81a1195
   <update_contact>geeqie@freelists.org</update_contact>
81a1195
   <translation type="gettext">geeqie</translation>
81a1195
 </component>
81a1195
-
81a1195
diff --git a/src/icons/meson.build b/src/icons/meson.build
81a1195
index ee55ab3a..55d76268 100644
81a1195
--- a/src/icons/meson.build
81a1195
+++ b/src/icons/meson.build
81a1195
@@ -67,3 +67,5 @@ icons_inline_h = custom_target('icons_inline', output : 'icons_inline.h',
81a1195
         capture : true)
81a1195
 
81a1195
 project_sources += icons_inline_h
81a1195
+
81a1195
+subdir('svg')
81a1195
diff --git a/src/icons/svg/gqview_icon.svg b/src/icons/svg/geeqie.svg
81a1195
similarity index 100%
81a1195
rename from src/icons/svg/gqview_icon.svg
81a1195
rename to src/icons/svg/geeqie.svg
81a1195
diff --git a/src/icons/svg/meson.build b/src/icons/svg/meson.build
81a1195
new file mode 100644
81a1195
index 00000000..12c771eb
81a1195
--- /dev/null
81a1195
+++ b/src/icons/svg/meson.build
81a1195
@@ -0,0 +1,7 @@
81a1195
+datadir = prefix / get_option('datadir')
81a1195
+iconsdir = datadir / 'icons'
81a1195
+
81a1195
+install_data(
81a1195
+  'geeqie.svg',
81a1195
+  install_dir: iconsdir / 'hicolor' / 'scalable' / 'apps',
81a1195
+)
81a1195
From 6c4226fff6864eb527a5602bdda0b15ae840f6fb Mon Sep 17 00:00:00 2001
81a1195
From: =?UTF-8?q?Andreas=20R=C3=B6nnquist?= <gusnan@librem.one>
81a1195
Date: Sun, 11 Sep 2022 17:12:07 +0200
81a1195
Subject: [PATCH] Fix appstream validation
81a1195
81a1195
---
81a1195
 org.geeqie.Geeqie.appdata.xml.in | 6 +++---
81a1195
 1 file changed, 3 insertions(+), 3 deletions(-)
81a1195
81a1195
diff --git a/org.geeqie.Geeqie.appdata.xml.in b/org.geeqie.Geeqie.appdata.xml.in
81a1195
index e52a1986..a91678e6 100644
81a1195
--- a/org.geeqie.Geeqie.appdata.xml.in
81a1195
+++ b/org.geeqie.Geeqie.appdata.xml.in
81a1195
@@ -1,11 +1,11 @@
81a1195
 
81a1195
 <component>
81a1195
-  <id type="desktop">geeqie.desktop</id>
81a1195
+  <id>org.geeqie.Geeqie</id>
81a1195
   <metadata_license>CC-BY-SA-4.0</metadata_license>
81a1195
   <content_rating type="oars-1.1" />
81a1195
   <project_license>GPL-3.0+</project_license>
81a1195
-  <_name>Geeqie</_name>
81a1195
-  <_summary>A lightweight image viewer</_summary>
81a1195
+  <name>Geeqie</name>
81a1195
+  <summary>A lightweight image viewer</summary>
81a1195
   <description>
81a1195
     

81a1195
           Geeqie is a lightweight image viewer for Linux, BSDs and compatibles.