From c6c4a10aab646a1aa00817696728a24ece9eeba3faea9599c44704c6280ab21a Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Fri, 13 Jan 2023 11:53:17 +0000 Subject: [PATCH] Accepting request 1058048 from home:alarrosa:branches:KDE:Frameworks5 - Update to version 0.15.6: * Features: + qt: Add API for ContentRating descriptions and ratingIds + Add some coccinelle semantic patches for common style issues + compose: Allow building without SVG support (for bootstrap only) + validator: - Check for nodes that are text nodes even though they shouldn't be - Extend validation for custom tag - Improve Screenshot validation * Specification: + docs: Fix typos in documentation * Bugfixes: + validator: - internat: Don't allow bandwidth_mbitps when value is offline-only - Fix timestamp validation - Allow release descriptions to start with punctuation + compose: - Only add no-metainfo tag if component isn't already ignored - Show better error in AscImage if compose was build without rsvg + Add a hack to clarify proper PtrArray element ownership for language bindings + qt: - Port away from deprecated QDateTime API - Deprecate Component::requires - Fix warning - Fix stringListToCharArray and Pool::componentsByCategories - Port away from deprecated foreach + as-review: - Add a typedef for property enums - Install properties at once rather than individually - Specify G_PARAM_STATIC_STRINGS for properties OBS-URL: https://build.opensuse.org/request/show/1058048 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/AppStream?expand=0&rev=82 --- AppStream-0.15.5.tar.xz | 3 -- AppStream-0.15.5.tar.xz.asc | 16 ------- AppStream-0.15.6.tar.xz | 3 ++ AppStream-0.15.6.tar.xz.asc | 16 +++++++ AppStream.changes | 44 ++++++++++++++++++ AppStream.spec | 7 +-- support-meson0.59.patch | 91 +++++++++++++++++++++++++++++++++++++ 7 files changed, 158 insertions(+), 22 deletions(-) delete mode 100644 AppStream-0.15.5.tar.xz delete mode 100644 AppStream-0.15.5.tar.xz.asc create mode 100644 AppStream-0.15.6.tar.xz create mode 100644 AppStream-0.15.6.tar.xz.asc create mode 100644 support-meson0.59.patch diff --git a/AppStream-0.15.5.tar.xz b/AppStream-0.15.5.tar.xz deleted file mode 100644 index 4b23c17..0000000 --- a/AppStream-0.15.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb15ed62cc2729683879a2dbf98c0a3267ea2b4d57bba6bc55e70a25500e04c2 -size 2499336 diff --git a/AppStream-0.15.5.tar.xz.asc b/AppStream-0.15.5.tar.xz.asc deleted file mode 100644 index 372b43c..0000000 --- a/AppStream-0.15.5.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE0zo/DKFrCsxRpgc4SUyKX79N7OsFAmMDwI8ACgkQSUyKX79N -7OtnpxAAi3fgofTS+NgXlMh2JZAkc4JtU0Ob686gb0G1mmaZamKtxCmt/OhS6owt -VsYJV6RMeMRsDTLb7QfWkrcBDFsGQcujHsqWFDKyc8igg5ruv2TSlCFbm9B/gTaL -0AhS0FOYpQ9vMRYeCR9l4MesYPor96EXkEwnrj5ea7hNR2pCgD13Sa6C/plIENVZ -W5XnnIDvThp9WKt1jUjkxmEinZI2G/qIJGsjI+spORXT9knd7PV62WuwwhQAY5QZ -/9Aky853FbqQB9fVjxGj13pLxrHE0vboSsvoHij6opKahc0TzlGuDuSMCUFLr7x1 -JIiAkXQeN+fWJo1TfnVy+HmgXChaQjQI0W6JrH3Mp6lQ5W7hJsmdB8l3hfEeRfLe -+DAehvRD+lSwVAqsTq1+hX75m91Ua1CAHEDLFl2zcH9PD+lVUYDwL9+KaqVokaaB -EfgkeWxRrgcjauoZI9Zd2EUUopfQoLKSSovAnePDLcnY04kpsvdk+5lFcIx6O6+i -mncaxuHwVYgTlH/ly2RXwwO0rHgri327iGQSYzDivCmHkkqVmiJ1u5pJHSn02b76 -cKWwXmC2MIQYkgrEVlP5u42NpcKJbN5DfnO0kzSgQNHRHFNM9f4O/G9AnGBdnyZV -cveTK6b/o3BO2EKO7sJnAJCOAxgzRpkfZqr20W6WmN2rpm8AOVQ= -=Cc0G ------END PGP SIGNATURE----- diff --git a/AppStream-0.15.6.tar.xz b/AppStream-0.15.6.tar.xz new file mode 100644 index 0000000..af37e9e --- /dev/null +++ b/AppStream-0.15.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23d6c940368b5a6cedf622df3707c0dd8679cf4b0739f7aba13f925c58cdf10e +size 2517688 diff --git a/AppStream-0.15.6.tar.xz.asc b/AppStream-0.15.6.tar.xz.asc new file mode 100644 index 0000000..87b9a82 --- /dev/null +++ b/AppStream-0.15.6.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE0zo/DKFrCsxRpgc4SUyKX79N7OsFAmOk3q4ACgkQSUyKX79N +7Otdcw/9HFk3JnQhAf3bAOWPJjziJNj2cYDuvW0v/ssqPwZ5A7fxqBFY5px34ONj +ipv2GqdARz9yxKQ/dIjkQ8E7lW9DVfhD9zgqLymPFpMzeRFewMYv8UOZP2bSS7iS +g9NQ8Q4sLmmpXsPBNvMTz7fSXIDRZ9bWSH7k2nCgJCvzziXslT0XLh9WvrHOcFWm +G5SSWCTAe0VvyMX3Xc7Zs0to/vDNS/xvrI+dbj53qz9pX552mT53+e5HzVIIDEpJ +cLWRM5w+LZSyLNziBDCvhrPBEexGljff064YWobht5bp6HVDl5WsRjzgizwr9asS +pKB1n0Q7k0h7tMIWFKHelZoMdpcy7pJKLa4Scy2GInyXtj+7HFZzoePtZa0eRSiI +HGJuSsw/wWMKQelSL4C/Cinqk0kJzBnAhv21DYSGWy2hFs/c/oc5kvSohhXUjqui +x/QTmQgnv1xqjL74+UVQwQPpLCHz+CAcupvoAIL92G+LEVKhAIf31KrpoPsjUUAr +RCF15G/ZQz32E/LNwlxajCQ/x8Y6LlxiNSU9155xZrnhrCjXrhtHly8dIKROprXY +pFrt57FplvB0F7zhwXuEMw4S+ZysbrZS4q+eOYjJ8790Xvrlv39EspQg+i1Lzw5D +U7Ywn8Z+4PaiR5kgbSrPXpHLqD1OlS6RimvK7pRVutkQTKmgrlw= +=FRC3 +-----END PGP SIGNATURE----- diff --git a/AppStream.changes b/AppStream.changes index 83d0382..326231f 100644 --- a/AppStream.changes +++ b/AppStream.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Thu Jan 12 07:53:52 UTC 2023 - Antonio Larrosa + +- Update to version 0.15.6: + * Features: + + qt: Add API for ContentRating descriptions and ratingIds + + Add some coccinelle semantic patches for common style issues + + compose: Allow building without SVG support (for bootstrap only) + + validator: + - Check for nodes that are text nodes even though they shouldn't be + - Extend validation for custom tag + - Improve Screenshot validation + * Specification: + + docs: Fix typos in documentation + * Bugfixes: + + validator: + - internat: Don't allow bandwidth_mbitps when value is offline-only + - Fix timestamp validation + - Allow release descriptions to start with punctuation + + compose: + - Only add no-metainfo tag if component isn't already ignored + - Show better error in AscImage if compose was build without rsvg + + Add a hack to clarify proper PtrArray element ownership for language bindings + + qt: + - Port away from deprecated QDateTime API + - Deprecate Component::requires + - Fix warning + - Fix stringListToCharArray and Pool::componentsByCategories + - Port away from deprecated foreach + + as-review: + - Add a typedef for property enums + - Install properties at once rather than individually + - Specify G_PARAM_STATIC_STRINGS for properties + - Emit GObject::notify on property value changes + - Add missing property for as_review_{get,set}_priority() + + ascli: fix NULL pointer dereference + * Miscellaneous: + + docs: Split releases specification into its own section + + style: Make code easier to read by using helper macros in all places + + Make some compiler warnings fatal unconditionally +- Add patch to support meson 0.59 which is the only version available + in SLE 15 SP5: + * support-meson0.59.patch + ------------------------------------------------------------------- Wed Sep 14 13:25:20 UTC 2022 - Christophe Giboudeaux diff --git a/AppStream.spec b/AppStream.spec index 8bb0e70..5b1f71b 100644 --- a/AppStream.spec +++ b/AppStream.spec @@ -1,7 +1,7 @@ # # spec file for package AppStream # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %bcond_without vala %endif Name: AppStream -Version: 0.15.5 +Version: 0.15.6 Release: 0 Summary: Tools and libraries to work with AppStream metadata License: LGPL-2.1-or-later @@ -31,11 +31,12 @@ URL: https://www.freedesktop.org/software/appstream/docs/ Source0: http://www.freedesktop.org/software/appstream/releases/%{name}-%{version}.tar.xz Source1: http://www.freedesktop.org/software/appstream/releases/%{name}-%{version}.tar.xz.asc Source2: %{name}.keyring +Patch0: support-meson0.59.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: gettext BuildRequires: gperf BuildRequires: itstool -BuildRequires: meson >= 0.62 +BuildRequires: meson >= 0.59 BuildRequires: pkgconfig BuildRequires: xsltproc BuildRequires: pkgconfig(Qt5Core) diff --git a/support-meson0.59.patch b/support-meson0.59.patch new file mode 100644 index 0000000..ee91496 --- /dev/null +++ b/support-meson0.59.patch @@ -0,0 +1,91 @@ +Index: AppStream-0.15.6/meson.build +=================================================================== +--- AppStream-0.15.6.orig/meson.build ++++ AppStream-0.15.6/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+', +@@ -112,6 +112,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', +@@ -130,6 +131,7 @@ add_project_arguments( + '-Werror=return-type', + '-Werror=misleading-indentation', + '-Werror=format-security', ++ '-Werror=format', + language: 'cpp' + ) + add_project_arguments('-DAS_COMPILATION', language: 'c') +Index: AppStream-0.15.6/po/meson.build +=================================================================== +--- AppStream-0.15.6.orig/po/meson.build ++++ AppStream-0.15.6/po/meson.build +@@ -1,5 +1,20 @@ + + 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 +27,7 @@ i18n_result = i18n.gettext(as_gettext_do + '--msgid-bugs-address=appstream@lists.freedesktop.org' + ] + ) ++endif + + run_target ('make-linguas', + command: ['sh', +Index: AppStream-0.15.6/data/meson.build +=================================================================== +--- AppStream-0.15.6.orig/data/meson.build ++++ AppStream-0.15.6/data/meson.build +@@ -17,6 +17,18 @@ metainfo_with_relinfo = custom_target('g + command : [ascli_exe, 'news-to-metainfo', '--limit=6', '@INPUT0@', '@INPUT1@', '@OUTPUT@'] + ) + ++ # generates XML with mangled description markup tags, but better than nothing... ++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 +37,7 @@ metainfo_i18n = i18n.itstool_join( + install: true, + install_dir: metainfo_dir, + ) ++endif + + test('as-validate_metainfo.cli', + ascli_exe,