Mon May 23 13:08:02 2022 UTC ()
devel/doxygen: Update to 1.9.4

Bug fixes
=========
bug 334859 HTMLHELP: Underscore in chm file name prevents linking between chm files [view], [view]
bug 711041 Undocumented "enum" values in TOC of qhp files causes tag-mismatch and corrupt TOC [view]
bug 783768 QCH files: classes & their constructors get conflicting keyword handling [view]
bug_445536 Select folder for STRIP_FROM_PATH [view]
bug_644899 New diagram implementing environment [view], and [view]
bug_698167 HIDE_SCOPE_NAMES does not hide namespace scope for functions within it [view]
bug_711041 Undocumented "enum" values in TOC of qhp files causes tag-mismatch and corrupt TOC. [view], [view], [view]
issue #6382 computational time issue of Java generics [view], [view]
issue #6992 Automatic Coverity run [view], [view], [view], [view], [view], [view], [view], [view], [view], [view], [view], [view], [view], [view], and [view]
issue #7543 Support PlantUML in Markdown [view]
issue #7873 Combining `///`-style comments with macros containing @cond/@endcond causes a preprocessor error [view]
issue #8355 Doxywizard 1.9.x doesn't start up properly [view]
issue #8487 Doxygen doesn't generate links to C# classes in different namespaces [view], [view]
issue #8784 CLANG_ASSISTED_PARSING tries to parse markdown files [view]
issue #9003 Button Show HTML-Output doesn't work [view]
issue #9005 Function prototype matching @fn command, but link between both is not made [view]
issue #9006 Doxygen 1.9.3 replaces '--' with '–' inside formula alias [view]
issue #9007 Using DOT_PATH with a symlink for dot does not always work [view], and [view]
issue #9027 SEARCHDATA_FILE (searchdata.xml) keyword elements blank [view]
issue #9028 DoxyVerb environment should terminate the previous paragraph before changing paragraph formatting [view]
issue #9045 wrong grammar/spelling in german html Output [view]
issue #9051 Wrong "Related page" generating in 1.9.3 (works good in 1.9.1!) from *.md files [view], [view]
issue #9054 Feature Request: Doxywizard: Customize Doxyfile Line Endings [view]
issue #9055 Objective C method / property attribute decoration confuses parsing [view]
issue #9058 Strip leading spaces in QHP file [view], [view]
issue #9070 Doxygen is not showing all called functions in graph plot [view], [view]
issue #9074 Menubar Links not Parsed Correctly [view]
issue #9075 .html Extension Removed from Tag File URLs [view]
issue #9094 Wrong QHP index structure [view], [view]
issue #9124 Latex: Does not properly compile when PROJECT_BRIEF contains commas [view]
issue #9127 Doxywizard truncates standard input passed to doxygen process. [view]
issue #9135 Qhelpgenerator debug mode [view]
issue #9136 master does not compile on Mac 12.2.1 [view]
issue #9138 QHP index contains duplicated file entries [view]
issue #9143 warning file-line format in Possible candidates [view]
issue #9144 problem with matching function when using namespace [view]
issue #9148 No uniquely matching class member, but no candidates are printed. [view]
issue #9155 Doxygen crash with NUM_PROC_THREADS>1 [view], [view], [view]
issue #9157 Codebase static analysis shows some potential leaks and nullptr access [view]
issue #9158 Python: Two classes in one file, second class documentation block copied into its class method block [view]
issue #9171 XML output for dot file uses relative path in 1.9.3 [view]
issue #9187 doxygen -x_noenv option to not expand environment variables [view], [view]
issue #9190 DOC: Mention -x switch in the "Support" page [view], [view]
issue #9192 "Packages" has a "Packages" in the tree [view]
issue #9195 fix for warning: documentation for unknown define [view]
issue #9200 Doxygen cannot resolve link to HTML anchor page [view]
issue #9211 @file is confused by symlinks (regression since 1.9.1) [view]
issue #9217 Can't load MathJax 3 extensions [view]
issue #9229 Crash with Segmentation fault in ClassDefImpl::mergeMembers [view]
issue #9234 NUM_PROC_THREADS not being honored when processing input [view]
issue #9241 Undocumented external namespaces from .tags files are shown in output Namespace index [view]
issue #9243 GHC_NO_DIRENT_D_TYPE should be defined on Solaris [view]
issue #9251 HTML extensions stripped from DOT SVG links with tagfiles [view]
issue #9254 Missing first word of page in case of existing \page command in markdown [view]
issue #9257 Build Error regarding vhdlparser [view]
issue #9264 Markdown tables not rendered for parameters [view]
issue #9266 doxygen runtime went from 10minutes to >14hours (lots of using namespace) [view]
issue #9269 Not able to compile with MSYS2/mingw (file too big) [view], [view], [view]
issue #9274 Automatic links not working in examples that use C++ source [Potential Bug] [view], [view], [view], [view]
issue #9276 File-Line is omitted when suggesting possible candidates depending on noMatchCount [view]
issue #9284 Clicking external link within search results with EXT_LINKS_IN_WINDOW=YES opens the link in the search results box [view]
issue #9296 gives up after seeing egregiously complex template code [view]
issue #9298 Segfault in Fortran parser (heap use after free) [view], [view]
Recognize type= as variable in Fortran [view]
Concept mising in the layout description [view]
Detecting end of body in python [view]
SHOW_FILES=NO could cause broken links for grouped files [view]
Source code was missing line anchors in the HTML output when using libclang [view]
Updated Hindi Locale ID (LCID): 0x439 Hindi [view]
INCLUDE_PATH is not recursive [view]
Spurious colon in the output [view]
Global enum incorporates values from an enum class [view]
Incorrect check on a list item. [view]
Incorrect doxygen help information [view]
Incorrect line number in warning message [view]
Incorrect macro file name in LaTeX [view]
Incorrect protection for test 28 [view]
Incorrect representation of some items in HTMLHELP [view]
Incorrect version in language documentation [view]
Don't create anchor for \name command [view]
add missing newline in docu [view]
synchronize man and help messages [view]

Features
========
Add CINDEX_NO_EXPORTS option when linking against static libclang [view]
Introduce CREATE_SUBDIRS_LEVEL [view]
Add for the xml output also xml to the markdown image representation. [view]
Adding Qt6 support [view]
Update Bulgarian translation [view]
Better translation for trPackageMembers [view]
Refer to chapter Grouping with GROUP_GRAPHS [view]
HTMLHELP warning on using svg as image format for graphs [view]
mention doxygen debugging flags on the web [view]
mention how to get additional usage flags [view]

Deprecated functionality
========================
Dropping Qt4 support [view]
Restrict usable flex version to 2.6.4 and higher [view], and [view]
Update to require JavaCC 7.0.6 or higher [view]
C++17 compiler is now required to compile doxygen [view]

Refactoring and cleanup
=======================
Add null pointer checks for dynamic casts of LayoutDocEntry objects [view]
Add test possibility to check the structure of the index.qhp file [view]
Add try-catch around DocParser's destructor to avoid coverity warning [view]
Added GHC_OS_SOLARIS [view]
Added missing include and remove redundant code [view]
Added support for Bulgarian [view]
Added translation for the Hindi-language and signed up as a maintainer for the same. [view]
Adjustments according to the new README [view]
Align latex commands [view]
Allow multi-threaded computation of tooltips [view]
Automatically set copyright year in doxygen man page [view]
Automatically show correct year in about box [view], [view]
Avoid compiler error on systems where size_t==unsigned int [view]
Correcting default settings when running HTMLHELP [view]
Determination of fixed source form. [view]
Downgrade stale translator warning to message [view]
Enable always all languages [view]
Enable the equal sign in the file mask [view]
Error when generating documentation with formulas a second time [view]
Extended support for language specified in markdown fenced code blocks [view]
Fix build with MinGW and Ninja [view]
Fix debug prints [view]
Fix e-mail obfuscation issue in the manual [view]
Fix for merge issue [view]
Fix for translator.py to deal with =default destructor [view]
Fix for unsigned int issue [view]
Fix multi-threading issues if SERVER_BASED_SEARCH=YES [view]
Fix potential stack overflow [view]
Fix repeated words [view]
Fixed potential crash in case cached item was already purged [view]
Fixed regression that introduced an invalid </p> in HTML [view]
Fixed version check and did some simplifications and refactoring [view]
Handling enums in settings that double as boolean [view], [view], [view]
Handling of value of visible attribute [view]
Interaction of tests for xhtml and qhp [view]
Line numbers not shown in gray in source code [view]
Make better use of capture ranges [view]
Make boolean representation mapping part of ConfigValues::Info [view]
Making Windows executable large address aware [view]
Making tag information better available [view], [view]
Minor optimisation [view]
Missing <VERSION> in description of doxyparse [view]
Missing part of output due to wrong emoji command [view]
Modernize LANGUAGE.HOWTO [view]
Move editbin logic to a separate cmake file [view]
Moving punctuation dependency to translator [view], [view], [view]
Prevent running coverity scan when no commit are made [view]
Problem compiling under Cygwin [view]
QCString: make str() accessor return a const& [view]
QCString: slightly faster mid [view]
Reduce number of calls into visited map [view]
Reduced code duplication, optimized performance [view], and [view]
Refactoring: Moved duplicated functionality into BufStr [view]
Refactoring: clean up destructors [view]
Refactoring: implement visitors using std::visit and std::variant [view]
Refactoring: reimplemented tagreader structures [view]
Refactoring: remove unneeded class OutputDocInterface [view]
Refactoring: replace custom variant class by std::variant [view]
Refactoring: replace old style casts [view], [view], and [view]
Refactoring: split docparser [view]
Reference to non existing anchor with "More..." [view]
Reinstate warnings about stale translations [view]
Remove retrieval of the process count for tests [view]
Removed unused function in configgen.py [view]
Removing obsolete functions [view]
Replace static Config_Get... by just Config_get... [view]
Replaced DocNode::kind() by dynamic_cast checks [view]
Replaced conditional sections by adapter and fixed some signals [view]
Simplified documentation and implementation a bit [view]
Split of javascript search index into separate files [view]
Trace statement in markdown.cpp [view], [view]
Uniform retrieval file definition [view]
Uniform retrieval of language code by means of translator unit [view]
clarify what the last comments in man refer to [view]
optional command variables and align mkidx and latex command approaches [view]
pass const& of LinkedRefMap to prevent creating temporary copies [view]


(micha)
diff -r1.159 -r1.160 pkgsrc/devel/doxygen/Makefile
diff -r1.46 -r1.47 pkgsrc/devel/doxygen/PLIST
diff -r1.73 -r1.74 pkgsrc/devel/doxygen/distinfo
diff -r1.2 -r1.3 pkgsrc/devel/doxygen/patches/patch-filesystem_filesystem.hpp
diff -r1.2 -r1.3 pkgsrc/devel/doxygen/patches/patch-src_dirdef.cpp

cvs diff -r1.159 -r1.160 pkgsrc/devel/doxygen/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/doxygen/Makefile 2022/04/18 19:10:49 1.159
+++ pkgsrc/devel/doxygen/Makefile 2022/05/23 13:08:02 1.160
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: Makefile,v 1.159 2022/04/18 19:10:49 adam Exp $ 1# $NetBSD: Makefile,v 1.160 2022/05/23 13:08:02 micha Exp $
2 2
3DISTNAME= doxygen-1.9.3.src 3DISTNAME= doxygen-1.9.4.src
4PKGNAME= ${DISTNAME:S/.src//} 4PKGNAME= ${DISTNAME:S/.src//}
5PKGREVISION= 1 
6CATEGORIES= devel 5CATEGORIES= devel
7MASTER_SITES= http://doxygen.nl/files/ 6MASTER_SITES= http://doxygen.nl/files/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.doxygen.org/ 9HOMEPAGE= http://www.doxygen.org/
11COMMENT= Documentation system for C++, Java, IDL and C 10COMMENT= Documentation system for C++, Java, IDL and C
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 13BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
15 14
16WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
17UNLIMIT_RESOURCES+= datasize 16UNLIMIT_RESOURCES+= datasize
18# doxygen upstream uses this version of flex 17# doxygen changelog says at least this version of flex is required
19FLEX_REQD= 2.5.35 18FLEX_REQD= 2.6.4
20# Uses -std=c++14 19# doxygen changelog says a C++17 compiler is required. Uses -std=gnu++1z
 20# Native std::filesystem requires GCC 9. Patch for emulation is still present
 21# Tested to work with GCC 7.5.0 from NetBSD 9.2
21GCC_REQD+= 5 22GCC_REQD+= 5
22USE_CMAKE= yes 23USE_CMAKE= yes
23USE_LANGUAGES= c c++ 24USE_LANGUAGES= c c++
24USE_TOOLS+= gmake gs:run perl:run bison flex 25USE_TOOLS+= gmake gs:run perl:run bison flex
25MAKE_ENV+= PKGSRC_CFLAGS=${CFLAGS:Q} 26MAKE_ENV+= PKGSRC_CFLAGS=${CFLAGS:Q}
26MAKE_FLAGS+= MAN1DIR=${PKGMANDIR}/man1 27MAKE_FLAGS+= MAN1DIR=${PKGMANDIR}/man1
27 28
28CMAKE_ARGS+= -DDOC_INSTALL_DIR=share/doc/doxygen 29CMAKE_ARGS+= -DDOC_INSTALL_DIR=share/doc/doxygen
29CMAKE_ARGS+= -DGIT_EXECUTABLE=git # avoid searching for git executable 30CMAKE_ARGS+= -DGIT_EXECUTABLE=git # avoid searching for git executable
30TEST_TARGET= tests 31TEST_TARGET= tests
31 32
32PYTHON_FOR_BUILD_ONLY= tool 33PYTHON_FOR_BUILD_ONLY= tool
33 34

cvs diff -r1.46 -r1.47 pkgsrc/devel/doxygen/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/doxygen/PLIST 2022/03/30 16:35:27 1.46
+++ pkgsrc/devel/doxygen/PLIST 2022/05/23 13:08:02 1.47
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.46 2022/03/30 16:35:27 micha Exp $ 1@comment $NetBSD: PLIST,v 1.47 2022/05/23 13:08:02 micha Exp $
2bin/doxygen 2bin/doxygen
3${PLIST.qt}bin/doxywizard 3${PLIST.qt}bin/doxywizard
4${PLIST.latex}man/man1/doxygen.1 4${PLIST.latex}man/man1/doxygen.1
5${PLIST.latex}${PLIST.qt}man/man1/doxywizard.1 5${PLIST.latex}${PLIST.qt}man/man1/doxywizard.1
6${PLIST.latex}share/doc/doxygen/doxygen_manual.pdf 6${PLIST.latex}share/doc/doxygen/doxygen_manual.pdf
7${PLIST.latex}share/doc/doxygen/html/add.png 7${PLIST.latex}share/doc/doxygen/html/add.png
8${PLIST.latex}share/doc/doxygen/html/arch.html 8${PLIST.latex}share/doc/doxygen/html/arch.html
9${PLIST.latex}share/doc/doxygen/html/archoverview.svg 9${PLIST.latex}share/doc/doxygen/html/archoverview.svg
10${PLIST.latex}share/doc/doxygen/html/autolink.html 10${PLIST.latex}share/doc/doxygen/html/autolink.html
11${PLIST.latex}share/doc/doxygen/html/bc_s.png 11${PLIST.latex}share/doc/doxygen/html/bc_s.png
12${PLIST.latex}share/doc/doxygen/html/bdwn.png 12${PLIST.latex}share/doc/doxygen/html/bdwn.png
13${PLIST.latex}share/doc/doxygen/html/changelog.html 13${PLIST.latex}share/doc/doxygen/html/changelog.html
14${PLIST.latex}share/doc/doxygen/html/closed.png 14${PLIST.latex}share/doc/doxygen/html/closed.png
@@ -1142,15 +1142,16 @@ ${PLIST.latex}share/doc/doxygen/html/ref @@ -1142,15 +1142,16 @@ ${PLIST.latex}share/doc/doxygen/html/ref
1142${PLIST.latex}share/doc/doxygen/html/resize.js 1142${PLIST.latex}share/doc/doxygen/html/resize.js
1143${PLIST.latex}share/doc/doxygen/html/searching.html 1143${PLIST.latex}share/doc/doxygen/html/searching.html
1144${PLIST.latex}share/doc/doxygen/html/searching.js 1144${PLIST.latex}share/doc/doxygen/html/searching.js
1145${PLIST.latex}share/doc/doxygen/html/splitbar.png 1145${PLIST.latex}share/doc/doxygen/html/splitbar.png
1146${PLIST.latex}share/doc/doxygen/html/starting.html 1146${PLIST.latex}share/doc/doxygen/html/starting.html
1147${PLIST.latex}share/doc/doxygen/html/sync_off.png 1147${PLIST.latex}share/doc/doxygen/html/sync_off.png
1148${PLIST.latex}share/doc/doxygen/html/sync_on.png 1148${PLIST.latex}share/doc/doxygen/html/sync_on.png
1149${PLIST.latex}share/doc/doxygen/html/tab_a.png 1149${PLIST.latex}share/doc/doxygen/html/tab_a.png
1150${PLIST.latex}share/doc/doxygen/html/tab_b.png 1150${PLIST.latex}share/doc/doxygen/html/tab_b.png
1151${PLIST.latex}share/doc/doxygen/html/tab_h.png 1151${PLIST.latex}share/doc/doxygen/html/tab_h.png
1152${PLIST.latex}share/doc/doxygen/html/tab_s.png 1152${PLIST.latex}share/doc/doxygen/html/tab_s.png
1153${PLIST.latex}share/doc/doxygen/html/tables.html 1153${PLIST.latex}share/doc/doxygen/html/tables.html
1154${PLIST.latex}share/doc/doxygen/html/tabs.css 1154${PLIST.latex}share/doc/doxygen/html/tabs.css
 1155${PLIST.latex}share/doc/doxygen/html/translator_report.txt
1155${PLIST.latex}share/doc/doxygen/html/trouble.html 1156${PLIST.latex}share/doc/doxygen/html/trouble.html
1156${PLIST.latex}share/doc/doxygen/html/xmlcmds.html 1157${PLIST.latex}share/doc/doxygen/html/xmlcmds.html

cvs diff -r1.73 -r1.74 pkgsrc/devel/doxygen/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/doxygen/distinfo 2022/03/30 16:35:27 1.73
+++ pkgsrc/devel/doxygen/distinfo 2022/05/23 13:08:02 1.74
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.73 2022/03/30 16:35:27 micha Exp $ 1$NetBSD: distinfo,v 1.74 2022/05/23 13:08:02 micha Exp $
2 2
3BLAKE2s (doxygen-1.9.3.src.tar.gz) = 2341a303699e431ac93dea2d93e977b415b999968b9d173f357b2b9afd691024 3BLAKE2s (doxygen-1.9.4.src.tar.gz) = 7998739d5c73384efbfdc27257e9251226c5bb550a6a2da0063255976e4c9144
4SHA512 (doxygen-1.9.3.src.tar.gz) = 2a9f052ec7b1abea2da4fccda2428563c268a025a43698f1f8296087b9a584c4a063774c5368de9f9859bf1b17b8e911273374726c5a4bc7b477f811c192d712 4SHA512 (doxygen-1.9.4.src.tar.gz) = 613f17800ebd05b66b1954af4d51282a1779678e7ade6c43046fc940742a697ebdf3af8e94ac70a3422bc96def663e70eaea8c4349d192e2fe5e516c57cc345a
5Size (doxygen-1.9.3.src.tar.gz) = 5152156 bytes 5Size (doxygen-1.9.4.src.tar.gz) = 5196383 bytes
6SHA1 (patch-filesystem_filesystem.hpp) = c45e462efa3f43ce6db24d0002252cf306b6d0c9 6SHA1 (patch-filesystem_filesystem.hpp) = 841ae28710d3fdbb75123dc804cbc13da8448d1b
7SHA1 (patch-src_dirdef.cpp) = 922b3b2198f471c60aca16f24b6786b1fb5ab73d 7SHA1 (patch-src_dirdef.cpp) = d10fb53e25cffac04129140e85bc836e5e7c8256

cvs diff -r1.2 -r1.3 pkgsrc/devel/doxygen/patches/Attic/patch-filesystem_filesystem.hpp (expand / switch to unified diff)

--- pkgsrc/devel/doxygen/patches/Attic/patch-filesystem_filesystem.hpp 2022/03/26 21:10:59 1.2
+++ pkgsrc/devel/doxygen/patches/Attic/patch-filesystem_filesystem.hpp 2022/05/23 13:08:02 1.3
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: patch-filesystem_filesystem.hpp,v 1.2 2022/03/26 21:10:59 tnn Exp $ 1$NetBSD: patch-filesystem_filesystem.hpp,v 1.3 2022/05/23 13:08:02 micha Exp $
2 2
3Disable use of experimental compiler features. 3Disable use of experimental compiler features.
4Failed with GCC 7.4.0 on NetBSD. 4Failed with GCC 7.4.0 on NetBSD.
5 5
6--- filesystem/filesystem.hpp.orig 2021-05-24 09:14:03.505674000 +0000 6--- filesystem/filesystem.hpp.orig 2021-05-24 09:14:03.505674000 +0000
7+++ filesystem/filesystem.hpp 7+++ filesystem/filesystem.hpp
8@@ -69,6 +69,7 @@ 8@@ -72,6 +72,7 @@
9 #define GHC_OS_CYGWIN 9 #define GHC_OS_CYGWIN
10 #elif defined(__svr4__) 10 #elif defined(__svr4__)
11 #define GHC_OS_SYS5R4 11 #define GHC_OS_SYS5R4
12+#define GHC_NO_DIRENT_D_TYPE 12+#define GHC_NO_DIRENT_D_TYPE
13 #elif defined(BSD) 13 #elif defined(BSD)
14 #define GHC_OS_BSD 14 #define GHC_OS_BSD
15 #elif defined(__EMSCRIPTEN__) 15 #elif defined(__EMSCRIPTEN__)
16@@ -238,6 +239,7 @@ 16@@ -241,6 +242,7 @@
17 #define GHC_HAS_STD_STRING_VIEW 17 #define GHC_HAS_STD_STRING_VIEW
18 #endif 18 #endif
19  19
20+#if 0 // pkgsrc 20+#if 0 // pkgsrc
21 // Standard library support for std::experimental::string_view. 21 // Standard library support for std::experimental::string_view.
22 #if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 3700 && _LIBCPP_VERSION < 7000) && (__cplusplus >= 201402) 22 #if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 3700 && _LIBCPP_VERSION < 7000) && (__cplusplus >= 201402)
23 #define GHC_HAS_STD_EXPERIMENTAL_STRING_VIEW 23 #define GHC_HAS_STD_EXPERIMENTAL_STRING_VIEW
24@@ -247,6 +249,7 @@ 24@@ -250,6 +252,7 @@
25 // macro _GLIBCXX_USE_DUAL_ABI is always defined in libstdc++ from gcc-5 and newer 25 // macro _GLIBCXX_USE_DUAL_ABI is always defined in libstdc++ from gcc-5 and newer
26 #define GHC_HAS_STD_EXPERIMENTAL_STRING_VIEW 26 #define GHC_HAS_STD_EXPERIMENTAL_STRING_VIEW
27 #endif 27 #endif
28+#endif 28+#endif
29  29
30 #if defined(GHC_HAS_STD_STRING_VIEW) 30 #if defined(GHC_HAS_STD_STRING_VIEW)
31 #include <string_view> 31 #include <string_view>

cvs diff -r1.2 -r1.3 pkgsrc/devel/doxygen/patches/patch-src_dirdef.cpp (expand / switch to unified diff)

--- pkgsrc/devel/doxygen/patches/patch-src_dirdef.cpp 2021/12/13 13:47:06 1.2
+++ pkgsrc/devel/doxygen/patches/patch-src_dirdef.cpp 2022/05/23 13:08:02 1.3
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-src_dirdef.cpp,v 1.2 2021/12/13 13:47:06 micha Exp $ 1$NetBSD: patch-src_dirdef.cpp,v 1.3 2022/05/23 13:08:02 micha Exp $
2 2
3Doxygen encodes the source directory path into some of the output filenames. 3Doxygen encodes the source directory path into some of the output filenames.
4This is problematic in a pkgsrc context as it means WRKDIR pathnames can appear 4This is problematic in a pkgsrc context as it means WRKDIR pathnames can appear
5in generated filenames. Fix by reverting to the old way of naming the files. 5in generated filenames. Fix by reverting to the old way of naming the files.
6 6
7--- src/dirdef.cpp.orig 2021-08-17 17:10:43.000000000 +0000 7--- src/dirdef.cpp.orig 2021-08-17 17:10:43.000000000 +0000
8+++ src/dirdef.cpp 8+++ src/dirdef.cpp
9@@ -211,7 +211,7 @@ QCString DirDefImpl::getOutputFileBase() 9@@ -214,7 +214,7 @@ QCString DirDefImpl::getOutputFileBase()
10 { 10 {
11 //printf("DirDefImpl::getOutputFileBase() %s->dir_%s\n", 11 //printf("DirDefImpl::getOutputFileBase() %s->dir_%s\n",
12 // qPrint(m_diskName),qPrint(encodeDirName(m_diskName))); 12 // qPrint(m_diskName),qPrint(encodeDirName(m_diskName)));
13- return "dir_"+encodeDirName(m_diskName); 13- return "dir_"+encodeDirName(m_diskName);
14+ return QCString().sprintf("dir_%06d",m_dirCount); 14+ return QCString().sprintf("dir_%06d",m_dirCount);
15 } 15 }
16  16
17 void DirDefImpl::writeDetailedDescription(OutputList &ol,const QCString &title) 17 void DirDefImpl::writeDetailedDescription(OutputList &ol,const QCString &title)