From 7f65cb1a6bfa603e7058088962acbbf89c0b9bee Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 17 Dec 2024 16:57:47 +0800 Subject: appstream: upgrade 1.0.3 -> 1.0.4 0001-remove-hardcoded-path.patch 0002-Do-not-build-qt-tests.patch refreshed for 1.0.4 Changelog: =========== Features: * bundle: Add AS_BUNDLE_KIND_SYSUPDATE * desktop-style-ids: Add dark support for Plasma * desktop-style-ids: add pantheon:dark * qt: Expose branding color * sysinfo: Add memory size detection support for Illumos and Solaris * sysinfo: Add memory size detection support for GNU/Hurd * validator: Don't fail validation if a snapshot release is missing a time Specification: * docs: Note that support for some legacy path was dropped in 1.0 * docs: Update fd.o spec URLs * docs: Better explain desktop applications * Update ESRA website URL Bugfixes: * validator: Make sure we read an initialised variable * qt: Specify utc as the dates' timezone * tests: Ignore some tests on Windows * sysinfo: make uname() usage POSIX compliant * Only emit legacy compat tag developer_name for catalog data * compose: Allow file discovery even in symlinked directories * Avoid a race condition when loading GResource data * validator: Mention length limit in summary length warning message * utils: Explicitly set permissions on installed metadata files * as-vercmp: Fix gtkdoc to not start with '>' Miscellaneous: * desktop-style-ids: Remove Endless * ci: Fix FreeBSD build (update 'py-gi-docgen') * ci: Update to Ubuntu 24.04 for Debian Testing builds * utils: Assume 64px as size when installing an icon tarball of unknown size (From OE-Core rev: 9655af038a0bc7d6775858e6c32d302eec5b3b9b) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../appstream/0001-remove-hardcoded-path.patch | 6 +-- .../appstream/0002-Do-not-build-qt-tests.patch | 6 +-- meta/recipes-support/appstream/appstream_1.0.3.bb | 53 ---------------------- meta/recipes-support/appstream/appstream_1.0.4.bb | 53 ++++++++++++++++++++++ 4 files changed, 59 insertions(+), 59 deletions(-) delete mode 100644 meta/recipes-support/appstream/appstream_1.0.3.bb create mode 100644 meta/recipes-support/appstream/appstream_1.0.4.bb diff --git a/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch index d4d5517ab1..03ac5eb05b 100644 --- a/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch +++ b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch @@ -1,4 +1,4 @@ -From 03f00252c2fc948c0bce1fc0a6ee87adef71d1bb Mon Sep 17 00:00:00 2001 +From 7372848f22d7edc01e40b0533047b34f41f6cf71 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Mon, 12 Dec 2022 15:42:42 +0100 Subject: [PATCH] remove hardcoded path @@ -14,10 +14,10 @@ Upstream-Status: Inappropriate [oe-specific] 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index 5f2eaa22..4a2483a1 100644 +index 7e89ab0..c34ea74 100644 --- a/meson.build +++ b/meson.build -@@ -191,10 +191,10 @@ endif +@@ -194,10 +194,10 @@ endif stemmer_inc_dirs = include_directories() if get_option('stemming') stemmer_lib = cc.find_library('stemmer', required: true) diff --git a/meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch b/meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch index 9a725ab8e4..71c9aadbc9 100644 --- a/meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch +++ b/meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch @@ -1,4 +1,4 @@ -From a7721cf4f412fbe18fe15127bea7b1457b99f684 Mon Sep 17 00:00:00 2001 +From 43afdff090c4cbb2d3b4025a38b25a718c8f16b5 Mon Sep 17 00:00:00 2001 From: Marc Ferland Date: Fri, 26 Jul 2024 15:41:00 -0400 Subject: [PATCH] Do not build qt/tests @@ -23,10 +23,10 @@ Signed-off-by: Marc Ferland 1 file changed, 2 deletions(-) diff --git a/qt/meson.build b/qt/meson.build -index 1909bcf7..c3ca20fb 100644 +index 7d9ed7d..e319425 100644 --- a/qt/meson.build +++ b/qt/meson.build -@@ -148,5 +148,3 @@ install_data ( +@@ -150,5 +150,3 @@ install_data ( # end of Qt version loop endforeach diff --git a/meta/recipes-support/appstream/appstream_1.0.3.bb b/meta/recipes-support/appstream/appstream_1.0.3.bb deleted file mode 100644 index 092d85d1a0..0000000000 --- a/meta/recipes-support/appstream/appstream_1.0.3.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "AppStream is a collaborative effort for making machine-readable software metadata easily available." -HOMEPAGE = "https://github.com/ximion/appstream" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=435ed639f84d4585d93824e7da3d85da" - -DEPENDS = " \ - appstream-native \ - curl-native \ - curl \ - docbook-xml-dtd4-native \ - gperf-native \ - glib-2.0 \ - libyaml \ - libxml2 \ - libxmlb \ - libxslt-native \ - itstool-native \ - docbook-xsl-stylesheets-native \ - python3-pygments-native \ -" - -inherit meson gobject-introspection gettext gi-docgen pkgconfig vala - -GIR_MESON_OPTION = "gir" -GIDOCGEN_MESON_OPTION = "apidocs" - -SRC_URI = " \ - https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz \ - file://0001-remove-hardcoded-path.patch \ - file://0002-Do-not-build-qt-tests.patch \ - file://0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch \ -" -SRC_URI[sha256sum] = "5ab6f6cf644e7875a9508593962e56bb430f4e59ae0bf03be6be7029deb6baa4" - -S = "${WORKDIR}/AppStream-${PV}" - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" - -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" -PACKAGECONFIG[stemming] = "-Dstemming=true,-Dstemming=false,libstemmer" -PACKAGECONFIG[qt6] = "-Dqt=true,-Dqt=false,qtbase" - -FILES:${PN} += "${datadir}" - -EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}" - -BBCLASSEXTEND = "native" - -# Fix meson not finding the Qt build tools in cross-compilation -# setups. See: https://github.com/mesonbuild/meson/issues/13018 -do_configure:prepend:class-target() { - export PATH=${STAGING_DIR_NATIVE}${libexecdir}:$PATH -} diff --git a/meta/recipes-support/appstream/appstream_1.0.4.bb b/meta/recipes-support/appstream/appstream_1.0.4.bb new file mode 100644 index 0000000000..a9c87f7589 --- /dev/null +++ b/meta/recipes-support/appstream/appstream_1.0.4.bb @@ -0,0 +1,53 @@ +SUMMARY = "AppStream is a collaborative effort for making machine-readable software metadata easily available." +HOMEPAGE = "https://github.com/ximion/appstream" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=435ed639f84d4585d93824e7da3d85da" + +DEPENDS = " \ + appstream-native \ + curl-native \ + curl \ + docbook-xml-dtd4-native \ + gperf-native \ + glib-2.0 \ + libyaml \ + libxml2 \ + libxmlb \ + libxslt-native \ + itstool-native \ + docbook-xsl-stylesheets-native \ + python3-pygments-native \ +" + +inherit meson gobject-introspection gettext gi-docgen pkgconfig vala + +GIR_MESON_OPTION = "gir" +GIDOCGEN_MESON_OPTION = "apidocs" + +SRC_URI = " \ + https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz \ + file://0001-remove-hardcoded-path.patch \ + file://0002-Do-not-build-qt-tests.patch \ + file://0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch \ +" +SRC_URI[sha256sum] = "2d218348067f98c4f34a3ffe2d8219ad9f504b1b2481f1872dec66c77bf37509" + +S = "${WORKDIR}/AppStream-${PV}" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" +PACKAGECONFIG[stemming] = "-Dstemming=true,-Dstemming=false,libstemmer" +PACKAGECONFIG[qt6] = "-Dqt=true,-Dqt=false,qtbase" + +FILES:${PN} += "${datadir}" + +EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}" + +BBCLASSEXTEND = "native" + +# Fix meson not finding the Qt build tools in cross-compilation +# setups. See: https://github.com/mesonbuild/meson/issues/13018 +do_configure:prepend:class-target() { + export PATH=${STAGING_DIR_NATIVE}${libexecdir}:$PATH +} -- cgit v1.2.3-54-g00ecf