mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-11 09:49:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

libdnf: remove non-functional gtk-doc support

Browse Source 
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.

(From OE-Core rev: cd8987a4d044955950dc000a5757175982dcd2f3)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2025-09-22 15:20:30 +01:00
committed by Richard Purdie
parent 933f7f2778
commit 355bf4b259
2 changed files with 6 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch
View File

@@ -1,28 +0,0 @@
From 45d06c71976823c610a4719731b68dcd6096888e Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
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 <alex.kanavin@gmail.com>
---
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)
# ::

11
meta/recipes-devtools/libdnf/libdnf_0.74.0.bb
View File

@@ -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<pver>(?!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)}"