From 1cdf9bb1d2ac11ad3eb5b9d2cef69eebcc7f6351b1560e6948b83cf12e657859 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Thu, 16 Nov 2023 09:08:17 +0000 Subject: [PATCH] Accepting request 1126593 from GNOME:Next Yes I know 1.0 just dropped, but lets get the newly released old stable in first. - Update to version 0.16.4: * Features: - Allow hyphens in the last segment of a component-ID - Implement the developer element for unique developer IDs - Add meson overrides * Bugfixes: - meson: Prevent building attempts with MSVC - meson: Avoid potentially bad sed backup filename when fixing .pc file * Miscellaneous: Make sed invocation more portable - Rebase patch with quilt. OBS-URL: https://build.opensuse.org/request/show/1126593 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/AppStream?expand=0&rev=102 --- AppStream-0.16.3.tar.xz | 3 --- AppStream-0.16.3.tar.xz.asc | 16 ---------------- AppStream-0.16.4.tar.xz | 3 +++ AppStream-0.16.4.tar.xz.asc | 16 ++++++++++++++++ AppStream.changes | 15 +++++++++++++++ AppStream.spec | 2 +- support-meson0.59.patch | 32 ++++++++++++++++---------------- 7 files changed, 51 insertions(+), 36 deletions(-) delete mode 100644 AppStream-0.16.3.tar.xz delete mode 100644 AppStream-0.16.3.tar.xz.asc create mode 100644 AppStream-0.16.4.tar.xz create mode 100644 AppStream-0.16.4.tar.xz.asc diff --git a/AppStream-0.16.3.tar.xz b/AppStream-0.16.3.tar.xz deleted file mode 100644 index 5f3cd62..0000000 --- a/AppStream-0.16.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:081c917646e94d7221c9e4aae54dacda95a27c607fa93cd8e6344a2b318b98b1 -size 2568192 diff --git a/AppStream-0.16.3.tar.xz.asc b/AppStream-0.16.3.tar.xz.asc deleted file mode 100644 index 91bc414..0000000 --- a/AppStream-0.16.3.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE0zo/DKFrCsxRpgc4SUyKX79N7OsFAmTlLiEACgkQSUyKX79N -7OvoBhAAkVsi9+esa/0cm8kwSdI8CvS7Kt+ep37QBm9jJCFr9/RrANnZ8BqQa42/ -Fu1dbX9LC6zzkPjySvLcc8nPsyD1jp6hQ/zj1negeCwru8OTTATI9uCdNKCkeTYI -2Ott6IpQ6yisI2Xj5wBUFcvepfQU3iJ1X37CN0AfFPfL9pfKehd+yuIAfMmAVmxr -sdpNS5Y1J6a7wxEByc97eKKJa+ahTtluNdJM+TVxMa9/gzCE4wmMIWDqHLYXM2lT -Pg7T33YWjHY3+kjGT6INNjobNN779T4JF6Ve01UyzakXxXbuJdxr8zdQvHfPJdg9 -fvL4PmU63WkdheVO2fv625MAhFYlxc86Z1rsumuQ87AQOPDFRHhPSTQEj/IEOKIX -9c4ZwAdriGacRlUk+yXBLdIFUvDFOTxW95wL5iDw5zRCHvjq+g/pJQzr5oLCWCyV -aHBPkfHMZFNwoJgFQCd4qTEXVqD69kTvQg0bIeMh1rC9wyWCV8ydlXjrnGdkSg39 -4gIRR3swQFa5F0oFmhjC/iYn14c/0Cxn8jBlVrZ/IA3cLEA8wkCLbLVdffaOUE6q -mMOd1jsODiePW9bYcrU8H3ZbFXfRTs+PXzv5qUSATBj2d9WO9kCTbKnMcAaxjDO5 -wMXnAVCVnoU5Z67Re1pjGeV6eUY4THoXfcETff1irXrRLWtr/CY= -=vRIK ------END PGP SIGNATURE----- diff --git a/AppStream-0.16.4.tar.xz b/AppStream-0.16.4.tar.xz new file mode 100644 index 0000000..6d269fb --- /dev/null +++ b/AppStream-0.16.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4f722d79c6a2f29d9dc5c6f464927469543353f386581c778c9bed7c60a54ed +size 2570176 diff --git a/AppStream-0.16.4.tar.xz.asc b/AppStream-0.16.4.tar.xz.asc new file mode 100644 index 0000000..4be04a4 --- /dev/null +++ b/AppStream-0.16.4.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE0zo/DKFrCsxRpgc4SUyKX79N7OsFAmVOkngACgkQSUyKX79N +7OuRxA//fS7F5jcyleq33ki3y9G3TJhHpNHRE09Jm8xOgFzibJTLg9XUOF05/jjb +ZYFMPRprcuQ+svUpvDe710+5l2QuJG7u+88AdpO2qE1ZT7FUMV7vGhmRiv9uhZLB +6IkyZzycZV1Lxyx9o9697Xllw0Uu7Ei23JOUz36l16YkPLKkEJOC9TJtjLk2qf63 +EAIiEZ3maX14k6dyQdXdq2e15uqclgu0Mr3RVAKzOSwkZEFTZDNC7/BTT1sX3+aJ +opMflbWsHPKl7hZmv+xvIVTcK4KMGENJpKVzosg/AYawD/i9v/Z+pS7Nie9+jLBP +6RcSJIYHTioPWkElzWgky10dpIKdl/1Cg1rirsJX/JrRvbyMg012TtlZBNtpyyJo +IL+dQoJrR0GyiuikgJ/3lf47aZKNoIDKu1SJ8Mjjb4QVM8CVuQ0LvREQ2AlTk2mQ +5TvYW2PjsUhOzDC1INZ27sCB/+oYgSi4HdhWt8xQdpBznn2FsPgFK0KDJVofgO5r +1H+IydG/7gVK1ujKkxcX/vVIxcR8tohk1sUr4PzxFy2eURAP+Ji99MmjmVoOKsuU +XXA2CPYSiodwAEGqk9MfK4IK6CCPR605n7XfKRw5oWOFgyYx1pIq2S8h1rHs0E9E ++j6lRg00o0Ss4RmlorWthBytB5RoKQIeKHlvhLXVZ71N13O2wbo= +=Fd8i +-----END PGP SIGNATURE----- diff --git a/AppStream.changes b/AppStream.changes index 03cdd77..dcda633 100644 --- a/AppStream.changes +++ b/AppStream.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Nov 15 12:08:06 UTC 2023 - Bjørn Lie + +- Update to version 0.16.4: + * Features: + - Allow hyphens in the last segment of a component-ID + - Implement the developer element for unique developer IDs + - Add meson overrides + * Bugfixes: + - meson: Prevent building attempts with MSVC + - meson: Avoid potentially bad sed backup filename when fixing + .pc file + * Miscellaneous: Make sed invocation more portable +- Rebase patch with quilt. + ------------------------------------------------------------------- Mon Oct 16 15:08:27 UTC 2023 - Antonio Larrosa diff --git a/AppStream.spec b/AppStream.spec index 982a00a..37913ed 100644 --- a/AppStream.spec +++ b/AppStream.spec @@ -23,7 +23,7 @@ %bcond_without vala %endif Name: AppStream -Version: 0.16.3 +Version: 0.16.4 Release: 0 Summary: Tools and libraries to work with AppStream metadata License: LGPL-2.1-or-later diff --git a/support-meson0.59.patch b/support-meson0.59.patch index 8045c71..fa9feae 100644 --- a/support-meson0.59.patch +++ b/support-meson0.59.patch @@ -1,8 +1,8 @@ -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', +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@'] ) @@ -28,10 +28,10 @@ index aea0cb25..55da0981 100644 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 +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', @@ -39,7 +39,7 @@ index b67d1a65..10e3d815 100644 default_options: ['c_std=c11', 'cpp_std=gnu++14'], license: 'LGPL-2.1+', -@@ -114,7 +114,7 @@ add_project_arguments( +@@ -113,7 +113,7 @@ add_project_arguments( '-Werror=missing-include-dirs', '-Werror=declaration-after-statement', '-Werror=format-security', @@ -48,7 +48,7 @@ index b67d1a65..10e3d815 100644 '-Wno-missing-field-initializers', '-Wno-error=missing-field-initializers', '-Wno-unused-parameter', -@@ -132,9 +132,7 @@ add_project_arguments( +@@ -131,9 +131,7 @@ add_project_arguments( '-Werror=return-type', '-Werror=misleading-indentation', '-Werror=format-security', @@ -59,10 +59,10 @@ index b67d1a65..10e3d815 100644 language: 'cpp' ) -diff --git a/po/meson.build b/po/meson.build -index e9ede195..f7c1d842 100644 ---- a/po/meson.build -+++ b/po/meson.build +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' @@ -83,7 +83,7 @@ index e9ede195..f7c1d842 100644 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, +@@ -12,6 +26,7 @@ i18n_result = i18n.gettext(as_gettext_do '--msgid-bugs-address=appstream@lists.freedesktop.org' ] )