commit: be73d21dffb37583bc2a9f94ff4428a158a6c211 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jun 30 17:18:40 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Jun 30 20:53:29 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be73d21d
dev-util/gtk-doc: Fix GtkDocScanGObjWrapper.cmake module w/ CMake-4 Only changes a cmake module used by revdeps, not dropping stable keywords. Closes: https://bugs.gentoo.org/957671 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-util/gtk-doc/files/gtk-doc-1.34.0-cmake4.patch | 26 +++++ dev-util/gtk-doc/gtk-doc-1.34.0-r2.ebuild | 116 +++++++++++++++++++++ 2 files changed, 142 insertions(+) diff --git a/dev-util/gtk-doc/files/gtk-doc-1.34.0-cmake4.patch b/dev-util/gtk-doc/files/gtk-doc-1.34.0-cmake4.patch new file mode 100644 index 000000000000..b6e7aaaf9486 --- /dev/null +++ b/dev-util/gtk-doc/files/gtk-doc-1.34.0-cmake4.patch @@ -0,0 +1,26 @@ +From 813e79e0147b7fbdea82dfe8927f01634f866aa5 Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" <[email protected]> +Date: Fri, 14 Mar 2025 00:58:14 -0400 +Subject: [PATCH] Update CMake minimum version from 3.2 to 3.12 + +Support CMake 4.0 (which drops support for CMake<3.5) +--- + buildsystems/cmake/GtkDocScanGObjWrapper.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/buildsystems/cmake/GtkDocScanGObjWrapper.cmake b/buildsystems/cmake/GtkDocScanGObjWrapper.cmake +index b187ebb2..47b8d643 100644 +--- a/buildsystems/cmake/GtkDocScanGObjWrapper.cmake ++++ b/buildsystems/cmake/GtkDocScanGObjWrapper.cmake +@@ -20,7 +20,7 @@ + + # This is needed for find_package(PkgConfig) to work correctly -- + # CMAKE_MINIMUM_REQUIRED_VERSION needs to be defined. +-cmake_minimum_required(VERSION 3.2) ++cmake_minimum_required(VERSION 3.12) + + if(NOT APPLE) + # We use pkg-config to find glib et al +-- +GitLab + diff --git a/dev-util/gtk-doc/gtk-doc-1.34.0-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.34.0-r2.ebuild new file mode 100644 index 000000000000..7d3dcb03eeb1 --- /dev/null +++ b/dev-util/gtk-doc/gtk-doc-1.34.0-r2.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..13} ) + +inherit elisp-common gnome.org meson python-single-r1 readme.gentoo-r1 + +DESCRIPTION="GTK+ Documentation Generator" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gtk-doc"; + +LICENSE="GPL-2+ FDL-1.1" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +IUSE="emacs test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + >=dev-libs/glib-2.38:2 + dev-libs/libxslt + >=dev-libs/libxml2-2.3.6:2= + ~app-text/docbook-xml-dtd-4.3 + app-text/docbook-xsl-stylesheets + ~app-text/docbook-sgml-dtd-3.0 + >=app-text/docbook-dsssl-stylesheets-1.40 + emacs? ( >=app-editors/emacs-23.1:* ) + $(python_gen_cond_dep ' + dev-python/pygments[${PYTHON_USEDEP}] + ') +" +DEPEND="${RDEPEND} + test? ( + $(python_gen_cond_dep ' + dev-python/parameterized[${PYTHON_USEDEP}] + ') + ) +" +BDEPEND=" + ~dev-build/gtk-doc-am-${PV} + dev-util/itstool + virtual/pkgconfig +" + +PATCHES=( + # Remove global Emacs keybindings, bug #184588 + "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch + + # https://gitlab.gnome.org/GNOME/gtk-doc/-/issues/150 + "${FILESDIR}"/${PN}-1.34.0-mkhtml-test.patch + + # https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/101 + "${FILESDIR}"/${PN}-1.34.0-cmake4.patch # bug 957671 +) + +pkg_setup() { + DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs. + You may set your own key bindings for \"gtk-doc-insert\" and + \"gtk-doc-insert-section\" in your ~/.emacs file." + SITEFILE=61${PN}-gentoo.el + python-single-r1_pkg_setup +} + +src_prepare() { + default + + # Requires the unpackaged Python "anytree" module + sed -i -e '/mkhtml2/d' "${S}"/tests/meson.build || die +} + +src_configure() { + local emesonargs=( + -Dautotools_support=true + -Dcmake_support=true + -Dyelp_manual=true + $(meson_use test tests) + ) + meson_src_configure +} + +src_compile() { + meson_src_compile + use emacs && elisp-compile tools/gtk-doc.el +} + +src_install() { + meson_src_install + + # The meson build system configures the shebangs to the temporary python + # used during the build. We need to fix it. + sed -i -e 's:^#!.*python3:#!/usr/bin/env python3:' "${ED}"/usr/bin/* || die + python_fix_shebang "${ED}"/usr/bin + + # Don't install this file, it's in gtk-doc-am now + rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4" + rmdir "${ED}"/usr/share/aclocal || die + + if use emacs; then + elisp-install ${PN} tools/gtk-doc.el* + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + readme.gentoo_create_doc + fi +} + +pkg_postinst() { + if use emacs; then + elisp-site-regen + readme.gentoo_print_elog + fi +} + +pkg_postrm() { + use emacs && elisp-site-regen +}
