From patchwork Mon Sep 22 14:20:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 70694 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 56650CAC592 for ; Mon, 22 Sep 2025 14:21:10 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.53335.1758550862249882136 for ; Mon, 22 Sep 2025 07:21:02 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 705061424 for ; Mon, 22 Sep 2025 07:20:53 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 3D5C03F66E for ; Mon, 22 Sep 2025 07:21:01 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/4] libdnf: remove non-functional gtk-doc support Date: Mon, 22 Sep 2025 15:20:30 +0100 Message-ID: <20250922142031.3625684-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250922142031.3625684-1-ross.burton@arm.com> References: <20250922142031.3625684-1-ross.burton@arm.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, 22 Sep 2025 14:21:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/223828 The gtk-doc integration doesn't actually work, as it isn't built by default and the targets need to be triggered manually. As clearly nobody was using it, and upstream appears to prefer doxygen for API documentation, remove the gtk-doc support. This also means adding gettext to the dependencies, as this was being pulled in via gtk-doc before but is actually needed for the translations. Signed-off-by: Ross Burton --- ...-drop-the-requirement-for-GTKDOC_SCA.patch | 28 ------------------- meta/recipes-devtools/libdnf/libdnf_0.74.0.bb | 11 ++++---- 2 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch b/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch deleted file mode 100644 index 0bd5eeb1dae..00000000000 --- a/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 45d06c71976823c610a4719731b68dcd6096888e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 24 Nov 2016 14:33:07 +0200 -Subject: [PATCH] FindGtkDoc.cmake: drop the requirement for - GTKDOC_SCANGOBJ_WRAPPER - -For some reason cmake is not able to find it when building in openembedded, -and it's bundled with the source code anyway. - -Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] -Signed-off-by: Alexander Kanavin ---- - cmake/modules/FindGtkDoc.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/modules/FindGtkDoc.cmake b/cmake/modules/FindGtkDoc.cmake -index 92b2cc7e..39f34bd5 100644 ---- a/cmake/modules/FindGtkDoc.cmake -+++ b/cmake/modules/FindGtkDoc.cmake -@@ -52,7 +52,7 @@ find_program(GTKDOC_MKHTML_EXE gtkdoc-mkhtml PATH "${GLIB_PREFIX}/bin") - find_program(GTKDOC_FIXXREF_EXE gtkdoc-fixxref PATH "${GLIB_PREFIX}/bin") - - find_package_handle_standard_args(GtkDoc -- REQUIRED_VARS GTKDOC_SCAN_EXE GTKDOC_SCANGOBJ_EXE GTKDOC_SCANGOBJ_WRAPPER GTKDOC_MKDB_EXE GTKDOC_MKHTML_EXE GTKDOC_FIXXREF_EXE -+ REQUIRED_VARS GTKDOC_SCAN_EXE GTKDOC_SCANGOBJ_EXE GTKDOC_MKDB_EXE GTKDOC_MKHTML_EXE GTKDOC_FIXXREF_EXE - VERSION_VAR GtkDoc_VERSION) - - # :: diff --git a/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb index aa9e18e763f..fafd8c5905a 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb @@ -5,7 +5,6 @@ LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;protocol=https \ - file://0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch \ file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \ file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ file://enable_test_data_dir_set.patch \ @@ -17,14 +16,16 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p SRCREV = "91a0bf9aada36a722855051526f012e0b5ab1af9" UPSTREAM_CHECK_GITTAGREGEX = "(?P(?!4\.90)\d+(\.\d+)+)" -DEPENDS = "glib-2.0 libsolv librepo rpm gtk-doc libmodulemd json-c swig-native util-linux" +DEPENDS = "glib-2.0 libsolv librepo rpm libmodulemd json-c swig-native util-linux" -inherit gtk-doc cmake pkgconfig setuptools3-base +inherit cmake pkgconfig setuptools3-base gettext -EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DWITH_MAN=OFF -DPYTHON_DESIRED=3 \ +EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 \ + -DWITH_GTKDOC=OFF -DWITH_MAN=OFF -DWITH_HTML=OFF \ -DWITH_TESTS=OFF \ -DWITH_ZCHUNK=OFF \ - -DWITH_HTML=OFF \ " + BBCLASSEXTEND = "native nativesdk" + SKIP_RECIPE[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'Does not build without package_rpm in PACKAGE_CLASSES due disabled rpm support in libsolv', d)}"