kiss-flatpak

commit bc6d23bdb26b44567e14b57ed090df8f8f9043a4
parent fd6326be61fcd8e53530d6c6c0da0f0ce324ded4
Author: St John Karp <contact@stjo.hn>
Date:   Mon,  4 Jul 2022 05:37:40 -0400

appstream: Patch out requirement for itstool

Hopefully this doesn't break anything. I think itstool is only used
for generating documentation so I don't see any point in adding
this and its dependencies if it can just be patched out.

Diffstat:
M
flatpak/appstream/build
 | 
6
+++++-
M
flatpak/appstream/checksums
 | 
1
+
A
flatpak/appstream/patches/no-itstool.patch
 | 
42
++++++++++++++++++++++++++++++++++++++++++
M
flatpak/appstream/sources
 | 
1
+

4 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/flatpak/appstream/build b/flatpak/appstream/build
@@ -1,6 +1,10 @@
 #!/usr/bin/env sh
 
-cd AppStream-0.15.4
+cd "AppStream-$2"
+
+for file in ../patches/* ; do
+	patch -p1 < "$file"
+done
 
 mkdir build
 cd build
diff --git a/flatpak/appstream/checksums b/flatpak/appstream/checksums
@@ -1 +1,2 @@
 c4126b6ebc889afb2e3ab5dfd8303bd31a9cd2a3992391de4dc66cb0e12846dd
+d5874d10eaa65d6329ed023a0d026eea91ba812090a0d4b5ab1bf4a924a5b482
diff --git a/flatpak/appstream/patches/no-itstool.patch b/flatpak/appstream/patches/no-itstool.patch
@@ -0,0 +1,42 @@
+diff --git a/data/meson.build b/data/meson.build
+index aea0cb2..79e0845 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -17,22 +17,22 @@ metainfo_with_relinfo = custom_target('gen-output',
+     command : [ascli_exe, 'news-to-metainfo', '--limit=6', '@INPUT0@', '@INPUT1@', '@OUTPUT@']
+ )
+ 
+-metainfo_i18n = i18n.itstool_join(
+-    input:  metainfo_with_relinfo,
+-    output: 'org.freedesktop.appstream.cli.metainfo.xml',
+-    mo_targets: i18n_result[0],
+-    its_files: [join_paths(meson.current_source_dir(), 'its', 'metainfo.its')],
+-    install: true,
+-    install_dir: metainfo_dir,
+-)
++#metainfo_i18n = i18n.itstool_join(
++#    input:  metainfo_with_relinfo,
++#    output: 'org.freedesktop.appstream.cli.metainfo.xml',
++#    mo_targets: i18n_result[0],
++#    its_files: [join_paths(meson.current_source_dir(), 'its', 'metainfo.its')],
++#    install: true,
++#    install_dir: metainfo_dir,
++#)
+ 
+-test('as-validate_metainfo.cli',
+-    ascli_exe,
+-    args: ['validate',
+-           '--pedantic',
+-           '--no-net',
+-           metainfo_i18n]
+-)
++#test('as-validate_metainfo.cli',
++#    ascli_exe,
++#    args: ['validate',
++#           '--pedantic',
++#           '--no-net',
++#           metainfo_i18n]
++#)
+ 
+ install_data('appstream.conf',
+              install_dir: get_option('sysconfdir'))
diff --git a/flatpak/appstream/sources b/flatpak/appstream/sources
@@ -1 +1,2 @@
 https://www.freedesktop.org/software/appstream/releases/AppStream-VERSION.tar.xz
+patches/no-itstool.patch patches