File support-meson0.59.patch of Package AppStream

Overview Repositories Revisions Requests Users Attributes Meta

File support-meson0.59.patch of Package AppStream (Revision c74254a100765d1935170469dc4e53cf)

Currently displaying revision c74254a100765d1935170469dc4e53cf , Show latest

diff --git a/data/meson.build b/data/meson.build
index aea0cb25..55da0981 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -17,6 +17,17 @@ metainfo_with_relinfo = custom_target('gen-output',
     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,
diff --git a/meson.build b/meson.build
index b67d1a65..10e3d815 100644
--- a/meson.build
+++ b/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+',
@@ -114,7 +114,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',
@@ -132,9 +132,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'
 )
 
diff --git a/po/meson.build b/po/meson.build
index e9ede195..f7c1d842 100644
--- a/po/meson.build
+++ b/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_domain,
         '--msgid-bugs-address=appstream@lists.freedesktop.org'
     ]
 )
+endif
 
 run_target ('make-linguas',
     command: ['sh',

Places

File support-meson0.59.patch of Package AppStream (Revision c74254a100765d1935170469dc4e53cf)

Places