CVS commit: pkgsrc/devel/doxygen

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri May 19 10:37:20 UTC 2023

Modified Files:
        pkgsrc/devel/doxygen: Makefile distinfo
        pkgsrc/devel/doxygen/patches: patch-src_dirdef.cpp
Added Files:
        pkgsrc/devel/doxygen/patches: patch-deps_filesystem_filesystem.hpp
Removed Files:
        pkgsrc/devel/doxygen/patches: patch-filesystem_filesystem.hpp

Log Message:
doxygen: updated to 1.9.7

Release 1.9.7

Bug fixes

bug 327697 Ignores single-line /*! ... */ comment contents sometimes
bug 473140 Broken anonymous union data in XML
bug 548438 VERBATIM_HEADERS - only works with header files with file type
bug 564252 HTML output for pure virtual function with "throws()" hint is wrong
bug 594746 [html] wrong <title> value, missing title in page for "Members" pages
bug 628022 single `-` in `<pre>` busts nesting levels
bug 636706 Support regular expressions in EXCLUDE_SYMBOLS
bug 752410 make.bat on UNC paths will start to erase files from c:\windows\system32
bug_665439 FILE_VERSION_FILTER incorrectly run for file references from a tagfile with filename "<tagfile>:/my/path"
bug_676971 HIDE_SCOPE_NAMES also hides template declarations of template member functions in detail description
issue 6737 end of comment inside code block
issue 7087 Invalid (X)HTML in case of \mscfile, \dotfile, \diafile,
issue 7386 Method parameters documented inline are not present in documentation when using @copydoc
issue 8790 doxyrest command returns "duplicate member id group...",,
issue 9159 Doxygen produces ugly empty space in LaTeX and PDF output because of hypertargets
issue 9254 Markdown page subpage and treeview
issue 9319 Doc build fails with cairo 1.17.6,
issue 9368 subsubsection and beyond text rendered inline on LaTeX
issue 9668 Doxygen confused with enum class in nested namespaces
issue 9696 bug 466064 Formatting-options for $datetime
issue 9713 Variables show in "Related Functions" section
issue 9718 class diagram's width is not correct and class member appears weird,,
issue 9719 \ref command does not insert title of referenced page,,
issue 9726 \ref command doesn't perform in LaTeX as described in the documentation
issue 9756 Doxygen produces invalid output for many C interpolated strings
issue 9763 Python docstring: brief and detailed description not correctly separated by blank line
issue 9771 Escaped double-quote in Objective-C string confuses parser
issue 9779 Doxygen doesn't correctly treat nested \if statements
issue 9783 Some functions are not listed in "referenced by"
issue 9810 Math in bibliography
issue 9816 Missing search files in QCH content,
issue 9831 @exception description paragraph does not accept @ref tag,
issue 9839 Server side search is returning wrong results
issue 9845 C parser reads "$" as "Interpolated string expression" which is not correct
issue 9846 Python functions with and without type hints displayed inconsistently.
issue 9850 Link to class enum in namespace not working in file reference
issue 9852 Operator<< not parsed correctly in template class
issue 9855 HTML: TOC: Smooth scrolling
issue 9858 Markdown: Heading auto id starting with digit of minus sign
issue 9861 Links among markdown files don't work if upstream path element contains space
issue 9883 Performance issues when HAVE_DOT is YES to make \dot work, and CLASS_GRAPH=GRAPH is also used
issue 9885 References to enum member partially broken since v1.9.5
issue 9911 Support < for documenting members and variables
issue 9921 HIDE_SCOPE_NAMES does not hide names in treeview
issue 9932 Incomplete Style.css
issue 9935 Doxygen WARN_LOGFILE needs to create folder
issue 9942 warning: Member try (variable) of namespace lib_validation is not documented.
issue 9947 Attributes resulting of an unpacked tuple are not documented (Python),,,
issue 9950 PlantUML is not fully supported in markdown fenced code blocks
issue 9963 [VHDL] - Generic parameter list of generic subprograms are not printed
issue 9963
issue 10006 Problem with generated documentation when a method is named 'exception'
issue 10010 SHOW_HEADERFILE doesn't work well for headers with no file extension
issue 10013 infinite recursion (stack overflow) in findScopeFromQualifiedName
issue 10015 Add warning when file set for USE_MDFILE_AS_MAINPAGE isn't found
issue 10050 Typo in the Doxygen \todo documentation
avoid csp insecure eval on search box.
fix sqlite3gen regressions from 592aaa4
Fix server based search for PHP 8.1
search: Fix incorrect result count in opensearch suggestions
Don't show `__pad*__` for unnamed bitfields
Check and copy logo file for rtf output
Escape `-` sign in fontname settings substring as well,
Latex incorrect handling of backticks in code fragments
Variables were shown with () in the client side search results
Prevent bogus type assignment in Python output
Rename correct file to .bak when using "doxygen -u <some-path>" (issue 10035)
Double identifiers due to mapping to same id of file names,
Fixed cross referencing issue.
Limit index fields in hhk file of chm file.
Hide undocumented group members when `HIDE_UNDOC_MEMBERS=YES`
Handling of `\noop` command in preprocessor
Handling of verbatim type sections in preprocessor,
Fixes for type bound procedures in Fortran
Incorrect warning about not matching number of `if` / `endif`
Text on start line of fenced code block should not be ignored.,
Undefined references in pdf documents
No anchor should be created for inherited members,
Not documented parameter in case of `const <type>` without argument name
Prevent list items in section titles,

Features

New option MSCGEN_TOOL for running mscgen externally,
New option MARKDOWN_ID_STYLE to generate GitHub style identifiers for sections
New option SITEMAP_URL to generate Sitemaps
New option TIMESTAMP to disable pages without timestamps (replaces HTML_TIMESTAMP and LATEX_TIMESTAMP)
Making settings from settings file available via new \doxyconfig command.,
Add '<thead>', '<tbody>' and '<tfoot>' HTML tags as dummies
Add `point` as email separator
Improved group handling for defines, static functions, and enums,, and
Support visible attribute for all elements in the layout file,,,
Ignore C11 _Static_assert()
Adding "engine" ebnf, hcl, and regex for plantuml,
Better handling of punctuation characters in GitHub anchors
Better representation of brief (union / struct) descriptions in HTML
Better warning from constant expression evaluation
Reduce LaTeX warnings,,
Support for basic hierarchical grouping in LaTeX output
Support hierarchical groups in RTF and use the same model for pages
Improve default LaTeX hypertarget location
Allow multiple newlines in a Markdown code span.,
[view]
Enable possible other LaTeX error modes via new LATEX_BATCHMODE options,
Added option `trimleft` to the command `\snippet`

Improved user feedback and documentation

bug 630661 Highlighting lines in a dot graph,
bug 615500 Program Icon under Windows,
doc(commands): Update \class example link
doc(commands): Update example links for manual.c
doc(diagrams): Better HTML example link
doc(grouping): Link memgrp example to file docs
doc(various): Match HTML and LaTeX example links
docs(docblocks): Update some example hyperlinks
Translation of terms in tooltip
Updated Portuguese, Spanish, and Swedish translators,,,,
Improve readability/contrast of "use" arrows in dark mode
Hyperlinks in help information of doxywizard
Fix for some permanent redirects
Coloring in languages table in manual
Collect warnings and output them at the end
Debugging documentation
Incorrect HTML generated for doxygen manual,
Incorrect and redirect links in documentation
Incomplete dependency translation report
Spelling corrections,,,,,,,
Confusing edge tooltips shown
Applied various cosmetic changes to the HTML output
Confusing entries in legend explanation
Consistency in HTML output with multiple runs
Consistency / links in LaTeX output of the doxygen documentation
Consistency between HTML and LaTeX / RTF for examples
Consistency between return type and usage of pid
Consistency in used debug terminology
Correct wording of fatal error message
Documentation `\ianchor` correction
Preserve whitespace after \showdate format
Silently ignore `</img>` tag
Union / Struct indicated as Class in the Xref list,
Labels were not visible in dark mode for some dot graphs,
Fixed problem with the client side search engine (HTML output)
Improve layout of table with HTML commands on documentation
Improvement of position of open / closed folder icon
The CDATA sections in xml code representation should not be interpreted

Refactoring and cleanup

Reduce code duplication,,,
Reduce lock contention in symbol resolver
Refactor (sub)page handling for LaTeX
Refactoring: Improve performance of computeMemberRelations()
Refactoring: Optimize Definition::name() and Definition::localName()
Refactoring: Remove raw pointer use from cmdmapper
Refactoring: Store DocNodeVariant pointer inside DocNodes
Refactoring: Use std::variant for code generators
Refactoring: add OutputCodeList to specific generators
Refactoring: add multi-thread support to generateJSNavTree()
Refactoring: add multi-thread support to writeJavaScriptSearchIndex()
Refactoring: avoid unneeded DocParser pushContext/popContext calls
Refactoring: better use of smart pointers for layout module
Refactoring: embed TokenInfo in doctokenizer as value instead of pointer
Refactoring: for ScopedTypeVariant use std::variant
Refactoring: improve argv/argc handling for libclang API
Refactoring: improve performance of selectBlock()
Refactoring: let create*Def() functions return std::unique_ptr instead of raw pointer
Refactoring: make a couple of global enums scoped
Refactoring: make use of C++17 structured bindings
Refactoring: move detab() to util.cpp so it can be shared
Refactoring: move some functionality from generic to more specific files
Refactoring: optimize addHtmlExtensionIfMissing()
Refactoring: optimize keyword substitution for LaTeX output
Refactoring: optimize toLowerChar()
Refactoring: pass variant by moving instead of copying
Refactoring: remove BaseOutputDocInterface class
Refactoring: remove CodeOutputInterface base class from OutputCodeList
Refactoring: remove toClassDefMutable for const input
Refactoring: remove toMemberDefMutable for const input
Refactoring: remove toNamespaceDefMutable for const input
Refactoring: remove unneeded m_impl indirection from MemberDefImpl
Refactoring: remove unused code
Refactoring: remove unused conversion function
Refactoring: replace types uchar/uint/ulong/int64/uint64 by stdint types
Refactoring: simplified the way search data from source code is gathered
Refactoring: simplify ConfigImpl's instance handling
Refactoring: use OutputCodeList for parsing code instead of CodeOutputInterface
Refactoring: use smart pointers for Definition class internals
Refactoring: use smartpointer for Doxygen::searchIndex instance
Refactoring: use std::unique_ptr for FileState in pre.l
Refactoring: use std::variant for generators instead of polymorphism
Refactoring: make MemberVector hold non-const MemberDef pointers
Optimize findFileDef locking
Build: Re-enable LEX_FILES_{H,CPP}, streamline
Various refactorings
Make configuration default texts configurable
Make language detection for fenced code blocks more robust
Make reading configuration utf-8 compatible
Removed unneeded mutable keyword and added missing lock
Improve debugging for lexical scanners
Replace custom tracing/debug prints by tracing via spdlog

Improved testing

Add test case for define doc association
Add test case for direct define documentation
Add test case for enum doc association
Add test case for enum field doc association
Add test case for file doc association
Add test case for function doc association
Add test case for static assertions
Add test case for typedef doc association
Add test case for variable doc association
Add test for doc entry association with groups
testing: Add test case for enum fields
ci: create workflow to publish Docker image
runtests.py: Support tests with addtional inputs
Added unit test with unicode characters in the name
Adding some attributes to dtd validation


To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 pkgsrc/devel/doxygen/Makefile
cvs rdiff -u -r1.77 -r1.78 pkgsrc/devel/doxygen/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/doxygen/patches/patch-deps_filesystem_filesystem.hpp
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/devel/doxygen/patches/patch-filesystem_filesystem.hpp
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/doxygen/patches/patch-src_dirdef.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/doxygen/Makefile
diff -u pkgsrc/devel/doxygen/Makefile:1.169 pkgsrc/devel/doxygen/Makefile:1.170
--- pkgsrc/devel/doxygen/Makefile:1.169 Wed Apr 19 08:09:40 2023
+++ pkgsrc/devel/doxygen/Makefile       Fri May 19 10:37:19 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.169 2023/04/19 08:09:40 adam Exp $
+# $NetBSD: Makefile,v 1.170 2023/05/19 10:37:19 adam Exp $
 
-DISTNAME=      doxygen-1.9.6.src
+DISTNAME=      doxygen-1.9.7.src
 PKGNAME=       ${DISTNAME:S/.src//}
-PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  http://doxygen.nl/files/
 
@@ -11,12 +10,14 @@ HOMEPAGE=   https://www.doxygen.nl/
 COMMENT=       Documentation system for C++, Java, IDL and C
 LICENSE=       gnu-gpl-v2
 
+EXTRACT_USING= gtar # Cannot restore extended attributes
+
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
 WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
 UNLIMIT_RESOURCES+=    datasize
 # doxygen changelog says at least this version of flex is required
-FLEX_REQD=             2.6.4
+FLEX_REQD+=            2.6.4
 # doxygen changelog says a C++17 compiler is required. Uses -std=gnu++1z
 # Native std::filesystem requires GCC 9. Patch for emulation is still present
 # Tested to work with GCC 7.5.0 from NetBSD 9.2

Index: pkgsrc/devel/doxygen/distinfo
diff -u pkgsrc/devel/doxygen/distinfo:1.77 pkgsrc/devel/doxygen/distinfo:1.78
--- pkgsrc/devel/doxygen/distinfo:1.77  Sat Dec 31 21:21:55 2022
+++ pkgsrc/devel/doxygen/distinfo       Fri May 19 10:37:19 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.77 2022/12/31 21:21:55 adam Exp $
+$NetBSD: distinfo,v 1.78 2023/05/19 10:37:19 adam Exp $
 
-BLAKE2s (doxygen-1.9.6.src.tar.gz) = 45b6a0b16163403de54384c63b2811b55fe46b782d75d8c66080737e22dcc924
-SHA512 (doxygen-1.9.6.src.tar.gz) = f8b0d19d33fa8a5bb92b38f1c775bd3cde7f024566cf93ed61ab0cafe86643971c04b7f2492364767b3e6ce5b518bad5e0321c82f0a72875ccf936ea7d3595b2
-Size (doxygen-1.9.6.src.tar.gz) = 5293513 bytes
-SHA1 (patch-filesystem_filesystem.hpp) = 841ae28710d3fdbb75123dc804cbc13da8448d1b
-SHA1 (patch-src_dirdef.cpp) = d10fb53e25cffac04129140e85bc836e5e7c8256
+BLAKE2s (doxygen-1.9.7.src.tar.gz) = 00f728e5316307a649d273a6820b0d5531f0c596084ad33cd89ed76a3021fd20
+SHA512 (doxygen-1.9.7.src.tar.gz) = 618ff58aa6f0a2eb89f95b570995ea3ebbcda64f502cabcecd9be2967abffb56d0d6747de0c06df422705919757e6af9c6e5a56ca603b1ddf7a09a7ee79b1803
+Size (doxygen-1.9.7.src.tar.gz) = 5736446 bytes
+SHA1 (patch-deps_filesystem_filesystem.hpp) = cab313f9b520db2764f611b117b21c5d6cc43741
+SHA1 (patch-src_dirdef.cpp) = b495c35363d58280e62519f1693eb5228b0d9c63

Index: pkgsrc/devel/doxygen/patches/patch-src_dirdef.cpp
diff -u pkgsrc/devel/doxygen/patches/patch-src_dirdef.cpp:1.3 pkgsrc/devel/doxygen/patches/patch-src_dirdef.cpp:1.4
--- pkgsrc/devel/doxygen/patches/patch-src_dirdef.cpp:1.3       Mon May 23 13:08:02 2022
+++ pkgsrc/devel/doxygen/patches/patch-src_dirdef.cpp   Fri May 19 10:37:20 2023
@@ -1,17 +1,17 @@
-$NetBSD: patch-src_dirdef.cpp,v 1.3 2022/05/23 13:08:02 micha Exp $
+$NetBSD: patch-src_dirdef.cpp,v 1.4 2023/05/19 10:37:20 adam Exp $
 
 Doxygen encodes the source directory path into some of the output filenames.
 This is problematic in a pkgsrc context as it means WRKDIR pathnames can appear
 in generated filenames. Fix by reverting to the old way of naming the files.
 
---- src/dirdef.cpp.orig        2021-08-17 17:10:43.000000000 +0000
+--- src/dirdef.cpp.orig        2023-04-10 11:37:44.000000000 +0000
 +++ src/dirdef.cpp
-@@ -214,7 +214,7 @@ QCString DirDefImpl::getOutputFileBase()
+@@ -215,7 +215,7 @@ static QCString encodeDirName(const QCSt
+ 
+ QCString DirDefImpl::getOutputFileBase() const
  {
-   //printf("DirDefImpl::getOutputFileBase() %s->dir_%s\n",
-   //    qPrint(m_diskName),qPrint(encodeDirName(m_diskName)));
--  return "dir_"+encodeDirName(m_diskName);
-+  return QCString().sprintf("dir_%06d",m_dirCount);
+-  QCString dir = "dir_"+encodeDirName(m_diskName);
++  QCString dir = QCString().sprintf("dir_%06d",m_dirCount);
+   AUTO_TRACE("diskName={} result={}",m_diskName,dir);
+   return dir;
  }
- 
- void DirDefImpl::writeDetailedDescription(OutputList &ol,const QCString &title)

Added files:

Index: pkgsrc/devel/doxygen/patches/patch-deps_filesystem_filesystem.hpp
diff -u /dev/null pkgsrc/devel/doxygen/patches/patch-deps_filesystem_filesystem.hpp:1.1
--- /dev/null   Fri May 19 10:37:20 2023
+++ pkgsrc/devel/doxygen/patches/patch-deps_filesystem_filesystem.hpp   Fri May 19 10:37:20 2023
@@ -0,0 +1,31 @@
+$NetBSD: patch-deps_filesystem_filesystem.hpp,v 1.1 2023/05/19 10:37:20 adam Exp $
+
+Disable use of experimental compiler features.
+Failed with GCC 7.4.0 on NetBSD.
+
+--- deps/filesystem/filesystem.hpp.orig        2023-03-06 19:17:40.000000000 +0000
++++ deps/filesystem/filesystem.hpp
+@@ -71,6 +71,7 @@
+ #define GHC_OS_SOLARIS
+ #elif defined(__svr4__)
+ #define GHC_OS_SYS5R4
++#define GHC_NO_DIRENT_D_TYPE
+ #elif defined(BSD)
+ #define GHC_OS_BSD
+ #elif defined(__EMSCRIPTEN__)
+@@ -241,6 +242,7 @@
+ #define GHC_HAS_STD_STRING_VIEW
+ #endif
+ 
++#if 0 // pkgsrc
+ // Standard library support for std::experimental::string_view.
+ #if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 3700 && _LIBCPP_VERSION < 7000) && (__cplusplus >= 201402)
+ #define GHC_HAS_STD_EXPERIMENTAL_STRING_VIEW
+@@ -250,6 +252,7 @@
+ // macro _GLIBCXX_USE_DUAL_ABI is always defined in libstdc++ from gcc-5 and newer
+ #define GHC_HAS_STD_EXPERIMENTAL_STRING_VIEW
+ #endif
++#endif
+ 
+ #if defined(GHC_HAS_STD_STRING_VIEW)
+ #include <string_view>