diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -1,6 +1,5 @@ PORTNAME= doxygen -PORTVERSION= 1.9.6 -PORTREVISION= 1 +PORTVERSION= 1.11.0 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/rel-${PORTVERSION} \ diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo --- a/devel/doxygen/distinfo +++ b/devel/doxygen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673081300 -SHA256 (doxygen-1.9.6.src.tar.gz) = 297f8ba484265ed3ebd3ff3fe7734eb349a77e4f95c8be52ed9977f51dea49df -SIZE (doxygen-1.9.6.src.tar.gz) = 5293513 +TIMESTAMP = 1716713854 +SHA256 (doxygen-1.11.0.src.tar.gz) = c9edfdf8c5f3e8bee0c4c967850caead27099883ee7ff8b11044e6d63faf3607 +SIZE (doxygen-1.11.0.src.tar.gz) = 8447729 diff --git a/devel/doxygen/files/patch-CMakeLists.txt b/devel/doxygen/files/patch-CMakeLists.txt deleted file mode 100644 --- a/devel/doxygen/files/patch-CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- CMakeLists.txt.orig 2022-12-20 18:30:03 UTC -+++ CMakeLists.txt -@@ -197,7 +197,6 @@ include(cmake/Coverage.cmake) - include(cmake/CompilerWarnings.cmake) - include(cmake/Coverage.cmake) - --add_subdirectory(libmd5) - add_subdirectory(liblodepng) - add_subdirectory(libmscgen) - add_subdirectory(libversion) diff --git a/devel/doxygen/files/patch-deps_CMakeLists.txt b/devel/doxygen/files/patch-deps_CMakeLists.txt new file mode 100644 --- /dev/null +++ b/devel/doxygen/files/patch-deps_CMakeLists.txt @@ -0,0 +1,7 @@ +--- deps/CMakeLists.txt.orig 2024-01-04 21:16:56.000000000 +0100 ++++ deps/CMakeLists.txt 2024-05-26 16:20:50.926981000 +0200 +@@ -1,4 +1,3 @@ +-add_subdirectory(libmd5) + add_subdirectory(liblodepng) + add_subdirectory(libmscgen) + if (NOT use_sys_spdlog) diff --git a/devel/doxygen/files/patch-doc__internal_Doxyfile.in b/devel/doxygen/files/patch-doc__internal_Doxyfile.in --- a/devel/doxygen/files/patch-doc__internal_Doxyfile.in +++ b/devel/doxygen/files/patch-doc__internal_Doxyfile.in @@ -1,12 +1,12 @@ ---- doc_internal/Doxyfile.in.orig 2022-12-18 10:39:03 UTC -+++ doc_internal/Doxyfile.in -@@ -298,8 +298,7 @@ SEARCH_INCLUDES = YES +--- doc_internal/Doxyfile.in.orig 2024-05-26 16:21:09.477650000 +0200 ++++ doc_internal/Doxyfile.in 2024-05-26 16:21:54.805473000 +0200 +@@ -305,8 +305,7 @@ MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = YES SEARCH_INCLUDES = YES --INCLUDE_PATH = @CMAKE_SOURCE_DIR@/libmd5 \ -- @CMAKE_SOURCE_DIR@/liblodepng \ -+INCLUDE_PATH = @CMAKE_SOURCE_DIR@/liblodepng \ - @CMAKE_SOURCE_DIR@/libmscgen +-INCLUDE_PATH = @CMAKE_SOURCE_DIR@/deps/libmd5 \ +- @CMAKE_SOURCE_DIR@/deps/liblodepng \ ++INCLUDE_PATH = @CMAKE_SOURCE_DIR@/deps/liblodepng \ + @CMAKE_SOURCE_DIR@/deps/libmscgen INCLUDE_FILE_PATTERNS = - PREDEFINED = + PREDEFINED = DOXYGEN_ONLY diff --git a/devel/doxygen/files/patch-src_CMakeLists.txt b/devel/doxygen/files/patch-src_CMakeLists.txt --- a/devel/doxygen/files/patch-src_CMakeLists.txt +++ b/devel/doxygen/files/patch-src_CMakeLists.txt @@ -1,14 +1,14 @@ ---- src/CMakeLists.txt.orig 2022-12-20 18:30:03 UTC -+++ src/CMakeLists.txt -@@ -2,7 +2,6 @@ include_directories( - +--- src/CMakeLists.txt.orig 2024-05-10 21:34:45.000000000 +0200 ++++ src/CMakeLists.txt 2024-05-26 19:02:16.969346000 +0200 +@@ -3,7 +3,6 @@ include_directories( - ${PROJECT_SOURCE_DIR}/filesystem -- ${PROJECT_SOURCE_DIR}/libmd5 - ${PROJECT_SOURCE_DIR}/liblodepng - ${PROJECT_SOURCE_DIR}/libmscgen + ${PROJECT_SOURCE_DIR}/deps/TinyDeflate + ${PROJECT_SOURCE_DIR}/deps/filesystem +- ${PROJECT_SOURCE_DIR}/deps/libmd5 + ${PROJECT_SOURCE_DIR}/deps/liblodepng + ${PROJECT_SOURCE_DIR}/deps/libmscgen ${PROJECT_SOURCE_DIR}/libversion -@@ -69,7 +68,7 @@ add_custom_command( +@@ -72,7 +71,7 @@ # ce_parse.h add_custom_command( @@ -17,12 +17,12 @@ DEPENDS ${CMAKE_CURRENT_LIST_DIR}/constexp.y OUTPUT ${GENERATED_SRC}/ce_parse.h WORKING_DIRECTORY ${GENERATED_SRC} -@@ -387,7 +386,7 @@ target_link_libraries(doxygen PRIVATE +@@ -386,7 +385,7 @@ target_link_libraries(doxygen PRIVATE doxymain doxycfg - md5 + md + sqlite3 lodepng mscgen - xml diff --git a/devel/doxygen/files/patch-src_definition.cpp b/devel/doxygen/files/patch-src_definition.cpp --- a/devel/doxygen/files/patch-src_definition.cpp +++ b/devel/doxygen/files/patch-src_definition.cpp @@ -1,24 +1,17 @@ ---- src/definition.cpp.orig 2022-12-25 19:21:45 UTC -+++ src/definition.cpp -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - - #include "md5.h" - #include "regex.h" -@@ -417,13 +418,11 @@ bool DefinitionImpl::_docsAlreadyAdded(const QCString +--- src/definition.cpp.orig 2024-05-18 19:53:57.000000000 +0200 ++++ src/definition.cpp 2024-05-26 17:09:28.801925000 +0200 +@@ -436,13 +436,12 @@ bool DefinitionImpl::_docsAlreadyAdded(const QCString &doc,QCString &sigList) { -- uchar md5_sig[16]; +- uint8_t md5_sig[16]; - char sigStr[33]; -+ QCString sigStr(33); ++ QCString sigStr; ++ sigStr.reserve(33); // to avoid mismatches due to differences in indenting, we first remove // double whitespaces... QCString docStr = doc.simplifyWhiteSpace(); -- MD5Buffer(docStr.data(),docStr.length(),md5_sig); +- MD5Buffer(docStr.data(),static_cast(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-src_dirdef.cpp b/devel/doxygen/files/patch-src_dirdef.cpp --- a/devel/doxygen/files/patch-src_dirdef.cpp +++ b/devel/doxygen/files/patch-src_dirdef.cpp @@ -1,23 +1,16 @@ ---- src/dirdef.cpp.orig 2022-12-18 12:21:42 UTC -+++ src/dirdef.cpp -@@ -14,6 +14,7 @@ - */ - - #include -+#include - - #include "dirdef.h" - #include "md5.h" -@@ -181,10 +182,8 @@ static QCString encodeDirName(const QCString &anchor) - static QCString encodeDirName(const QCString &anchor) +--- src/dirdef.cpp.orig 2024-05-19 11:46:30.000000000 +0200 ++++ src/dirdef.cpp 2024-05-26 17:12:34.388571000 +0200 +@@ -189,10 +189,9 @@ { + AUTO_TRACE(); // convert to md5 hash -- uchar md5_sig[16]; +- uint8_t md5_sig[16]; - char sigStr[33]; -- MD5Buffer(anchor.data(),anchor.length(),md5_sig); +- MD5Buffer(anchor.data(),static_cast(anchor.length()),md5_sig); - MD5SigToString(md5_sig,sigStr); -+ QCString sigStr(33); ++ QCString sigStr; ++ sigStr.reserve(33); + MD5Data((const unsigned char *)anchor.data(),anchor.length(),sigStr.rawData()); + AUTO_TRACE_EXIT("result={}",sigStr); return sigStr; - // old algorithm diff --git a/devel/doxygen/files/patch-src_dotgraph.cpp b/devel/doxygen/files/patch-src_dotgraph.cpp --- a/devel/doxygen/files/patch-src_dotgraph.cpp +++ b/devel/doxygen/files/patch-src_dotgraph.cpp @@ -1,24 +1,17 @@ ---- src/dotgraph.cpp.orig 2022-12-25 19:00:20 UTC -+++ src/dotgraph.cpp -@@ -15,6 +15,7 @@ - - #include - #include -+#include - - #include "config.h" - #include "doxygen.h" -@@ -155,12 +156,9 @@ bool DotGraph::prepareDotFile() +--- src/dotgraph.cpp.orig 2024-01-04 21:16:56.000000000 +0100 ++++ src/dotgraph.cpp 2024-05-26 17:17:03.928042000 +0200 +@@ -155,12 +155,10 @@ term("Output dir %s does not exist!\n", m_dir.path().c_str()); } - char sigStr[33]; -- uchar md5_sig[16]; +- uint8_t md5_sig[16]; - // calculate md5 -- MD5Buffer(m_theGraph.data(), m_theGraph.length(), md5_sig); +- MD5Buffer(m_theGraph.data(), static_cast(m_theGraph.length()), md5_sig); - // convert result to a string - MD5SigToString(md5_sig, sigStr); -+ QCString sigStr(33); ++ QCString sigStr; ++ sigStr.reserve(33); + // calculate md5 and convert result to a string + MD5Data((const unsigned char*)m_theGraph.data(), m_theGraph.length(), sigStr.rawData()); diff --git a/devel/doxygen/files/patch-src_memberdef.cpp b/devel/doxygen/files/patch-src_memberdef.cpp --- a/devel/doxygen/files/patch-src_memberdef.cpp +++ b/devel/doxygen/files/patch-src_memberdef.cpp @@ -1,23 +1,16 @@ ---- src/memberdef.cpp.orig 2022-12-26 12:52:22 UTC -+++ src/memberdef.cpp -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - #include "md5.h" - #include "memberdef.h" -@@ -4149,10 +4150,8 @@ void MemberDefImpl::setAnchor() +--- src/memberdef.cpp.orig 2024-05-17 21:33:54.000000000 +0200 ++++ src/memberdef.cpp 2024-05-26 17:24:22.437857000 +0200 +@@ -4274,10 +4274,9 @@ } // convert to md5 hash -- uchar md5_sig[16]; +- uint8_t md5_sig[16]; - char sigStr[33]; -- MD5Buffer(memAnchor.data(),memAnchor.length(),md5_sig); +- MD5Buffer(memAnchor.data(),static_cast(memAnchor.length()),md5_sig); - MD5SigToString(md5_sig,sigStr); -+ QCString sigStr(33); ++ QCString sigStr; ++ sigStr.reserve(33); + MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.rawData()); - m_impl->anc = QCString("a")+sigStr; + m_anc = QCString("a")+sigStr; } diff --git a/devel/doxygen/files/patch-src_util.cpp b/devel/doxygen/files/patch-src_util.cpp --- a/devel/doxygen/files/patch-src_util.cpp +++ b/devel/doxygen/files/patch-src_util.cpp @@ -1,5 +1,5 @@ ---- src/util.cpp.orig 2022-12-25 18:59:09 UTC -+++ src/util.cpp +--- src/util.cpp.orig 2024-05-12 15:19:25.000000000 +0200 ++++ src/util.cpp 2024-05-26 18:58:48.079253000 +0200 @@ -30,6 +30,7 @@ #include #include @@ -8,15 +8,16 @@ #include "md5.h" #include "regex.h" -@@ -3754,26 +3755,18 @@ QCString convertNameToFile(const QCString &name,bool a +@@ -3844,26 +3845,18 @@ if (resultLen>=128) // prevent names that cannot be created! { // third algorithm based on MD5 hash -- uchar md5_sig[16]; +- uint8_t md5_sig[16]; - char sigStr[33]; -- MD5Buffer(result.data(),resultLen,md5_sig); +- MD5Buffer(result.data(),static_cast(resultLen),md5_sig); - MD5SigToString(md5_sig,sigStr); -+ QCString sigStr(33); ++ QCString sigStr; ++ sigStr.reserve(33); + MD5Data((const unsigned char *)result.data(),resultLen,sigStr.rawData()); result=result.left(128-32)+sigStr; } @@ -26,29 +27,29 @@ - int l1Dir=0,l2Dir=0; - int createSubdirsLevel = Config_getInt(CREATE_SUBDIRS_LEVEL); - int createSubdirsBitmaskL2 = (1<(result.length()),md5_sig); +- l1Dir = md5_sig[14] & 0xf; +- l2Dir = md5_sig[15] & createSubdirsBitmaskL2; +- - result.prepend(QCString().sprintf("d%x/d%02x/",l1Dir,l2Dir)); + result.prepend(QCString().sprintf("d%c/d%c%c/",md5[29],md5[30],md5[31])); } //printf("*** convertNameToFile(%s)->%s\n",qPrint(name),qPrint(result)); return result; -@@ -7429,6 +7422,11 @@ QCString removeEmptyLines(const QCString &s) - QCString removeEmptyLines(const QCString &s) +@@ -7137,10 +7130,8 @@ { - BufStr out(s.length()+1); -+ if (s.length()==0) -+ { -+ out.addChar('\0'); -+ return out.data(); -+ } - const char *p=s.data(); - if (p) - { + QCString projectCookie = Config_getString(HTML_PROJECT_COOKIE); + if (projectCookie.isEmpty()) return QCString(); +- uint8_t md5_sig[16]; + char sigStr[34]; +- MD5Buffer(projectCookie.data(),static_cast(projectCookie.length()),md5_sig); +- MD5SigToString(md5_sig,sigStr); ++ MD5Data((const unsigned char *)projectCookie.data(),projectCookie.length(),sigStr); + sigStr[32]='_'; sigStr[33]=0; + return sigStr; + }