commit: 0bc0d3e6710662c10f85720b70233e88ae2415f8 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Wed Jan 15 18:06:10 2025 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Wed Jan 15 18:13:20 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bc0d3e6
dev-util/gtk-doc: add 1.34.0 Closes: https://github.com/gentoo/gentoo/pull/38077 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> Closes: https://bugs.gentoo.org/914917 dev-util/gtk-doc/Manifest | 1 + .../gtk-doc/files/gtk-doc-1.34.0-mkhtml-test.patch | 33 ++++++ dev-util/gtk-doc/gtk-doc-1.34.0.ebuild | 113 +++++++++++++++++++++ 3 files changed, 147 insertions(+) diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest index a2c2e5e9f33e..0bd282af0262 100644 --- a/dev-util/gtk-doc/Manifest +++ b/dev-util/gtk-doc/Manifest @@ -1 +1,2 @@ DIST gtk-doc-1.33.2.tar.xz 507852 BLAKE2B dea3030060ecec89433fe3783dfacc2f58373780c49560a48ab1a32bedfe888692183de8396c92414255e4c8f537358cbc373fd307638ab8e7dbfd9ae44de58f SHA512 f50f68ab6b4bc59f55e84b49c1481f05700171cbf79eca9ba8f3a142a30a4ba88fe096983ebb8d117a9ef8bcea40934674096683d956f5c54cae457d31f651ab +DIST gtk-doc-1.34.0.tar.xz 494116 BLAKE2B cb8550debed9f32b967de9d4ebdde8dbe83551eb8527221d2d788355431f34e62a4beedda3e7f5722516ae8e23794a56b97a4f761ede0f7f2c0ef288624b5f7a SHA512 d962fe31949b5f7c70122c7ebbd98f4d21725697804bf5dd75fd7a6662753a91c9350fd1e8bed22a58a957b173f35e200fcbb4c7c2ebc45ccbc0db2e916b27ea diff --git a/dev-util/gtk-doc/files/gtk-doc-1.34.0-mkhtml-test.patch b/dev-util/gtk-doc/files/gtk-doc-1.34.0-mkhtml-test.patch new file mode 100644 index 000000000000..982b5bd11f7a --- /dev/null +++ b/dev-util/gtk-doc/files/gtk-doc-1.34.0-mkhtml-test.patch @@ -0,0 +1,33 @@ +From 951743698610eaaa0cc9030f7d7d02437419ac24 Mon Sep 17 00:00:00 2001 +From: Neil Hanlon <[email protected]> +Date: Fri, 9 Feb 2024 15:32:38 -0500 +Subject: [PATCH] Add gobject example source code to path for mkhtml test + +Fixes #150 + +I'm not really sure why this is required, but I suspect it has to do +with changes in how GCC handles path traversal due to recent (ish) +security issues, as the code here is evaluated to +`../xml/../../examples/gobject.c` which probably looks unhealthy to +automatically include. + +Signed-off-by: Neil Hanlon <[email protected]> +--- + tests/gobject/docs/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/gobject/docs/meson.build b/tests/gobject/docs/meson.build +index a1dd66c..236a1cc 100644 +--- a/tests/gobject/docs/meson.build ++++ b/tests/gobject/docs/meson.build +@@ -119,6 +119,7 @@ test( + '--path=@0@'.format(':'.join([ + gobject_test_docs_dir, + srcdir, ++ join_paths(srcdir, 'tests/gobject/examples'), + ]) + ), + ], +-- +GitLab + diff --git a/dev-util/gtk-doc/gtk-doc-1.34.0.ebuild b/dev-util/gtk-doc/gtk-doc-1.34.0.ebuild new file mode 100644 index 000000000000..49e15e21f1e3 --- /dev/null +++ b/dev-util/gtk-doc/gtk-doc-1.34.0.ebuild @@ -0,0 +1,113 @@ +# 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 +) + +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 +}
