Attachment 250994 Details for Bug 279330 – Patch for doxygen

[patch] Patch for doxygen

doxygen-1110.patch (text/plain), 20.57 KB, created by Daniel Engberg on 2024-05-26 18:34:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2024-05-26 18:34:18 UTC

Size: 20.57 KB

patch

obsolete

>diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
>index 7b97801361cd..09ded66df761 100644
>--- a/devel/doxygen/Makefile
>+++ b/devel/doxygen/Makefile
>@@ -1,33 +1,48 @@
> PORTNAME=	doxygen
>-PORTVERSION=	1.9.6
>-PORTREVISION=	1
>+DISTVERSION=	1.11.0
> PORTEPOCH=	2
> CATEGORIES=	devel
>-MASTER_SITES=	SF/${PORTNAME}/rel-${PORTVERSION} \
>-		http://doxygen.nl/files/
>-EXTRACT_SUFX=	.src.tar.gz
>+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/Release_${DISTVERSION:C/\./_/g}/ \
>+		https://doxygen.nl/files/
>+DISTNAME=	${PORTNAME}-${DISTVERSION}.src
>+
>+PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
>+PATCHFILES=	c3a95560df0590cf2cb4ada788027f0e49cbf83b.patch:-p1 \
>+		28b51a7f199d003b309e9dab52457759d5fd7691.patch:-p1
> 
> MAINTAINER=	fluffy@FreeBSD.org
> COMMENT=	Documentation system for C, C++, and other languages
>-WWW=		https://www.doxygen.org/
>+WWW=		https://www.doxygen.nl/
> 
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		bison cmake:noninja compiler:c++17-lang cpe dos2unix \
>-		iconv python shebangfix
>+USES=		bison cmake:noninja compiler:c++17-lang cpe iconv \
>+		localbase:ldflags python:build sqlite
> 
>-ALL_TARGET=	all
>-CMAKE_ARGS+=	-DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}
>+LIB_DEPENDS=	libspdlog.so:devel/spdlog
>+
>+EXTRACT_AFTER_ARGS=	--exclude ${PORTNAME}-${DISTVERSION}/deps/spdlog \
>+			--exclude ${PORTNAME}-${DISTVERSION}/deps/sqlite3 \
>+			--no-same-owner --no-same-permissions
>+
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
> 
>-EXTRACT_AFTER_ARGS=	--exclude '*/libmd5'
>+LDFLAGS+=	-Wl,--as-needed
>+
>+PORTDOCS=	*
>+PLIST_FILES=	bin/doxygen \
>+		share/man/man1/doxygen.1.gz
>+
>+CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_generateDS \
>+		use_sys_spdlog \
>+		use_sys_sqlite3
>+CMAKE_ARGS+=	-DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}
> 
>-DOS2UNIX_FILES=	doc/translator.py
>-PLIST_FILES=	bin/doxygen
>+OPTIONS_DEFINE=	DOCS GRAPHVIZ QT5 SEARCH
>+OPTIONS_DEFAULT=GRAPHVIZ
> 
>-OPTIONS_DEFINE=	DOCS GRAPHVIZ LATEX SEARCH QT5
>-OPTIONS_DEFAULT=	GRAPHVIZ
>-QT5_DESC=	Install Doxywizard GUI with Qt5
>+QT5_DESC=	Install Doxywizard GUI with QT5
> SEARCH_DESC=	Build external search tools (doxysearch and doxyindexer)
> 
> DOCS_USES=		ghostscript:build tex
>@@ -35,28 +50,21 @@ DOCS_USE=		TEX=base:build,dvipsk:build,pdftex:build
> DOCS_ALL_TARGET=	docs
> DOCS_BUILD_DEPENDS=	dot:graphics/graphviz
> DOCS_CMAKE_BOOL=	build_doc
>-DOCS_PLIST_FILES=	share/man/man1/doxygen.1.gz \
>-			share/man/man1/doxyindexer.1.gz \
>-			share/man/man1/doxysearch.1.gz \
>-			share/man/man1/doxywizard.1.gz
> # Parallel jobs break when the DOCS option is on
> DOCS_VARS=		MAKE_JOBS_UNSAFE=yes
> 
>-PORTDOCS=		*
>-
> GRAPHVIZ_RUN_DEPENDS=	dot:graphics/graphviz
> 
>-LATEX_USES=	tex
>-LATEX_USE=	TEX=base,dvipsk,pdftex
>-
>-QT5_USES=	qt:5
>-QT5_USE=	QT=core,widgets,gui,xml,qmake:build,buildtools:build
>-QT5_CMAKE_BOOL=	build_wizard
>+QT5_USES=		qt:5
>+QT5_USE=		QT=core,widgets,gui,xml,qmake:build,buildtools:build
>+QT5_CMAKE_BOOL=		build_wizard
> QT5_PLIST_FILES=	bin/doxywizard
> 
>-SEARCH_CMAKE_BOOL=	build_search
> SEARCH_LIB_DEPENDS=	libxapian.so:databases/xapian-core
>+SEARCH_CMAKE_BOOL=	build_search
> SEARCH_PLIST_FILES=	bin/doxyindexer \
>-			bin/doxysearch.cgi
>+			bin/doxysearch.cgi \
>+			share/man/man1/doxyindexer.1.gz \
>+			share/man/man1/doxysearch.1.gz
> 
> .include <bsd.port.mk>
>diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
>index 36f4cb9e149f..d41beae652a3 100644
>--- a/devel/doxygen/distinfo
>+++ b/devel/doxygen/distinfo
>@@ -1,3 +1,7 @@
>-TIMESTAMP = 1673081300
>-SHA256 (doxygen-1.9.6.src.tar.gz) = 297f8ba484265ed3ebd3ff3fe7734eb349a77e4f95c8be52ed9977f51dea49df
>-SIZE (doxygen-1.9.6.src.tar.gz) = 5293513
>+TIMESTAMP = 1716733803
>+SHA256 (doxygen-1.11.0.src.tar.gz) = c9edfdf8c5f3e8bee0c4c967850caead27099883ee7ff8b11044e6d63faf3607
>+SIZE (doxygen-1.11.0.src.tar.gz) = 8447729
>+SHA256 (c3a95560df0590cf2cb4ada788027f0e49cbf83b.patch) = 2321377dc2daa16847ecabbd663c55bb5786787f9d97ccfa885b1cc696c31363
>+SIZE (c3a95560df0590cf2cb4ada788027f0e49cbf83b.patch) = 704
>+SHA256 (28b51a7f199d003b309e9dab52457759d5fd7691.patch) = a1ffbcafd20c54b7f3016d960bbf5ebf1c2939bf476b817eccf09728b125b0d0
>+SIZE (28b51a7f199d003b309e9dab52457759d5fd7691.patch) = 1725
>diff --git a/devel/doxygen/files/patch-CMakeLists.txt b/devel/doxygen/files/patch-CMakeLists.txt
>deleted file mode 100644
>index b48abae3c227..000000000000
>--- 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-addon_doxywizard_CMakeLists.txt b/devel/doxygen/files/patch-addon_doxywizard_CMakeLists.txt
>deleted file mode 100644
>index c7e792819b58..000000000000
>--- a/devel/doxygen/files/patch-addon_doxywizard_CMakeLists.txt
>+++ /dev/null
>@@ -1,18 +0,0 @@
>---- addon/doxywizard/CMakeLists.txt.orig	2022-08-24 15:18:42 UTC
>-+++ addon/doxywizard/CMakeLists.txt
>-@@ -182,12 +182,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()
>- 
>diff --git a/devel/doxygen/files/patch-doc__internal_Doxyfile.in b/devel/doxygen/files/patch-doc__internal_Doxyfile.in
>deleted file mode 100644
>index df9d626eacb7..000000000000
>--- a/devel/doxygen/files/patch-doc__internal_Doxyfile.in
>+++ /dev/null
>@@ -1,12 +0,0 @@
>---- doc_internal/Doxyfile.in.orig	2022-12-18 10:39:03 UTC
>-+++ doc_internal/Doxyfile.in
>-@@ -298,8 +298,7 @@ SEARCH_INCLUDES        = YES
>- 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_FILE_PATTERNS  =
>- PREDEFINED             =
>diff --git a/devel/doxygen/files/patch-doc_doxygen__manual.tex b/devel/doxygen/files/patch-doc_doxygen__manual.tex
>deleted file mode 100644
>index 0665af5b15f2..000000000000
>--- a/devel/doxygen/files/patch-doc_doxygen__manual.tex
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- doc/doxygen_manual.tex.orig	2019-08-04 11:51:41 UTC
>-+++ doc/doxygen_manual.tex
>-@@ -22,7 +22,7 @@
>- \usepackage{array}[=2016-10-06]
>- \fi
>- %%
>--\usepackage[a4paper,left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry}
>-+\usepackage[left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry}
>- \usepackage{makeidx}
>- \usepackage{natbib}
>- \usepackage{graphicx}
>diff --git a/devel/doxygen/files/patch-doc_translator.py b/devel/doxygen/files/patch-doc_translator.py
>deleted file mode 100644
>index 51771706035d..000000000000
>--- a/devel/doxygen/files/patch-doc_translator.py
>+++ /dev/null
>@@ -1,23 +0,0 @@
>-Hack to avoid "UnicodeDecodeError: 'utf-8' codec can't decode byte 0xb0 in position 45: invalid start byte"
>-in src/._xmlgen.cpp which is binary. This doesn't seem like it should be present at the time the docs
>-are generated, but this is simpler for now.
>---- doc/translator.py.orig	2023-01-07 08:48:38 UTC
>-+++ doc/translator.py
>-@@ -1459,10 +1459,13 @@ class TrManager:
>- 
>-         # Read content of the file as one string.
>-         assert os.path.isfile(fname)
>--        f = xopen(fname)
>--        cont = f.read()
>--        cont = ''.join(cont.split('\n')) # otherwise the 'match' function won't work.
>--        f.close()
>-+        try:
>-+            with xopen(fname) as f:
>-+                cont = f.read()
>-+                cont = ''.join(cont.split('\n')) # otherwise the 'match' function won't work.
>-+        except UnicodeDecodeError:
>-+            print("Skipping {0} because of decoding errors".format(fname))
>-+            return
>- 
>-         # Remove the items for identifiers that were found in the file.
>-         while lst_in:
>diff --git a/devel/doxygen/files/patch-libversion_CMakeLists.txt b/devel/doxygen/files/patch-libversion_CMakeLists.txt
>new file mode 100644
>index 000000000000..22449c44384c
>--- /dev/null
>+++ b/devel/doxygen/files/patch-libversion_CMakeLists.txt
>@@ -0,0 +1,35 @@
>+--- libversion/CMakeLists.txt.orig	2024-05-26 17:26:07 UTC
>++++ libversion/CMakeLists.txt
>+@@ -5,11 +5,11 @@ set(POST_CONFIGURE_DOXYGEN_VERSION_FILE "${GENERATED_S
>+ set(POST_CONFIGURE_DOXYGEN_VERSION_FILE "${GENERATED_SRC}/doxyversion.cpp")
>+ 
>+ # setup information for git version handling
>+-set(PRE_CONFIGURE_GIT_VERSION_FILE "${PROJECT_SOURCE_DIR}/libversion/gitversion.cpp.in")
>+-set(POST_CONFIGURE_GIT_VERSION_FILE "${GENERATED_SRC}/gitversion.cpp")
>+-set(GIT_STATE_FILE "${GENERATED_SRC}/git_state")
>++#set(PRE_CONFIGURE_GIT_VERSION_FILE "${PROJECT_SOURCE_DIR}/libversion/gitversion.cpp.in")
>++#set(POST_CONFIGURE_GIT_VERSION_FILE "${GENERATED_SRC}/gitversion.cpp")
>++#set(GIT_STATE_FILE "${GENERATED_SRC}/git_state")
>+ 
>+-include(${PROJECT_SOURCE_DIR}/cmake/git_watcher.cmake)
>++#include(${PROJECT_SOURCE_DIR}/cmake/git_watcher.cmake)
>+ include(${PROJECT_SOURCE_DIR}/cmake/doxygen_version.cmake)
>+ 
>+ include_directories(
>+@@ -18,13 +18,12 @@ add_library(doxygen_version STATIC
>+ 
>+ add_library(doxygen_version STATIC
>+     ${POST_CONFIGURE_DOXYGEN_VERSION_FILE}
>+-    ${POST_CONFIGURE_GIT_VERSION_FILE}
>+     fullversion.cpp
>+ )
>+ 
>+-add_dependencies( doxygen_version check_git_repository )
>++#add_dependencies( doxygen_version check_git_repository )
>+ add_dependencies( doxygen_version check_doxygen_version )
>+ 
>+-set_source_files_properties(${POST_CONFIGURE_GIT_VERSION_FILE} PROPERTIES GENERATED 1)
>++#set_source_files_properties(${POST_CONFIGURE_GIT_VERSION_FILE} PROPERTIES GENERATED 1)
>+ set_source_files_properties(${POST_CONFIGURE_DOXYGEN_VERSION_FILE} PROPERTIES GENERATED 1)
>+-set_source_files_properties(${GIT_STATE_FILE} PROPERTIES GENERATED 1)
>++#set_source_files_properties(${GIT_STATE_FILE} PROPERTIES GENERATED 1)
>diff --git a/devel/doxygen/files/patch-libversion_fullversion.cpp b/devel/doxygen/files/patch-libversion_fullversion.cpp
>new file mode 100644
>index 000000000000..d10839320bc2
>--- /dev/null
>+++ b/devel/doxygen/files/patch-libversion_fullversion.cpp
>@@ -0,0 +1,13 @@
>+--- libversion/fullversion.cpp.orig	2024-05-26 17:33:42 UTC
>++++ libversion/fullversion.cpp
>+@@ -8,8 +8,8 @@ std::string getFullVersion()
>+   if (!init)
>+   {
>+     fullVersion = getDoxygenVersion();
>+-    std::string gitVersion  = getGitVersion();
>+-    if (!gitVersion.empty()) fullVersion+=" ("+gitVersion+")";
>++//  std::string gitVersion  = getGitVersion();
>++//  if (!gitVersion.empty()) fullVersion+=" ("+gitVersion+")";
>+     init = true;
>+   }
>+   return fullVersion;
>diff --git a/devel/doxygen/files/patch-src_CMakeLists.txt b/devel/doxygen/files/patch-src_CMakeLists.txt
>deleted file mode 100644
>index ccf752af1430..000000000000
>--- a/devel/doxygen/files/patch-src_CMakeLists.txt
>+++ /dev/null
>@@ -1,28 +0,0 @@
>---- src/CMakeLists.txt.orig	2022-12-20 18:30:03 UTC
>-+++ src/CMakeLists.txt
>-@@ -2,7 +2,6 @@ include_directories(
>- 
>- include_directories(
>-     ${PROJECT_SOURCE_DIR}/filesystem
>--    ${PROJECT_SOURCE_DIR}/libmd5
>-     ${PROJECT_SOURCE_DIR}/liblodepng
>-     ${PROJECT_SOURCE_DIR}/libmscgen
>-     ${PROJECT_SOURCE_DIR}/libversion
>-@@ -69,7 +68,7 @@ add_custom_command(
>- 
>- # ce_parse.h
>- add_custom_command(
>--    COMMAND ${BISON_EXECUTABLE} -l -d -p ce_parsexpYY ${CMAKE_CURRENT_LIST_DIR}/constexp.y -o ce_parse.c
>-+    COMMAND ${BISON_EXECUTABLE} -l -d ${CMAKE_CURRENT_LIST_DIR}/constexp.y -o ce_parse.c
>-     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
>- target_link_libraries(doxygen PRIVATE
>-     doxymain
>-     doxycfg
>--    md5
>-+    md
>-     lodepng
>-     mscgen
>-     xml
>diff --git a/devel/doxygen/files/patch-src_constexp.y b/devel/doxygen/files/patch-src_constexp.y
>deleted file mode 100644
>index b80f7c177c86..000000000000
>--- a/devel/doxygen/files/patch-src_constexp.y
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/constexp.y.orig	2021-05-12 18:53:13 UTC
>-+++ src/constexp.y
>-@@ -32,7 +32,7 @@ int constexpYYerror(yyscan_t yyscanner, const char *s)
>- 
>- %}
>- 
>--%name-prefix "constexpYY"
>-+%define api.prefix {constexpYY}
>- %define api.pure full
>- %lex-param {yyscan_t yyscanner}
>- %parse-param {yyscan_t yyscanner}
>diff --git a/devel/doxygen/files/patch-src_definition.cpp b/devel/doxygen/files/patch-src_definition.cpp
>deleted file mode 100644
>index c3d31b035aab..000000000000
>--- a/devel/doxygen/files/patch-src_definition.cpp
>+++ /dev/null
>@@ -1,26 +0,0 @@
>---- src/definition.cpp.orig	2022-12-25 19:21:45 UTC
>-+++ src/definition.cpp
>-@@ -7,6 +7,7 @@
>- #include <stdio.h>
>- #include <stdlib.h>
>- #include <assert.h>
>-+#include <sys/types.h>
>- 
>- #include "md5.h"
>- #include "regex.h"
>-@@ -417,13 +418,11 @@ bool DefinitionImpl::_docsAlreadyAdded(const QCString 
>- 
>- bool DefinitionImpl::_docsAlreadyAdded(const QCString &doc,QCString &sigList)
>- {
>--  uchar md5_sig[16];
>--  char sigStr[33];
>-+  QCString sigStr(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);
>--  MD5SigToString(md5_sig,sigStr);
>-+  MD5Data((const unsigned char *)docStr.data(),docStr.length(),sigStr.rawData());
>-   //printf("%s:_docsAlreadyAdded doc='%s' sig='%s' docSigs='%s'\n",
>-   //    qPrint(name()),qPrint(doc),qPrint(sigStr),qPrint(sigList));
>-   if (sigList.find(sigStr)==-1) // new docs, add signature to prevent re-adding it
>diff --git a/devel/doxygen/files/patch-src_dirdef.cpp b/devel/doxygen/files/patch-src_dirdef.cpp
>deleted file mode 100644
>index 9c394304f23b..000000000000
>--- a/devel/doxygen/files/patch-src_dirdef.cpp
>+++ /dev/null
>@@ -1,23 +0,0 @@
>---- src/dirdef.cpp.orig	2022-12-18 12:21:42 UTC
>-+++ src/dirdef.cpp
>-@@ -14,6 +14,7 @@
>-  */
>- 
>- #include <algorithm>
>-+#include <sys/types.h>
>- 
>- #include "dirdef.h"
>- #include "md5.h"
>-@@ -181,10 +182,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(anchor.data(),anchor.length(),md5_sig);
>--  MD5SigToString(md5_sig,sigStr);
>-+  QCString sigStr(33);
>-+  MD5Data((const unsigned char *)anchor.data(),anchor.length(),sigStr.rawData());
>-   return sigStr;
>- 
>-   // old algorithm
>diff --git a/devel/doxygen/files/patch-src_dotgraph.cpp b/devel/doxygen/files/patch-src_dotgraph.cpp
>deleted file mode 100644
>index 35609d01ef85..000000000000
>--- a/devel/doxygen/files/patch-src_dotgraph.cpp
>+++ /dev/null
>@@ -1,26 +0,0 @@
>---- src/dotgraph.cpp.orig	2022-12-25 19:00:20 UTC
>-+++ src/dotgraph.cpp
>-@@ -15,6 +15,7 @@
>- 
>- #include <mutex>
>- #include <regex>
>-+#include <sys/types.h>
>- 
>- #include "config.h"
>- #include "doxygen.h"
>-@@ -155,12 +156,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(m_theGraph.data(), m_theGraph.length(), md5_sig);
>--  // convert result to a string
>--  MD5SigToString(md5_sig, sigStr);
>-+  QCString sigStr(33);
>-+  // calculate md5 and convert result to a string
>-+  MD5Data((const unsigned char*)m_theGraph.data(), m_theGraph.length(), sigStr.rawData());
>- 
>-   // already queued files are processed again in case the output format has changed
>- 
>diff --git a/devel/doxygen/files/patch-src_doxygen.cpp b/devel/doxygen/files/patch-src_doxygen.cpp
>new file mode 100644
>index 000000000000..2ed0a40da2cc
>--- /dev/null
>+++ b/devel/doxygen/files/patch-src_doxygen.cpp
>@@ -0,0 +1,19 @@
>+--- src/doxygen.cpp.orig	2024-05-26 17:35:53 UTC
>++++ src/doxygen.cpp
>+@@ -11472,11 +11472,11 @@ static void writeTagFile()
>+   TextStream tagFile(&f);
>+   tagFile << "<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>\n";
>+   tagFile << "<tagfile doxygen_version=\"" << getDoxygenVersion() << "\"";
>+-  std::string gitVersion = getGitVersion();
>+-  if (!gitVersion.empty())
>+-  {
>+-    tagFile << " doxygen_gitid=\"" << gitVersion << "\"";
>+-  }
>++//  std::string gitVersion = getGitVersion();
>++//  if (!gitVersion.empty())
>++//  {
>++//    tagFile << " doxygen_gitid=\"" << gitVersion << "\"";
>++//  }
>+   tagFile << ">\n";
>+ 
>+   // for each file
>diff --git a/devel/doxygen/files/patch-src_memberdef.cpp b/devel/doxygen/files/patch-src_memberdef.cpp
>deleted file mode 100644
>index 1a58613b7f74..000000000000
>--- a/devel/doxygen/files/patch-src_memberdef.cpp
>+++ /dev/null
>@@ -1,23 +0,0 @@
>---- src/memberdef.cpp.orig	2022-12-26 12:52:22 UTC
>-+++ src/memberdef.cpp
>-@@ -17,6 +17,7 @@
>- #include <stdio.h>
>- #include <assert.h>
>- #include <mutex>
>-+#include <sys/types.h>
>- 
>- #include "md5.h"
>- #include "memberdef.h"
>-@@ -4149,10 +4150,8 @@ void MemberDefImpl::setAnchor()
>-   }
>- 
>-   // convert to md5 hash
>--  uchar md5_sig[16];
>--  char sigStr[33];
>--  MD5Buffer(memAnchor.data(),memAnchor.length(),md5_sig);
>--  MD5SigToString(md5_sig,sigStr);
>-+  QCString sigStr(33);
>-+  MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.rawData());
>-   m_impl->anc = QCString("a")+sigStr;
>- }
>- 
>diff --git a/devel/doxygen/files/patch-src_membergroup.cpp b/devel/doxygen/files/patch-src_membergroup.cpp
>deleted file mode 100644
>index e4cc9a785bd8..000000000000
>--- a/devel/doxygen/files/patch-src_membergroup.cpp
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/membergroup.cpp.orig	2022-09-18 12:47:12 UTC
>-+++ src/membergroup.cpp
>-@@ -15,6 +15,8 @@
>-  *
>-  */
>- 
>-+#include <sys/types.h>
>-+
>- #include "membergroup.h"
>- #include "memberlist.h"
>- #include "outputlist.h"
>diff --git a/devel/doxygen/files/patch-src_util.cpp b/devel/doxygen/files/patch-src_util.cpp
>deleted file mode 100644
>index fbe3480bcd02..000000000000
>--- a/devel/doxygen/files/patch-src_util.cpp
>+++ /dev/null
>@@ -1,54 +0,0 @@
>---- src/util.cpp.orig	2022-12-25 18:59:09 UTC
>-+++ src/util.cpp
>-@@ -30,6 +30,7 @@
>- #include <cinttypes>
>- #include <sstream>
>- 
>-+#include <sys/types.h>
>- #include "md5.h"
>- 
>- #include "regex.h"
>-@@ -3754,26 +3755,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(result.data(),resultLen,md5_sig);
>--      MD5SigToString(md5_sig,sigStr);
>-+      QCString sigStr(33);
>-+      MD5Data((const unsigned char *)result.data(),resultLen,sigStr.rawData());
>-       result=result.left(128-32)+sigStr;
>-     }
>-   }
>-   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(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);
>- 
>--    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)
>- {
>-   BufStr out(s.length()+1);
>-+  if (s.length()==0)
>-+  {
>-+    out.addChar('\0');
>-+    return out.data();
>-+  }
>-   const char *p=s.data();
>-   if (p)
>-   {
>diff --git a/devel/doxygen/files/patch-vhdlparser_CMakeLists.txt b/devel/doxygen/files/patch-vhdlparser_CMakeLists.txt
>deleted file mode 100644
>index 3b1baca4f49c..000000000000
>--- a/devel/doxygen/files/patch-vhdlparser_CMakeLists.txt
>+++ /dev/null
>@@ -1,13 +0,0 @@
>---- vhdlparser/CMakeLists.txt.orig	2022-12-19 11:34:59 UTC
>-+++ vhdlparser/CMakeLists.txt
>-@@ -35,8 +35,8 @@ include_directories(
>- set_source_files_properties(${GENERATED_SRC}/VhdlParser_adj.cc PROPERTIES GENERATED 1)
>- 
>- include_directories(
>--	${PROJECT_SOURCE_DIR}/src
>--	${PROJECT_SOURCE_DIR}/vhdlparser
>-+	BEFORE ${CMAKE_SOURCE_DIR}/src
>-+	${CMAKE_SOURCE_DIR}/vhdlparser
>- 	${GENERATED_SRC})
>- add_library(vhdlparser STATIC
>- CharStream.cc

Actions: View | Diff

Attachments on bug 279330: 250994 | 250995