From nobody Thu May 12 22:20:16 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6AAC91ADD67A; Thu, 12 May 2022 22:20:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KzmS06H2Xz4v0b; Thu, 12 May 2022 22:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652394017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=es5gQhWBsATMUIYK+Ucn4RgxQ5V+kNpaUr3zDveq2ZQ=; b=sdfh25GkVD1hrti30MEum0NsOZvt7op6FyRte8r1rIoltny+xWM+blnmMN2Y2Z81Lc7exq NVfnCqqmg+74PwiWynUtyRYm9ZQQ58PqMeX8ktxXEU9nzvgzycyPeJ1/NtOAFwxYvagTtF zHJlSXds1Is58sis1JfknyPwSCyW0kDgaJ/QywhV5Ybq/ID9SmNRp2MJG8D8iaFqnL2Xqv qzGkDveYzc3LM7gr/Bje754RCKSDvQkDAmXr932hnN8novew7vcOvUnHwBcsUTJ5vKtD9N 6IRLzOQxuKaZB3ZYbRxiuJyT9yAXFoeOL1L1QfwiHv5CGG0cKAri03blhDO+Yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A25C5169C3; Thu, 12 May 2022 22:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24CMKGOu071827; Thu, 12 May 2022 22:20:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24CMKGgU071820; Thu, 12 May 2022 22:20:16 GMT (envelope-from git) Date: Thu, 12 May 2022 22:20:16 GMT Message-Id: <202205122220.24CMKGgU071820@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: e686f2196c4d - main - devel/doxygen: update to 1.9.4 release (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e686f2196c4da731aced2099b20c462efd9a16bc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652394016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=es5gQhWBsATMUIYK+Ucn4RgxQ5V+kNpaUr3zDveq2ZQ=; b=BI8mreD+AU89pOBcPEyWWBSB/MmyNDw8+RwNlvwan/kRDd8XO1gELYgEIr/nBTBWEQnbiK XeNFet7ZFRhSjrG4Lab1kQ1IAet/VqQHQQrBUDJR3PjHafZpVemelW//qljr12mubc3q2N uZvvznJVFRKGLUHa4uUczUCx/rH51X+X94lEuuVzvqEDbgHHUV/xjzWY28ZP71FC7keAsJ Wr1I3WyZxKobRRJz3bNPS87NAyl41R/oiXRGbqapNqyQjyuWx7CRmktW+TljciXAOFZ3sX uEcHp0f7xB2ECLc41h7D0Tv/VrtOJ7coVOkcVO2zrZeYijolIlSjcKlCiu2SrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652394016; a=rsa-sha256; cv=none; b=odpQn9caAQvqTboUB5ywSeo0XwapwHzGtF5divEgJ2e6apXFuOWECQn1iNZfHki/6KR1Kc lkIsZXuENKJKjlOFxyuuWW5xloBZCnqLNXNMb64Nmv4TVvCcjc4IIsTO5eB6Q8mswNLLh+ OauhpEnBlGA3Z4amfawvDZmiQfqtZESTeG0GgXIDxy87FE2W6GGFiAdsLgLEkwYlEYJMo3 U9i7vO+Aj9Fj40TAOucEUIr4kgYYHL/x6794hvPhsmeGhrGTw/oCnsn6y2eXp2WGyzROll lG825z84JX3UmASep+tlxhP8jnRrFPfAjwWpmkPlQ/VzXgqRCmk0LGHZw5WMdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=e686f2196c4da731aced2099b20c462efd9a16bc commit e686f2196c4da731aced2099b20c462efd9a16bc Author: Dima Panov AuthorDate: 2022-05-12 22:16:42 +0000 Commit: Dima Panov 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 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 #include -@@ -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<%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);