From 6ad234fddd344f9c773aae69ba114734f120bea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= Date: Wed, 20 Aug 2025 10:09:29 +0200 Subject: [PATCH] doxygen: bump version to 1.14.0 (#12793) * cleanup dependencies * add tests * build the GUI in another build directory --- ...en-1.12.0.recipe => doxygen-1.14.0.recipe} | 35 +++++++++++-------- ....12.0.recipe => doxygen_gui-1.14.0.recipe} | 15 +++----- 2 files changed, 25 insertions(+), 25 deletions(-) rename app-doc/doxygen/{doxygen-1.12.0.recipe => doxygen-1.14.0.recipe} (78%) rename app-doc/doxygen/{doxygen_gui-1.12.0.recipe => doxygen_gui-1.14.0.recipe} (90%) diff --git a/app-doc/doxygen/doxygen-1.12.0.recipe b/app-doc/doxygen/doxygen-1.14.0.recipe similarity index 78% rename from app-doc/doxygen/doxygen-1.12.0.recipe rename to app-doc/doxygen/doxygen-1.14.0.recipe index c881233c0..0ca0d6c01 100644 --- a/app-doc/doxygen/doxygen-1.12.0.recipe +++ b/app-doc/doxygen/doxygen-1.14.0.recipe @@ -16,18 +16,18 @@ Doxygen can also visualize the relations between the various elements \ by means of include dependency graphs, inheritance diagrams, and \ collaboration diagrams, which are all generated automatically." HOMEPAGE="http://www.doxygen.org/" -COPYRIGHT="1997-2024 Dimitri van Heesch" +COPYRIGHT="1997-2025 Dimitri van Heesch" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/doxygen/doxygen/archive/Release_${portVersion//./_}.tar.gz" -CHECKSUM_SHA256="5ca35e1258020df5fe8b21c3656aed156c317def4a81b7fe52f452edc9f35768" +CHECKSUM_SHA256="5663bf33e979381f470c2f4055c3b162e0abe41bdd6c5dccefd8d8775780bcc3" SOURCE_DIR="doxygen-Release_${portVersion//./_}" ADDITIONAL_FILES="doxygen.rdef.in" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -portVersionCompat="$portVersion compat >= 1.12" +portVersionCompat="$portVersion compat >= 1.14" PROVIDES=" doxygen$secondaryArchSuffix = $portVersionCompat @@ -45,31 +45,36 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:bison cmd:cmake - cmd:date cmd:flex - cmd:git cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make - cmd:perl cmd:python3 - cmd:sed + " + +TEST_REQUIRES=" + #cmd:bibtex # needed for test 12, but that doesn't work + cmd:diff + #cmd:perl # needed for test 12, but that doesn't work " BUILD() { - # doesn't use GNUInstallDirs so we can't use $cmakeDirArgs - cmake . -DCMAKE_BUILD_TYPE=Release \ + cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DCMAKE_INSTALL_BINDIR=$prefix/bin \ -Dbuild_wizard=OFF - make $jobArgs + make -Cbuild $jobArgs } INSTALL() { - make install - install -d "$manDir"/man1 - sed -e "s/@VERSION@/$portVersion/;" -e "s/@DATE@/`date -r VERSION \ - +%F`/;" doc/doxygen.1 > "$manDir"/man1/doxygen.1 + make -Cbuild install +} + +TEST() +{ + #The following tests FAILED: + # 12 - 012_cite (Failed) + ctest --test-dir build --output-on-failure } diff --git a/app-doc/doxygen/doxygen_gui-1.12.0.recipe b/app-doc/doxygen/doxygen_gui-1.14.0.recipe similarity index 90% rename from app-doc/doxygen/doxygen_gui-1.12.0.recipe rename to app-doc/doxygen/doxygen_gui-1.14.0.recipe index d0e13607f..547b06eff 100644 --- a/app-doc/doxygen/doxygen_gui-1.12.0.recipe +++ b/app-doc/doxygen/doxygen_gui-1.14.0.recipe @@ -16,11 +16,11 @@ Doxygen can also visualize the relations between the various elements \ by means of include dependency graphs, inheritance diagrams, and \ collaboration diagrams, which are all generated automatically." HOMEPAGE="http://www.doxygen.org/" -COPYRIGHT="1997-2024 Dimitri van Heesch" +COPYRIGHT="1997-2025 Dimitri van Heesch" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://github.com/doxygen/doxygen/archive/Release_${portVersion//./_}.tar.gz" -CHECKSUM_SHA256="5ca35e1258020df5fe8b21c3656aed156c317def4a81b7fe52f452edc9f35768" +CHECKSUM_SHA256="5663bf33e979381f470c2f4055c3b162e0abe41bdd6c5dccefd8d8775780bcc3" SOURCE_DIR="doxygen-Release_${portVersion//./_}" ADDITIONAL_FILES="doxygen.rdef.in" @@ -50,30 +50,25 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:bison cmd:cmake - cmd:date cmd:flex - cmd:git cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make - cmd:perl cmd:python3 - cmd:sed " BUILD() { - # doesn't use GNUInstallDirs so we can't use $cmakeDirArgs - cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ + cmake -Bbuild-gui -S. -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DCMAKE_INSTALL_BINDIR=$prefix/bin \ -Dbuild_wizard=ON - make -Cbuild $jobArgs + make -Cbuild-gui $jobArgs } INSTALL() { - make -Cbuild install + make -Cbuild-gui install # use base cmd:doxygen rm -rf $prefix/bin/doxygen