commit: 467d2011bce489b4491a90a6bce907273df250f8 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Sun Nov 23 11:26:42 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Nov 26 03:06:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=467d2011
app-text/doxygen: add 1.15.0 Closes: https://bugs.gentoo.org/966393 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44741 Signed-off-by: Sam James <sam <AT> gentoo.org> app-text/doxygen/Manifest | 1 + .../{doxygen-9999.ebuild => doxygen-1.15.0.ebuild} | 10 ++-------- app-text/doxygen/doxygen-9999.ebuild | 10 ++-------- .../files/doxygen-1.15.0-link_with_pthread.patch | 22 ++++++++++++++++++++++ 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/app-text/doxygen/Manifest b/app-text/doxygen/Manifest index d3f99e01d0ef..5f956013caae 100644 --- a/app-text/doxygen/Manifest +++ b/app-text/doxygen/Manifest @@ -1,3 +1,4 @@ DIST doxygen-1.13.0.src.tar.gz 8502031 BLAKE2B 8a12ed632772b48d07ea4edf16032f491e05b4718d38160ebc1f3d8de1cdf96bca827da28048907cf538a286757ddf56c503fbe08dcfc5a17cc72fea7233a466 SHA512 f6cae74bd8df9c6c2ba3fa21fc33926e6d5eba65101776f84c1fa056d9231d69e232a30d7702b53a284543fc4765edadb10f4d4b4a46314fa08580963d9226fb DIST doxygen-1.13.2.src.tar.gz 8512178 BLAKE2B d1a5051b49924580cf2e4f58df12da6ff6f9f02490957b1a1562a7587763ab32bac11b0c7d3456d6fee48e7284ee8a265e90d1862a40af2c6deb9d1ebdef72e9 SHA512 7b6b3285706e10c0b27230503b83cc669aec83ebc3ef9cc1087d5e36118fd726a5368d567dd553ba01acf4d739cdbb41c5e66af4541fc8e51effbbdaa241c812 DIST doxygen-1.14.0.src.tar.gz 8681251 BLAKE2B 7de83955033348bea7ecb8d4b2b106192496ffcd062b5fff7f7cfe1f8d25b372d661608f92a5fdfc14489b7343fd19819dd1c86de0d936136714a4f1edd89595 SHA512 b042f7f731cd17bea55f7393dd90433f49fa296a61054950c2e1457ff1d57e218706cbc4f5248f42c2242bf1acccd91e88cf545ca394a31a4d2d8b7f5954baa9 +DIST doxygen-1.15.0.src.tar.gz 9203196 BLAKE2B 461d65ad4a18488cd8c89fc1268bb57e31964cac431acfca8c5ad3947d70f47af441579cad6b54945b337c57fb8ad0e219f804a1d8cfdda3b2595fb9803e7605 SHA512 e53cc8da6cf1fe3ca3b3637647ed6afa28365351eac81d010f6691d939df5e449b3d898a6f695dd850d12659dfd7018fc864071b30fbca5dd196dc094ec4371e diff --git a/app-text/doxygen/doxygen-9999.ebuild b/app-text/doxygen/doxygen-1.15.0.ebuild similarity index 93% copy from app-text/doxygen/doxygen-9999.ebuild copy to app-text/doxygen/doxygen-1.15.0.ebuild index 8034d606d175..c3668f4abe0f 100644 --- a/app-text/doxygen/doxygen-9999.ebuild +++ b/app-text/doxygen/doxygen-1.15.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -LLVM_COMPAT=( 18 19 20 ) +LLVM_COMPAT=( 18 19 20 21 ) LLVM_OPTIONAL=1 PYTHON_COMPAT=( python3_{11..14} ) PYTHON_REQ_USE="xml(+)" @@ -68,7 +68,7 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch" + "${FILESDIR}/${PN}-1.15.0-link_with_pthread.patch" "${FILESDIR}/${PN}-1.14.0-suppress-unused-option-libcxx.patch" ) @@ -134,12 +134,6 @@ src_compile() { if use doc; then export VARTEXFONTS="${T}/fonts" # bug #564944 - if ! use dot; then - sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ - {testing/Doxyfile,doc/Doxyfile} \ - || die "disabling dot failed" - fi - # -j1 for bug #770070 cmake_src_compile docs -j1 fi diff --git a/app-text/doxygen/doxygen-9999.ebuild b/app-text/doxygen/doxygen-9999.ebuild index 8034d606d175..c3668f4abe0f 100644 --- a/app-text/doxygen/doxygen-9999.ebuild +++ b/app-text/doxygen/doxygen-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -LLVM_COMPAT=( 18 19 20 ) +LLVM_COMPAT=( 18 19 20 21 ) LLVM_OPTIONAL=1 PYTHON_COMPAT=( python3_{11..14} ) PYTHON_REQ_USE="xml(+)" @@ -68,7 +68,7 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch" + "${FILESDIR}/${PN}-1.15.0-link_with_pthread.patch" "${FILESDIR}/${PN}-1.14.0-suppress-unused-option-libcxx.patch" ) @@ -134,12 +134,6 @@ src_compile() { if use doc; then export VARTEXFONTS="${T}/fonts" # bug #564944 - if ! use dot; then - sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ - {testing/Doxyfile,doc/Doxyfile} \ - || die "disabling dot failed" - fi - # -j1 for bug #770070 cmake_src_compile docs -j1 fi diff --git a/app-text/doxygen/files/doxygen-1.15.0-link_with_pthread.patch b/app-text/doxygen/files/doxygen-1.15.0-link_with_pthread.patch new file mode 100644 index 000000000000..4d2b50d878a2 --- /dev/null +++ b/app-text/doxygen/files/doxygen-1.15.0-link_with_pthread.patch @@ -0,0 +1,22 @@ +diff --git a/addon/doxywizard/.CMakeLists.txt.swp b/addon/doxywizard/.CMakeLists.txt.swp +deleted file mode 100644 +index fc379d2..0000000 +Binary files a/addon/doxywizard/.CMakeLists.txt.swp and /dev/null differ +diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt +index bb0e0eb..b6135bd 100644 +--- a/addon/doxywizard/CMakeLists.txt ++++ b/addon/doxywizard/CMakeLists.txt +@@ -132,10 +132,10 @@ apply_editbin(doxywizard windows) + endif() + + if(Qt5Core_FOUND) +- target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version) ++ target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version pthread) + elseif(Qt6Core_FOUND) +- target_link_libraries(doxywizard Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Xml doxygen_version) ++ target_link_libraries(doxywizard Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Xml doxygen_version pthread) + else() +- target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version) ++ target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version pthread) + endif() +
