94 lines
2.8 KiB
Diff
94 lines
2.8 KiB
Diff
Index: AppStream-0.16.4/data/meson.build
|
|
===================================================================
|
|
--- AppStream-0.16.4.orig/data/meson.build
|
|
+++ AppStream-0.16.4/data/meson.build
|
|
@@ -17,6 +17,17 @@ metainfo_with_relinfo = custom_target('g
|
|
command : [ascli_exe, 'news-to-metainfo', '--limit=6', '@INPUT0@', '@INPUT1@', '@OUTPUT@']
|
|
)
|
|
|
|
+if meson.version().version_compare('<0.62')
|
|
+metainfo_i18n = i18n.merge_file (
|
|
+ input: metainfo_with_relinfo,
|
|
+ output: 'org.freedesktop.appstream.cli.metainfo.xml',
|
|
+ type: 'xml',
|
|
+ data_dirs: [meson.current_source_dir()],
|
|
+ po_dir: join_paths (source_root, 'po'),
|
|
+ install: true,
|
|
+ install_dir: metainfo_dir
|
|
+)
|
|
+else
|
|
metainfo_i18n = i18n.itstool_join(
|
|
input: metainfo_with_relinfo,
|
|
output: 'org.freedesktop.appstream.cli.metainfo.xml',
|
|
@@ -25,6 +36,7 @@ metainfo_i18n = i18n.itstool_join(
|
|
install: true,
|
|
install_dir: metainfo_dir,
|
|
)
|
|
+endif
|
|
|
|
test('as-validate_metainfo.cli',
|
|
ascli_exe,
|
|
Index: AppStream-0.16.4/meson.build
|
|
===================================================================
|
|
--- AppStream-0.16.4.orig/meson.build
|
|
+++ AppStream-0.16.4/meson.build
|
|
@@ -1,5 +1,5 @@
|
|
project('AppStream', 'c',
|
|
- meson_version: '>=0.62',
|
|
+ meson_version: '>=0.59',
|
|
default_options: ['c_std=c11', 'cpp_std=gnu++14'],
|
|
|
|
license: 'LGPL-2.1+',
|
|
@@ -113,7 +113,7 @@ add_project_arguments(
|
|
'-Werror=missing-include-dirs',
|
|
'-Werror=declaration-after-statement',
|
|
'-Werror=format-security',
|
|
-
|
|
+ '-Werror=format',
|
|
'-Wno-missing-field-initializers',
|
|
'-Wno-error=missing-field-initializers',
|
|
'-Wno-unused-parameter',
|
|
@@ -131,9 +131,7 @@ add_project_arguments(
|
|
'-Werror=return-type',
|
|
'-Werror=misleading-indentation',
|
|
'-Werror=format-security',
|
|
-
|
|
- # NOTE: Can be removed with AppStream 1.0
|
|
- '-Wno-error=c++20-compat',
|
|
+ '-Werror=format',
|
|
language: 'cpp'
|
|
)
|
|
|
|
Index: AppStream-0.16.4/po/meson.build
|
|
===================================================================
|
|
--- AppStream-0.16.4.orig/po/meson.build
|
|
+++ AppStream-0.16.4/po/meson.build
|
|
@@ -1,5 +1,19 @@
|
|
|
|
as_gettext_domain = 'appstream'
|
|
+if meson.version().version_compare('<0.62')
|
|
+i18n.gettext(as_gettext_domain,
|
|
+ preset : 'glib',
|
|
+ data_dirs: [join_paths(source_root, 'data')],
|
|
+ args: [
|
|
+ '--default-domain=' + as_gettext_domain,
|
|
+ '--from-code=UTF-8',
|
|
+ '-i', '-F', '-c', '--no-wrap',
|
|
+ '--package-name=' + as_gettext_domain,
|
|
+ '--copyright-holder=Matthias Klumpp',
|
|
+ '--msgid-bugs-address=appstream@lists.freedesktop.org'
|
|
+ ]
|
|
+)
|
|
+else
|
|
i18n_result = i18n.gettext(as_gettext_domain,
|
|
preset : 'glib',
|
|
data_dirs: [join_paths(source_root, 'data')],
|
|
@@ -12,6 +26,7 @@ i18n_result = i18n.gettext(as_gettext_do
|
|
'--msgid-bugs-address=appstream@lists.freedesktop.org'
|
|
]
|
|
)
|
|
+endif
|
|
|
|
run_target ('make-linguas',
|
|
command: ['sh',
|