commit: be8ff84c44fcbe2b008c2c9a86bf9947d1b1f6a5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Dec 12 01:55:13 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Dec 12 02:01:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be8ff84c
app-text/doxygen: fix emitting duplicate type names ... breaking wxpython. Closes: https://bugs.gentoo.org/966843 Thanks-to: Blake Batson <bbatson101 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> app-text/doxygen/doxygen-1.15.0-r1.ebuild | 141 +++++++++++++++++++++ .../doxygen-1.15.0-duplicate-type-names.patch | 50 ++++++++ 2 files changed, 191 insertions(+) diff --git a/app-text/doxygen/doxygen-1.15.0-r1.ebuild b/app-text/doxygen/doxygen-1.15.0-r1.ebuild new file mode 100644 index 000000000000..83b841296af2 --- /dev/null +++ b/app-text/doxygen/doxygen-1.15.0-r1.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( 18 19 20 21 ) +LLVM_OPTIONAL=1 +PYTHON_COMPAT=( python3_{11..14} ) +PYTHON_REQ_USE="xml(+)" + +inherit cmake flag-o-matic llvm-r1 python-any-r1 + +DESCRIPTION="Documentation system for most programming languages" +HOMEPAGE="https://www.doxygen.nl/"; + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"; +else + SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz"; + SRC_URI+=" https://downloads.sourceforge.net/doxygen/rel-${PV}/${P}.src.tar.gz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +fi + +# GPL-2 also for bundled libmscgen +LICENSE="GPL-2" +SLOT="0" +IUSE="clang debug doc dot doxysearch gui test" +# - We need TeX for tests, bug #765472 +# - We keep the odd construct of noop USE=test because of +# the special relationship b/t RESTRICT & USE for tests. +# Also, it's a hint which avoids tests being silently skipped during arch testing. +REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} ) test? ( doc )" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + ${PYTHON_DEPS} +" +RDEPEND=" + app-text/ghostscript-gpl + dev-db/sqlite:3 + dev-lang/perl + dev-libs/libfmt:= + dev-libs/spdlog:= + virtual/libiconv + clang? ( + $(llvm_gen_dep ' + llvm-core/clang:${LLVM_SLOT}= + llvm-core/llvm:${LLVM_SLOT}= + ') + ) + dot? ( + media-gfx/graphviz[freetype(+)] + ) + doc? ( + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + dev-texlive/texlive-plaingeneric + ) + doxysearch? ( dev-libs/xapian:= ) + gui? ( dev-qt/qtbase:6[gui,widgets,xml] ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-1.15.0-link_with_pthread.patch" + "${FILESDIR}/${PN}-1.14.0-suppress-unused-option-libcxx.patch" + "${FILESDIR}/${PN}-1.15.0-duplicate-type-names.patch" +) + +DOCS=( LANGUAGE.HOWTO README.md ) + +pkg_setup() { + use clang && llvm-r1_pkg_setup + python-any-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # Call dot with -Teps instead of -Tps for EPS generation - bug #282150 + sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die + + # fix pdf doc + sed -i.orig -e "s:g_kowal:g kowal:" \ + doc/maintainers.txt || die + + if is-flagq "-O3" ; then + # TODO: Investigate this and report a bug accordingly... + ewarn "Compiling with -O3 is known to produce incorrectly" + ewarn "optimized code which breaks doxygen. Using -O2 instead." + replace-flags "-O3" "-O2" + fi +} + +src_configure() { + # Very slow to compile, bug #920092 + filter-flags -fipa-pta + # -Wodr warnings, see bug #854357 and https://github.com/doxygen/doxygen/issues/9287 + filter-lto + + local mycmakeargs=( + -Duse_libclang=$(usex clang) + # Let the user choose instead, see also bug #822615 + -Duse_libc++=OFF + -Dbuild_doc=$(usex doc) + -Dbuild_search=$(usex doxysearch) + -Dbuild_wizard=$(usex gui) + -Dforce_qt=Qt6 + -Duse_sys_fmt=ON + -Duse_sys_spdlog=ON + -Duse_sys_sqlite3=ON + -DBUILD_SHARED_LIBS=OFF + -DGIT_EXECUTABLE="false" + + # Noisy and irrelevant downstream + -Wno-dev + ) + + use doc && mycmakeargs+=( + -DDOC_INSTALL_DIR="share/doc/${P}" + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + export VARTEXFONTS="${T}/fonts" # bug #564944 + + # -j1 for bug #770070 + cmake_src_compile docs -j1 + fi +} diff --git a/app-text/doxygen/files/doxygen-1.15.0-duplicate-type-names.patch b/app-text/doxygen/files/doxygen-1.15.0-duplicate-type-names.patch new file mode 100644 index 000000000000..99331064a258 --- /dev/null +++ b/app-text/doxygen/files/doxygen-1.15.0-duplicate-type-names.patch @@ -0,0 +1,50 @@ +https://bugs.gentoo.org/966843 +https://github.com/wxWidgets/Phoenix/issues/2820 +https://github.com/doxygen/doxygen/issues/11889 +https://github.com/doxygen/doxygen/commit/148e93969da016a8d8ecf1fcdb9fcf045471d688 + +From 148e93969da016a8d8ecf1fcdb9fcf045471d688 Mon Sep 17 00:00:00 2001 +From: Blake Batson <[email protected]> +Date: Wed, 10 Dec 2025 20:43:32 -0500 +Subject: [PATCH] Fix duplicate type names + +--- + src/util.cpp | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/util.cpp b/src/util.cpp +index 89e49d9aff1..ddb4829117c 100644 +--- a/src/util.cpp ++++ b/src/util.cpp +@@ -979,6 +979,7 @@ void linkifyText(const TextGeneratorIntf &out, const Definition *scope, + { + const ClassDef *cd=nullptr; + const ConceptDef *cnd=nullptr; ++ const Definition *d=nullptr; + //printf("** Match word '%s'\n",qPrint(matchWord)); + + SymbolResolver resolver(fileScope); +@@ -1010,7 +1011,12 @@ void linkifyText(const TextGeneratorIntf &out, const Definition *scope, + } + } + }; +- if ((cd=getClass(matchWord))) ++ ++ if (found) ++ { ++ //printf(" -> skip\n"); ++ } ++ else if ((cd=getClass(matchWord))) + { + writeCompoundName(cd); + } +@@ -1022,7 +1028,7 @@ void linkifyText(const TextGeneratorIntf &out, const Definition *scope, + { + writeCompoundName(cnd); + } +- else if (const Definition *d=nullptr; cd==nullptr && !found && (d=resolver.resolveSymbol(scope,matchWord))) ++ else if ((d=resolver.resolveSymbol(scope,matchWord))) + { + writeCompoundName(d); + } +
