From patchwork Mon Jul 29 15:09:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Ferland X-Patchwork-Id: 47003 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AA85C3DA4A for ; Mon, 29 Jul 2024 15:09:39 +0000 (UTC) Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) by mx.groups.io with SMTP id smtpd.web10.58282.1722265771558621132 for ; Mon, 29 Jul 2024 08:09:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eHfYongy; spf=pass (domain: gmail.com, ip: 209.85.208.174, mailfrom: marc.ferland@gmail.com) Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2ef2ed592f6so40586381fa.0 for ; Mon, 29 Jul 2024 08:09:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722265769; x=1722870569; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0Dp+Sac21wVgKeyQaZgxJHvcbzAiY8v0pzh7luPHt90=; b=eHfYongy9q+mz+dNPzm4zoQ8m87c916cQxSBXrN8UbgrOKdGlJ2uWefIAzn17M8n5B MC9BKj5sHPrQsQ1ld5P6YPuQsh3IKQL/0dRt21rtiTWx9x96H34nlysIYvqhUU0IlnP0 +RRN+soZulQYfX9NsaxZ48mV0m77wAOl9EWj/Qapbs+SVdnB5DFbAtwx8gXBOcsmYpFO EmuF7WyC1WVTsx/0VzC1DRFiZrbiT1RbLI31XeGTApKBhZRTlSRfC9wfcqRVz+ylH2ZQ wO7YDlsXh5JFd4GLdP4Ynkg4emZVZ35L1yR+npuG/FSCVxGyMg9PkGiuodV6Zjh+EhgS tIuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722265769; x=1722870569; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0Dp+Sac21wVgKeyQaZgxJHvcbzAiY8v0pzh7luPHt90=; b=kLU1shYLlys48Tix/C8M2ddxHBaRc+u8Xt6s/kX8xhiZ+/J33oMClGi5334oNgizas gJX5U6I9q/mkGrCNWUIGKJ5BSg7NcaGfvEyabSJcszIlDOlhWHHQHgA5mWvASKP5S2d3 KVVTuXk51RuiPn6wQlsqKu++RteymIlYuZlXtphsHzLbav5NMop3gq4GIh802nQ5BqXF rhIrPZwlXF3Ez3axt3fqRUCHESqKe/wqMDKzaA9LgmBETQ5rfr6M5crG2q2MT4Obn/xZ T8Vf3T5g62lqQuInuj9sQciGsynlUdzyKDabRsdkPs9TOuxWGRoyNXla+NHbbOpXRDvE 4X6A== X-Gm-Message-State: AOJu0YxxyrEb8JnI3Y1OWWehqoJ/VPXAXFRslsAm6ApNazc14kOtxMu1 7kE64CR9n/e6L/sEySeGukLeWQHi328qwK4FiBGSvYgP1pQKaAgn8RWDNQ== X-Google-Smtp-Source: AGHT+IGan2ocKNUHW5qjfQUToJtGjtwxZQxb9vrYQ1KtSK1tNr6lDW6+NNfb9ogfVolmdRUGrWAaSg== X-Received: by 2002:a2e:2e17:0:b0:2ef:2504:22d8 with SMTP id 38308e7fff4ca-2f12ee6337bmr49382681fa.48.1722265768442; Mon, 29 Jul 2024 08:09:28 -0700 (PDT) Received: from mfe-desktop.Sonatest.net (ipagstaticip-d73c7528-4de5-0861-800b-03d8b15e3869.sdsl.bell.ca. [174.94.156.236]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-42820af1df0sm13626155e9.42.2024.07.29.08.09.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 08:09:27 -0700 (PDT) From: marc.ferland@gmail.com X-Google-Original-From: marc.ferland@sonatest.com To: openembedded-core@lists.openembedded.org Cc: Marc Ferland Subject: [PATCH 1/2] appstream: refresh patch Date: Mon, 29 Jul 2024 11:09:06 -0400 Message-Id: <20240729150907.1552685-1-marc.ferland@sonatest.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 29 Jul 2024 15:09:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202656 From: Marc Ferland Refresh patch for 1.0.3 release. Signed-off-by: Marc Ferland --- .../appstream/appstream/0001-remove-hardcoded-path.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 bc811d67b0..d4d5517ab1 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 fe9ebb8c0fa7b84a9c5c667386b8fbb3baea2fad Mon Sep 17 00:00:00 2001 +From 03f00252c2fc948c0bce1fc0a6ee87adef71d1bb 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 fa171d5..79d5168 100644 +index 5f2eaa22..4a2483a1 100644 --- a/meson.build +++ b/meson.build -@@ -185,10 +185,10 @@ endif +@@ -191,10 +191,10 @@ endif stemmer_inc_dirs = include_directories() if get_option('stemming') stemmer_lib = cc.find_library('stemmer', required: true) From patchwork Mon Jul 29 15:09:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marc Ferland X-Patchwork-Id: 47004 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3141C3DA61 for ; Mon, 29 Jul 2024 15:09:48 +0000 (UTC) Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by mx.groups.io with SMTP id smtpd.web10.58285.1722265780792156794 for ; Mon, 29 Jul 2024 08:09:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Kz9uev/f; spf=pass (domain: gmail.com, ip: 209.85.208.172, mailfrom: marc.ferland@gmail.com) Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2ef2d7d8854so45777951fa.0 for ; Mon, 29 Jul 2024 08:09:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722265779; x=1722870579; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oNuURl0zo3tJcR6kWO/0OydGyAt0+idTbMOGzQkua10=; b=Kz9uev/f4IfLIsp1DiC53cXOPTeo0/IOwfyjBzImE7+6hryhGfILgYoGa0KKgNCStC H74GXCslDkbDrRMDLvVdHvZmYmsB2zmpKLlHYzdQ/n0yiEPMlTyDSYn5vjmH6+G1SUdL thJWlvHxJ8Lrpi9DpCZ/m026+S/Y4oLuOi5K9NWvCIUcDFgFL8qWnNw8U2sLzh9hrwTb LqGOKm2sBRlT1vutmxQTtiARe3Ua4Vu/mUGb7PuV2v8znwP0b+S4lYlDEmMBqdw7CNAt TxvtHLNPXGt8Ez9pfSbQPVQcGRkfvobB/WR9IKr9S22wFuNZX6WBDJ15hUv9o21UfoV0 2nMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722265779; x=1722870579; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oNuURl0zo3tJcR6kWO/0OydGyAt0+idTbMOGzQkua10=; b=IXz7rvbgXlVhXbWiCEc/Upny/Rgv1+fmTXgFH58JJ6cR1LK06rATru7nBwBtP7Lp6N xwIyZ4Gza6lTkZcGYUJvFsQfQGOiMiYz4GN0mxUuvCMil0CnoKk7b627XlnicEX1c5r1 kfEPh0EPqH676k6gzByJps2V86SB06CMho92XhLqnOfIlScdgv04B5TSCxbRBUCG8YD+ M5xveSkgsLi5Id87JCeaSAWyemIJwMIRc7p6wPvzC02vB2e0VYEV4Vx6eDQt237gH/cq eStWN2mZgnpzyjiUZT71N0SxtbZUS67uM4PUA/SOvYJ2cifkMzEhUwTqz9Q9I1Hi8hCt xB0Q== X-Gm-Message-State: AOJu0YxkNi8+RIwYbMQ2KtOEV9ez1JGsYAr+lmAxJ7JO+VhkzKgt7Uub ZCDH3n2PGN94MDtfljmmCUkea0/gvp0vzCLw9Y6Iyw075yRCsUqJtJz5qg== X-Google-Smtp-Source: AGHT+IGmnQRB7E2dSWkewlhNRLnOJI9gcN//sZYsQ5kd7QxqhZA4TyYuwub0wjQBXM9TmpmHZYURFg== X-Received: by 2002:a2e:7c02:0:b0:2ef:2e8f:73e9 with SMTP id 38308e7fff4ca-2f12ee1bd2dmr52304141fa.37.1722265777658; Mon, 29 Jul 2024 08:09:37 -0700 (PDT) Received: from mfe-desktop.Sonatest.net (ipagstaticip-d73c7528-4de5-0861-800b-03d8b15e3869.sdsl.bell.ca. [174.94.156.236]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-42820af1df0sm13626155e9.42.2024.07.29.08.09.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 08:09:37 -0700 (PDT) From: marc.ferland@gmail.com X-Google-Original-From: marc.ferland@sonatest.com To: openembedded-core@lists.openembedded.org Cc: Marc Ferland Subject: [PATCH 2/2] appstream: add qt6 PACKAGECONFIG option Date: Mon, 29 Jul 2024 11:09:07 -0400 Message-Id: <20240729150907.1552685-2-marc.ferland@sonatest.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240729150907.1552685-1-marc.ferland@sonatest.com> References: <20240729150907.1552685-1-marc.ferland@sonatest.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 29 Jul 2024 15:09:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202657 From: Marc Ferland This will enable building the libAppStreamQt library. This is required by the 'discover' application from the meta-kde layer. Signed-off-by: Marc Ferland --- .../0002-Do-not-build-qt-tests.patch | 34 +++++++++++++ ...IX_DIR-in-qt-cmake-AppStreamQtConfig.patch | 49 +++++++++++++++++++ .../appstream/appstream_1.0.3.bb | 9 ++++ 3 files changed, 92 insertions(+) create mode 100644 meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch create mode 100644 meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch 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 new file mode 100644 index 0000000000..9a725ab8e4 --- /dev/null +++ b/meta/recipes-support/appstream/appstream/0002-Do-not-build-qt-tests.patch @@ -0,0 +1,34 @@ +From a7721cf4f412fbe18fe15127bea7b1457b99f684 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 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes the following build failure: + +| In file included from /home/marc/mnt/yocto-kde/build/tmp/work/x86_64-linux/appstream-native/1.0.3/recipe-sysroot-native/usr/include/QtTest/QtTest:11, +| from ../AppStream-1.0.3/qt/tests/asqt-pool-test.cpp:21: +| ../AppStream-1.0.3/qt/tests/asqt-pool-test.cpp: In function β€˜int main(int, char**)’: +| ../AppStream-1.0.3/qt/tests/asqt-pool-test.cpp:117:1: error: expected primary-expression before β€˜)’ token +| 117 | QTEST_MAIN(PoolReadTest) +| | ^~~~~~~~~~ + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Marc Ferland +--- + qt/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/qt/meson.build b/qt/meson.build +index 1909bcf7..c3ca20fb 100644 +--- a/qt/meson.build ++++ b/qt/meson.build +@@ -148,5 +148,3 @@ install_data ( + + # end of Qt version loop + endforeach +- +-subdir('tests/') 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 new file mode 100644 index 0000000000..aa49b65c65 --- /dev/null +++ b/meta/recipes-support/appstream/appstream/0003-Fix-PACKAGE_PREFIX_DIR-in-qt-cmake-AppStreamQtConfig.patch @@ -0,0 +1,49 @@ +From c36b6226479a20ebd910f355deddb9d5c7571213 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 + +PACKAGE_PREFIX_DIR points to an invalid directory. This breaks +librairies linking to appstream-qt. + +For example, when building the 'discover' package from the meta-kde +layer we get the following build error: + +| CMake Error in libdiscover/CMakeLists.txt: +| Imported target "AppStreamQt" includes non-existent path +| +| "/path/to/build/tmp/work/core2-64-poky-linux/discover/6.1.3/recipe-sysroot/include/" +| +| in its INTERFACE_INCLUDE_DIRECTORIES. Possible reasons include: +| +| * The path was deleted, renamed, or moved to another location. +| +| * An install or uninstall procedure did not complete successfully. +| +| * The installation package was faulty and references files it does not +| provide. + +The path above should've been: + + /path/to/build/tmp/work/core2-64-poky-linux/discover/6.1.3/recipe-sysroot/usr/include/ + +instead of: + + /path/to/build/tmp/work/core2-64-poky-linux/discover/6.1.3/recipe-sysroot/include/ + +Upstream-Status: Inappropriate [upstream ticket https://github.com/ximion/appstream/issues/643] +--- + qt/cmake/AppStreamQtConfig.cmake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qt/cmake/AppStreamQtConfig.cmake.in b/qt/cmake/AppStreamQtConfig.cmake.in +index 63df65f2..5ab2d0ec 100644 +--- a/qt/cmake/AppStreamQtConfig.cmake.in ++++ b/qt/cmake/AppStreamQtConfig.cmake.in +@@ -1,5 +1,5 @@ + +-get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../../" ABSOLUTE) ++get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE) + + # Use original install prefix when loaded through a "/usr move" + # cross-prefix symbolic link such as /lib -> /usr/lib. diff --git a/meta/recipes-support/appstream/appstream_1.0.3.bb b/meta/recipes-support/appstream/appstream_1.0.3.bb index 625e85a0ae..092d85d1a0 100644 --- a/meta/recipes-support/appstream/appstream_1.0.3.bb +++ b/meta/recipes-support/appstream/appstream_1.0.3.bb @@ -27,6 +27,8 @@ 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" @@ -36,9 +38,16 @@ 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 +}