git: e686f2196c4d - main - devel/doxygen: update to 1.9.4 release (+)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 12 May 2022 22:20:16 UTC
The branch main has been updated by fluffy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e686f2196c4da731aced2099b20c462efd9a16bc
commit e686f2196c4da731aced2099b20c462efd9a16bc
Author: Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2022-05-12 22:16:42 +0000
Commit: Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2022-05-12 22:16:42 +0000
devel/doxygen: update to 1.9.4 release (+)
C++17 compiler is now required to compile doxygen
Changelog: https://www.doxygen.nl/manual/changelog.html#log_1_9_4
---
devel/doxygen/Makefile | 5 ++---
devel/doxygen/distinfo | 6 +++---
devel/doxygen/files/patch-addon_doxywizard_CMakeLists.txt | 12 +++++++-----
devel/doxygen/files/patch-md5-definition | 4 ++--
devel/doxygen/files/patch-md5-dirdef | 4 ++--
devel/doxygen/files/patch-md5-dotgraph | 6 +++---
devel/doxygen/files/patch-md5-memberdef | 4 ++--
devel/doxygen/files/patch-md5-membergroup | 15 ---------------
devel/doxygen/files/patch-md5-util | 14 ++++++++------
9 files changed, 29 insertions(+), 41 deletions(-)
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index a6b07d458f2e..731e4018d5b7 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,8 +1,7 @@
# Created by: Joep Grooten <joep@di.nl>
PORTNAME= doxygen
-PORTVERSION= 1.9.3
-PORTREVISION= 1
+PORTVERSION= 1.9.4
PORTEPOCH= 2
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/rel-${PORTVERSION} \
@@ -15,7 +14,7 @@ COMMENT= Documentation system for C, C++, and other languages
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= bison cmake:noninja compiler:c++14-lang cpe dos2unix \
+USES= bison cmake:noninja compiler:c++17-lang cpe dos2unix \
iconv python shebangfix
ALL_TARGET= all
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index ffe3bde04ad8..89e45dba26ee 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641213008
-SHA256 (doxygen-1.9.3.src.tar.gz) = f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0
-SIZE (doxygen-1.9.3.src.tar.gz) = 5152156
+TIMESTAMP = 1652030233
+SHA256 (doxygen-1.9.4.src.tar.gz) = a15e9cd8c0d02b7888bc8356eac200222ecff1defd32f3fe05257d81227b1f37
+SIZE (doxygen-1.9.4.src.tar.gz) = 5196383
diff --git a/devel/doxygen/files/patch-addon_doxywizard_CMakeLists.txt b/devel/doxygen/files/patch-addon_doxywizard_CMakeLists.txt
index d07be63e6623..9dafdd4a5334 100644
--- a/devel/doxygen/files/patch-addon_doxywizard_CMakeLists.txt
+++ b/devel/doxygen/files/patch-addon_doxywizard_CMakeLists.txt
@@ -1,16 +1,18 @@
-diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
-index 6ae71a6..e03ea7c 100644
--- addon/doxywizard/CMakeLists.txt
+++ addon/doxywizard/CMakeLists.txt
-@@ -104,9 +104,9 @@ doxywizard.rc
- )
+@@ -132,12 +132,12 @@ if(Qt5Core_FOUND)
+ endif()
if(Qt5Core_FOUND)
- target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version)
+ target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version pthread)
else()
+ if(Qt6Core_FOUND)
+- target_link_libraries(doxywizard Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Xml doxygen_version)
++ target_link_libraries(doxywizard Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Xml doxygen_version pthread)
+ else()
- target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version)
+ target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version pthread)
endif()
+ endif()
- install(TARGETS doxywizard DESTINATION bin)
diff --git a/devel/doxygen/files/patch-md5-definition b/devel/doxygen/files/patch-md5-definition
index f30629f5cf90..4a720df255a0 100644
--- a/devel/doxygen/files/patch-md5-definition
+++ b/devel/doxygen/files/patch-md5-definition
@@ -8,7 +8,7 @@
#include "md5.h"
#include <stdio.h>
#include <stdlib.h>
-@@ -416,13 +417,11 @@ void DefinitionImpl::writeDocAnchorsToTagFile(TextStre
+@@ -414,13 +415,11 @@ bool DefinitionImpl::_docsAlreadyAdded(const QCString
bool DefinitionImpl::_docsAlreadyAdded(const QCString &doc,QCString &sigList)
{
@@ -18,7 +18,7 @@
// to avoid mismatches due to differences in indenting, we first remove
// double whitespaces...
QCString docStr = doc.simplifyWhiteSpace();
-- MD5Buffer((const unsigned char *)docStr.data(),docStr.length(),md5_sig);
+- MD5Buffer(docStr.data(),docStr.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr);
+ MD5Data((const unsigned char *)docStr.data(),docStr.length(),sigStr.rawData());
//printf("%s:_docsAlreadyAdded doc='%s' sig='%s' docSigs='%s'\n",
diff --git a/devel/doxygen/files/patch-md5-dirdef b/devel/doxygen/files/patch-md5-dirdef
index 175fbb61f47a..fffe95b0b4fe 100644
--- a/devel/doxygen/files/patch-md5-dirdef
+++ b/devel/doxygen/files/patch-md5-dirdef
@@ -14,13 +14,13 @@
#include "md5.h"
#include "filename.h"
#include "doxygen.h"
-@@ -178,10 +180,8 @@ void DirDefImpl::sort()
+@@ -181,10 +183,8 @@ static QCString encodeDirName(const QCString &anchor)
static QCString encodeDirName(const QCString &anchor)
{
// convert to md5 hash
- uchar md5_sig[16];
- char sigStr[33];
-- MD5Buffer((const unsigned char *)anchor.data(),anchor.length(),md5_sig);
+- MD5Buffer(anchor.data(),anchor.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr);
+ QCString sigStr(33);
+ MD5Data((const unsigned char *)anchor.data(),anchor.length(),sigStr.rawData());
diff --git a/devel/doxygen/files/patch-md5-dotgraph b/devel/doxygen/files/patch-md5-dotgraph
index b6cdba85f5c9..39bf2f927c2f 100644
--- a/devel/doxygen/files/patch-md5-dotgraph
+++ b/devel/doxygen/files/patch-md5-dotgraph
@@ -1,6 +1,6 @@
--- src/dotgraph.cpp.orig 2021-05-12 18:53:13 UTC
+++ src/dotgraph.cpp
-@@ -18,6 +18,7 @@
+@@ -19,6 +19,7 @@
#include "config.h"
#include "doxygen.h"
#include "index.h"
@@ -8,14 +8,14 @@
#include "md5.h"
#include "message.h"
#include "util.h"
-@@ -147,12 +148,9 @@ bool DotGraph::prepareDotFile()
+@@ -154,12 +155,9 @@ bool DotGraph::prepareDotFile()
term("Output dir %s does not exist!\n", m_dir.path().c_str());
}
- char sigStr[33];
- uchar md5_sig[16];
- // calculate md5
-- MD5Buffer((const unsigned char*)m_theGraph.data(), m_theGraph.length(), md5_sig);
+- MD5Buffer(m_theGraph.data(), m_theGraph.length(), md5_sig);
- // convert result to a string
- MD5SigToString(md5_sig, sigStr);
+ QCString sigStr(33);
diff --git a/devel/doxygen/files/patch-md5-memberdef b/devel/doxygen/files/patch-md5-memberdef
index d42698ae1fb1..a86fd9a0b369 100644
--- a/devel/doxygen/files/patch-md5-memberdef
+++ b/devel/doxygen/files/patch-md5-memberdef
@@ -8,13 +8,13 @@
#include "md5.h"
#include "memberdef.h"
-@@ -4139,10 +4140,8 @@ void MemberDefImpl::setAnchor()
+@@ -4115,10 +4116,8 @@ void MemberDefImpl::setAnchor()
}
// convert to md5 hash
- uchar md5_sig[16];
- char sigStr[33];
-- MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig);
+- MD5Buffer(memAnchor.data(),memAnchor.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr);
+ QCString sigStr(33);
+ MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.rawData());
diff --git a/devel/doxygen/files/patch-md5-membergroup b/devel/doxygen/files/patch-md5-membergroup
index 8b37b528a9df..2601f2f3e65a 100644
--- a/devel/doxygen/files/patch-md5-membergroup
+++ b/devel/doxygen/files/patch-md5-membergroup
@@ -8,18 +8,3 @@
#include "md5.h"
MemberGroup::MemberGroup(const Definition *container,int id,const QCString &hdr,
-@@ -257,12 +258,10 @@ int MemberGroup::numDocEnumValues() const
-
- QCString MemberGroup::anchor() const
- {
-- uchar md5_sig[16];
-- char sigStr[33];
-+ QCString sigStr(33);
- QCString locHeader = grpHeader;
- if (locHeader.isEmpty()) locHeader="[NOHEADER]";
-- MD5Buffer((const unsigned char *)locHeader.data(),locHeader.length(),md5_sig);
-- MD5SigToString(md5_sig,sigStr);
-+ MD5Data((const unsigned char *)locHeader.data(),locHeader.length(),sigStr.rawData());
- return QCString("amgrp")+sigStr;
- }
-
diff --git a/devel/doxygen/files/patch-md5-util b/devel/doxygen/files/patch-md5-util
index 6cb1259a57e1..bfc51f6ec00a 100644
--- a/devel/doxygen/files/patch-md5-util
+++ b/devel/doxygen/files/patch-md5-util
@@ -8,13 +8,13 @@
#include "md5.h"
#include "regex.h"
-@@ -3638,24 +3639,18 @@ QCString convertNameToFile(const QCString &name,bool a
+@@ -3633,26 +3634,18 @@ QCString convertNameToFile(const QCString &name,bool a
if (resultLen>=128) // prevent names that cannot be created!
{
// third algorithm based on MD5 hash
- uchar md5_sig[16];
- char sigStr[33];
-- MD5Buffer((const unsigned char *)result.data(),resultLen,md5_sig);
+- MD5Buffer(result.data(),resultLen,md5_sig);
- MD5SigToString(md5_sig,sigStr);
+ QCString sigStr(33);
+ MD5Data((const unsigned char *)result.data(),resultLen,sigStr.rawData());
@@ -24,12 +24,14 @@
if (createSubdirs)
{
- int l1Dir=0,l2Dir=0;
+- int createSubdirsLevel = Config_getInt(CREATE_SUBDIRS_LEVEL);
+- int createSubdirsBitmaskL2 = (1<<createSubdirsLevel)-1;
-
// compute md5 hash to determine sub directory to use
- uchar md5_sig[16];
-- MD5Buffer((const unsigned char *)result.data(),result.length(),md5_sig);
-- l1Dir = md5_sig[14]&0xf;
-- l2Dir = md5_sig[15];
+- MD5Buffer(result.data(),result.length(),md5_sig);
+- l1Dir = md5_sig[14] & 0xf;
+- l2Dir = md5_sig[15] & createSubdirsBitmaskL2;
+ char md5[33];
+ MD5Data((const unsigned char *)result.data(),result.length(),md5);
@@ -38,7 +40,7 @@
}
//printf("*** convertNameToFile(%s)->%s\n",qPrint(name),qPrint(result));
return result;
-@@ -7251,6 +7246,11 @@ QCString selectBlock(const QCString& s,const QCString
+@@ -7269,6 +7262,11 @@ QCString removeEmptyLines(const QCString &s)
QCString removeEmptyLines(const QCString &s)
{
BufStr out(s.length()+1);