diff --git a/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch deleted file mode 100644 index d0cb5cf6f495..000000000000 --- a/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0a532ef29855599e4761923bb38069e98d78e25f Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Mon, 12 Dec 2022 15:42:42 +0100 -Subject: [PATCH] remove hardcoded path - -Signed-off-by: Markus Volk - -Dont include hardcoded path. This fixes: -| cc1: error: include location "/usr/include" is unsafe for cross-compilation [-Werror=poison-system-directories] - -Upstream-Status: Inappropriate [oe-specific] ---- - meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 004dce3..cefb852 100644 ---- a/meson.build -+++ b/meson.build -@@ -229,10 +229,10 @@ endif - stemmer_inc_dirs = include_directories() - if get_option('stemming') - stemmer_lib = cc.find_library('stemmer', required: true) -- stemmer_inc_dirs = include_directories(['/usr/include']) -+ stemmer_inc_dirs = include_directories(['']) - if not cc.has_header('libstemmer.h') - if cc.has_header('libstemmer/libstemmer.h') -- stemmer_inc_dirs = include_directories('/usr/include/libstemmer') -+ stemmer_inc_dirs = include_directories('') - else - error('Unable to find Snowball header "libstemmer.h". Please ensure libstemmer/Snowball is installed properly in order to continue.') - endif 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 861d9552a50e..5f35a8bf2300 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 0d387b6cb8907dd377212de187fbe749b40eedb4 Mon Sep 17 00:00:00 2001 +From 1110cb5c658de30c63642929c1128ab4f9b9b98e 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,7 +23,7 @@ Signed-off-by: Marc Ferland 1 file changed, 2 deletions(-) diff --git a/qt/meson.build b/qt/meson.build -index 488fe60..83c2715 100644 +index 488fe60b61c0..83c2715c5fe7 100644 --- a/qt/meson.build +++ b/qt/meson.build @@ -144,5 +144,3 @@ install_data ( diff --git a/meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch b/meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch index 9f06f789162e..3774bfa7c617 100644 --- a/meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch +++ b/meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch @@ -1,4 +1,4 @@ -From 2c0758a84741e6e91cfd1ba70e9017ba4e76143a Mon Sep 17 00:00:00 2001 +From b8d73820cdb685089c0f805c7ca8163b21a78acd Mon Sep 17 00:00:00 2001 From: Marc Ferland Date: Mon, 29 Jul 2024 09:35:51 -0400 Subject: [PATCH] Fix PACKAGE_PREFIX_DIR in qt/cmake/AppStreamQtConfig.cmake.in @@ -39,7 +39,7 @@ Signed-off-by: Marc Ferland 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt/cmake/AppStreamQtConfig.cmake.in b/qt/cmake/AppStreamQtConfig.cmake.in -index 63df65f..5ab2d0e 100644 +index 63df65f25676..5ab2d0ec7bd3 100644 --- a/qt/cmake/AppStreamQtConfig.cmake.in +++ b/qt/cmake/AppStreamQtConfig.cmake.in @@ -1,5 +1,5 @@ diff --git a/meta/recipes-support/appstream/appstream_1.2.0.bb b/meta/recipes-support/appstream/appstream_1.2.1.bb similarity index 80% rename from meta/recipes-support/appstream/appstream_1.2.0.bb rename to meta/recipes-support/appstream/appstream_1.2.1.bb index 4a1c23e760fd..fcfc1aea6ccd 100644 --- a/meta/recipes-support/appstream/appstream_1.2.0.bb +++ b/meta/recipes-support/appstream/appstream_1.2.1.bb @@ -18,13 +18,11 @@ inherit meson gobject-introspection gettext gi-docgen pkgconfig vala bash-comple 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] = "901919378910550271feb2d826034c9af6522f3ad218de04d3d6d35ddba5cb45" +SRC_URI = "https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz \ + file://0002-Do-not-build-qt-tests.patch \ + file://0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch \ + " +SRC_URI[sha256sum] = "7df664fd3ad3b1640c6a0ff77fa84f9fabe264111bf1fe8f5df3444d6d4caaca" S = "${UNPACKDIR}/AppStream-${PV}"