Jakub Klinkovský pushed to branch main at Arch Linux / Packaging / Packages /
doxygen
Commits:
b0b7a3e8 by Jakub Klinkovský at 2025-01-02T20:25:56+01:00
upgpkg: 1.13.1-1: upstream release with fixed regression
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- − fix-regression-1.13.0.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = doxygen
pkgdesc = Documentation system for C++, C, Java, IDL and PHP
- pkgver = 1.13.0
- pkgrel = 3
+ pkgver = 1.13.1
+ pkgrel = 1
url = http://www.doxygen.nl
arch = x86_64
license = GPL-2.0-or-later
@@ -22,12 +22,9 @@ pkgbase = doxygen
makedepends = texlive-fontutils
makedepends = texlive-latexextra
makedepends = texlive-plaingeneric
- 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
+ source =
doxygen-1.13.1.tar.gz::https://github.com/doxygen/doxygen/archive/Release_1_13_1.tar.gz
+ sha512sums =
9688958a3104a73b13c23ec44359647b366a1721134361b19518650cb9cb814e32507b472f5f0b37ac7107e667b891193744ae64d5f27e4cd84c099878750514
+ b2sums =
c73fa721cb9de860e2797bfcee8858056472698d88040f153e71572b82f708b035b3e66594e76ed58b8bcb8f7ede1cd0525ea704f35c0de9f5b93cf72f7f2b1d
pkgname = doxygen
depends = clang
=====================================
PKGBUILD
=====================================
@@ -4,8 +4,8 @@
pkgbase=doxygen
pkgname=(doxygen doxygen-docs)
-pkgver=1.13.0
-pkgrel=3
+pkgver=1.13.1
+pkgrel=1
pkgdesc='Documentation system for C++, C, Java, IDL and PHP'
url='http://www.doxygen.nl'
arch=(x86_64)
@@ -31,12 +31,9 @@ makedepends=(
)
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')
+sha512sums=('9688958a3104a73b13c23ec44359647b366a1721134361b19518650cb9cb814e32507b472f5f0b37ac7107e667b891193744ae64d5f27e4cd84c099878750514')
+b2sums=('c73fa721cb9de860e2797bfcee8858056472698d88040f153e71572b82f708b035b3e66594e76ed58b8bcb8f7ede1cd0525ea704f35c0de9f5b93cf72f7f2b1d')
_pick() {
local p="$1" f d; shift
@@ -48,13 +45,6 @@ _pick() {
done
}
-prepare() {
- cd $pkgbase-Release_${pkgver//./_}
-
- # Fix regression in 1.13.0 https://github.com/doxygen/doxygen/issues/11299
- patch -Np1 -i ../fix-regression-1.13.0.patch
-}
-
build() {
local cmake_options=(
-B build
=====================================
fix-regression-1.13.0.patch deleted
=====================================
@@ -1,26 +0,0 @@
-From f46e21ed722193d74f56b2aa275a5cdc5e40b72b Mon Sep 17 00:00:00 2001
-From: Dimitri van Heesch <[email protected]>
-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:
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/doxygen/-/commit/b0b7a3e8b0d910f42b5d52f621aa4dd494687492
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/doxygen/-/commit/b0b7a3e8b0d910f42b5d52f621aa4dd494687492
You're receiving this email because of your account on gitlab.archlinux.org.