* update doxygen to 1.13.0-3
This commit is contained in:
parent
3d2c14b3fb
commit
d6410795b3
@ -1,6 +1,6 @@
|
||||
pkgbase = doxygen
|
||||
pkgdesc = Documentation system for C++, C, Java, IDL and PHP
|
||||
pkgver = 1.12.0
|
||||
pkgver = 1.13.0
|
||||
pkgrel = 3
|
||||
url = http://www.doxygen.nl
|
||||
arch = x86_64
|
||||
@ -26,14 +26,15 @@ pkgbase = doxygen
|
||||
makedepends = texlive-fontutils
|
||||
makedepends = texlive-latexextra
|
||||
makedepends = texlive-plaingeneric
|
||||
source = doxygen-1.12.0.tar.gz::https://github.com/doxygen/doxygen/archive/Release_1_12_0.tar.gz
|
||||
source = https://github.com/doxygen/doxygen/commit/7857c88d.patch
|
||||
sha512sums = be2bbbfca619dac78096d54378b95ecc786b9ff23b801c2be52c3536d067e4a299d96952ff92ec1fad13751b77f494ab9971435411dd7b40537d0b0f3797dedc
|
||||
sha512sums = 7e1c018ba1cd57f10c24deb496e79a182a250603473986ef7feb3fc2c1ced1fc6fe270a15c489301fe762eb83a192bc31935935ef2418415d36ec347f064765c
|
||||
b2sums = 566082eef7abd0f6750eac1f0ae0cc310752a14c6f1a512c84b5423125f0312a6258f2d5c7c3028fa475c33314985daac68b02f8e1482015dd6f9f8f664ff9e3
|
||||
b2sums = fb6c70cf899f96457fbedb582b4cd5bc196d0e809212ccd099aebacde698327f91abb1d32539c096620d303b516b3654881e4a380670df521892511966e23f97
|
||||
source = doxygen-1.13.0.tar.gz::https://github.com/doxygen/doxygen/archive/Release_1_13_0.tar.gz
|
||||
source = fix-regression-1.13.0.patch
|
||||
sha512sums = b48956e049d2beea6b60d9c1237494fefaf5a00a83ea5367cc5cc7ec072722cde0b1f3fce546c116683e15dc4d30ed5bc19e81c9fe3544e9aac76feabde88658
|
||||
sha512sums = 05ff9a60e6b021973f9997724a1e9a5aa68e901dce93967e329610aecd2d6b0a3174aee0728b166f8619a8eb87f4a2e9945d8a2aaa2cc3fe1841158c523ba08b
|
||||
b2sums = 1f1afb4ad928a845a480edf9fabd18a42fab2fdfe4ccc732cbdce7cd7cd35f78742de74a19487107312917007c72fe83da0fbf4209ef478d99aae1c8d884d6ba
|
||||
b2sums = 8ab349226ea5e7251a69a87d12d41d7c9f12b00cb382440538d5fb967547dc7252b8b2d18cbc22e6af8b01687afb6c41bad9e2f2d31cf7bb7a8dbfbd50b09f64
|
||||
|
||||
pkgname = doxygen
|
||||
depends = clang
|
||||
depends = fmt
|
||||
depends = libfmt.so
|
||||
depends = gcc-libs
|
||||
@ -48,10 +49,6 @@ pkgname = doxygen
|
||||
optdepends = texlive-fontutils: for generating LaTeX, Postscript and PDF output
|
||||
optdepends = texlive-latexextra: for generating LaTeX, Postscript and PDF output
|
||||
optdepends = texlive-plaingeneric: for generating LaTeX, Postscript and PDF output
|
||||
depends_x86_64 = clang
|
||||
depends_powerpc64 = clang
|
||||
depends_powerpc = clang
|
||||
depends_riscv64 = clang
|
||||
|
||||
pkgname = doxygen-docs
|
||||
pkgdesc = Developer documentation for doxygen
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
pkgbase=doxygen
|
||||
pkgname=(doxygen doxygen-docs)
|
||||
pkgver=1.12.0
|
||||
pkgver=1.13.0
|
||||
pkgrel=3
|
||||
pkgdesc='Documentation system for C++, C, Java, IDL and PHP'
|
||||
url='http://www.doxygen.nl'
|
||||
@ -30,12 +30,14 @@ makedepends=(
|
||||
texlive-latexextra
|
||||
texlive-plaingeneric
|
||||
)
|
||||
source=(${pkgbase}-${pkgver}.tar.gz::https://github.com/doxygen/doxygen/archive/Release_${pkgver//./_}.tar.gz
|
||||
https://github.com/doxygen/doxygen/commit/7857c88d.patch)
|
||||
sha512sums=('be2bbbfca619dac78096d54378b95ecc786b9ff23b801c2be52c3536d067e4a299d96952ff92ec1fad13751b77f494ab9971435411dd7b40537d0b0f3797dedc'
|
||||
'7e1c018ba1cd57f10c24deb496e79a182a250603473986ef7feb3fc2c1ced1fc6fe270a15c489301fe762eb83a192bc31935935ef2418415d36ec347f064765c')
|
||||
b2sums=('566082eef7abd0f6750eac1f0ae0cc310752a14c6f1a512c84b5423125f0312a6258f2d5c7c3028fa475c33314985daac68b02f8e1482015dd6f9f8f664ff9e3'
|
||||
'fb6c70cf899f96457fbedb582b4cd5bc196d0e809212ccd099aebacde698327f91abb1d32539c096620d303b516b3654881e4a380670df521892511966e23f97')
|
||||
source=(
|
||||
${pkgbase}-${pkgver}.tar.gz::https://github.com/doxygen/doxygen/archive/Release_${pkgver//./_}.tar.gz
|
||||
fix-regression-1.13.0.patch
|
||||
)
|
||||
sha512sums=('b48956e049d2beea6b60d9c1237494fefaf5a00a83ea5367cc5cc7ec072722cde0b1f3fce546c116683e15dc4d30ed5bc19e81c9fe3544e9aac76feabde88658'
|
||||
'05ff9a60e6b021973f9997724a1e9a5aa68e901dce93967e329610aecd2d6b0a3174aee0728b166f8619a8eb87f4a2e9945d8a2aaa2cc3fe1841158c523ba08b')
|
||||
b2sums=('1f1afb4ad928a845a480edf9fabd18a42fab2fdfe4ccc732cbdce7cd7cd35f78742de74a19487107312917007c72fe83da0fbf4209ef478d99aae1c8d884d6ba'
|
||||
'8ab349226ea5e7251a69a87d12d41d7c9f12b00cb382440538d5fb967547dc7252b8b2d18cbc22e6af8b01687afb6c41bad9e2f2d31cf7bb7a8dbfbd50b09f64')
|
||||
|
||||
_pick() {
|
||||
local p="$1" f d; shift
|
||||
@ -49,25 +51,26 @@ _pick() {
|
||||
|
||||
prepare() {
|
||||
cd $pkgbase-Release_${pkgver//./_}
|
||||
patch -p1 -i ../7857c88d.patch # Fix build with fmt 11
|
||||
|
||||
# Fix regression in 1.13.0 https://github.com/doxygen/doxygen/issues/11299
|
||||
patch -Np1 -i ../fix-regression-1.13.0.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
#FIXME: on powerpc64le doxygen pulls in clang which breaks libreoffice
|
||||
case "${CARCH}" in
|
||||
powerpc64le) _cmake_options=(-Duse_libclang:BOOL=OFF) ;;
|
||||
*) _cmake_options=(-Duse_libclang:BOOL=ON) ;;
|
||||
esac
|
||||
|
||||
cmake -B build -S $pkgbase-Release_${pkgver//./_} \
|
||||
-DCMAKE_BUILD_TYPE:STRING=None \
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
|
||||
-DDOC_INSTALL_DIR:PATH=share/doc/doxygen \
|
||||
-Dbuild_doc:BOOL=ON \
|
||||
-Dbuild_wizard:BOOL=ON \
|
||||
-Duse_sys_spdlog:BOOL=ON \
|
||||
-Duse_sys_sqlite3:BOOL=ON \
|
||||
-Duse_libclang:BOOL=ON ${_cmake_options[@]}
|
||||
local cmake_options=(
|
||||
-B build
|
||||
-S $pkgbase-Release_${pkgver//./_}
|
||||
-W no-dev
|
||||
-DCMAKE_BUILD_TYPE:STRING=None
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=/usr
|
||||
-DDOC_INSTALL_DIR:PATH=share/doc/doxygen
|
||||
-Dbuild_doc:BOOL=ON
|
||||
-Dbuild_wizard:BOOL=ON
|
||||
-Duse_sys_spdlog:BOOL=ON
|
||||
-Duse_sys_sqlite3:BOOL=ON
|
||||
-Duse_libclang:BOOL=ON
|
||||
)
|
||||
cmake "${cmake_options[@]}"
|
||||
cmake --build build --verbose
|
||||
cmake --build build --target docs
|
||||
}
|
||||
@ -78,16 +81,13 @@ check() {
|
||||
|
||||
package_doxygen() {
|
||||
depends=(
|
||||
clang
|
||||
fmt libfmt.so
|
||||
gcc-libs
|
||||
glibc
|
||||
spdlog libspdlog.so
|
||||
sqlite libsqlite3.so
|
||||
)
|
||||
depends_powerpc=(clang)
|
||||
depends_powerpc64=(clang)
|
||||
depends_riscv64=(clang)
|
||||
depends_x86_64=(clang)
|
||||
optdepends=(
|
||||
'graphviz: for caller/callee graph generation'
|
||||
'qt6-base: for doxywizard'
|
||||
|
||||
26
doxygen/fix-regression-1.13.0.patch
Normal file
26
doxygen/fix-regression-1.13.0.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From f46e21ed722193d74f56b2aa275a5cdc5e40b72b Mon Sep 17 00:00:00 2001
|
||||
From: Dimitri van Heesch <doxygen@gmail.com>
|
||||
Date: Mon, 30 Dec 2024 16:07:04 +0100
|
||||
Subject: [PATCH] issue #11299 Regression with HTML_DYNAMIC_MENUS = NO,
|
||||
DISABLE_INDEX = NO, and custom LAYOUT_FILE
|
||||
|
||||
---
|
||||
src/layout.h | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/layout.h b/src/layout.h
|
||||
index fc7917291b..247c24eb9c 100644
|
||||
--- a/src/layout.h
|
||||
+++ b/src/layout.h
|
||||
@@ -232,6 +232,11 @@ struct LayoutNavEntry
|
||||
std::swap(m_title,other.m_title);
|
||||
std::swap(m_intro,other.m_intro);
|
||||
std::swap(m_children,other.m_children);
|
||||
+ // reparent children
|
||||
+ for (auto &child : m_children)
|
||||
+ {
|
||||
+ child->m_parent = this;
|
||||
+ }
|
||||
}
|
||||
|
||||
private:
|
||||
Loading…
x
Reference in New Issue
Block a user