Attachment #209582 for bug #242347

Lines 2-9 Link Here

(-)Makefile (-3 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= doxygen	4	PORTNAME= doxygen
5	PORTVERSION= 1.8.15	5	PORTVERSION= 1.8.16
6	PORTREVISION= 2
7	PORTEPOCH= 2	6	PORTEPOCH= 2
8	CATEGORIES= devel	7	CATEGORIES= devel
9	MASTER_SITES= http://doxygen.nl/files/	8	MASTER_SITES= http://doxygen.nl/files/
Lines 48-54 Link Here
48		47
49	QT5_USES= qt:5	48	QT5_USES= qt:5
50	QT5_USE= QT=core,widgets,gui,xml,qmake_build,buildtools_build	49	QT5_USE= QT=core,widgets,gui,xml,qmake_build,buildtools_build
51	QT5_CMAKE_ON= -Dbuild_wizard:BOOLEAN=true	50	QT5_CMAKE_BOOL= build_wizard
52	QT5_PLIST_FILES= bin/doxywizard	51	QT5_PLIST_FILES= bin/doxywizard
53		52
54	SEARCH_CMAKE_BOOL= build_search	53	SEARCH_CMAKE_BOOL= build_search

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1550430912	1	TIMESTAMP = 1570932481
2	SHA256 (doxygen-1.8.15.src.tar.gz) = bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d	2	SHA256 (doxygen-1.8.16.src.tar.gz) = ff981fb6f5db4af9deb1dd0c0d9325e0f9ba807d17bd5750636595cf16da3c82
3	SIZE (doxygen-1.8.15.src.tar.gz) = 5097791	3	SIZE (doxygen-1.8.16.src.tar.gz) = 5497317

Lines 1-10 Link Here

(-)files/patch-CMakeLists.txt (-5 / +5 lines)
1	--- CMakeLists.txt.orig 2015-06-16 17:42:32 UTC	1	--- CMakeLists.txt.orig 2019-07-30 13:10:10 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -122,7 +122,6 @@ if (win_static)	3	@@ -152,7 +152,6 @@ if (win_static)
4	endif()	4	endif()
5		5
6		6
7	-add_subdirectory(libmd5)	7	-add_subdirectory(libmd5)
8	add_subdirectory(qtools)	8	add_subdirectory(liblodepng)
9	add_subdirectory(vhdlparser)	9	add_subdirectory(libmscgen)
10	add_subdirectory(src)	10	add_subdirectory(libversion)




Patch from https://github.com/doxygen/doxygen/pull/7291

--- cmake/git_watcher.cmake.orig	2019-07-30 13:10:10 UTC
+++ cmake/git_watcher.cmake
@@ -69,7 +69,7 @@ CHECK_OPTIONAL_VARIABLE(GIT_WORKING_DIR "${CMAKE_SOURC
 # Check the optional git variable.
 # If it's not set, we'll try to find it using the CMake packaging system.
 if(NOT DEFINED GIT_EXECUTABLE)
-    find_package(Git QUIET REQUIRED)
+    find_package(Git QUIET)
 endif()
 CHECK_REQUIRED_VARIABLE(GIT_EXECUTABLE)
 

Lines 1-9 Link Here

(-)files/patch-doc-doxygen_manual.tex (-5 / +5 lines)
1	--- doc/doxygen_manual.tex.orig 2015-02-28 15:26:54 UTC	1	--- doc/doxygen_manual.tex.orig 2019-08-04 11:51:41 UTC
2	+++ doc/doxygen_manual.tex	2	+++ doc/doxygen_manual.tex
3	@@ -13,7 +13,7 @@	3	@@ -22,7 +22,7 @@
4	% input used in their production; they are not affected by this license.	4	\usepackage{array}[=2016-10-06]
5		5	\fi
6	\documentclass{book}	6	%%
7	-\usepackage[a4paper,left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry}	7	-\usepackage[a4paper,left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry}
8	+\usepackage[left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry}	8	+\usepackage[left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry}
9	\usepackage{makeidx}	9	\usepackage{makeidx}




--- Doxyfile.orig	2019-07-30 13:23:30 UTC
+++ Doxyfile
@@ -276,7 +276,6 @@ MACRO_EXPANSION        = YES
 MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           = qtools \
-                         libmd5 \
                          liblodepng \
                          libmscgen
 INCLUDE_FILE_PATTERNS  =
 PREDEFINED             =
 EXPAND_AS_DEFINED      =




--- src/dot.cpp.orig	2016-05-10 19:51:52 UTC
+++ src/dot.cpp
@@ -39,6 +39,7 @@
 #include "dirdef.h"
 #include "vhdldocgen.h"
 #include "ftextstream.h"
+#include <sys/types.h>
 #include "md5.h"
 #include "memberlist.h"
 #include "groupdef.h"
@@ -2271,10 +2272,8 @@ void DotGfxHierarchyTable::createGraph(D
     }
   }
   writeGraphFooter(md5stream);
-  uchar md5_sig[16];
   QCString sigStr(33);
-  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.rawData(),33);
+  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
   bool regenerate=FALSE;
   if (checkAndUpdateMd5Signature(absBaseName,sigStr) || 
       !checkDeliverables(absImgName,absMapName))
@@ -3039,10 +3038,8 @@ QCString computeMd5Signature(DotNode *ro
     }
   }
   writeGraphFooter(md5stream);
-  uchar md5_sig[16];
   QCString sigStr(33);
-  MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.rawData(),33);
+  MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.rawData());
   graphStr=buf.data();
   //printf("md5: %s | file: %s\n",sigStr,baseName.data());
   return sigStr;
@@ -3954,10 +3951,8 @@ QCString DotDirDeps::writeGraph(FTextStr
   FTextStream md5stream(&theGraph);
   //m_dir->writeDepGraph(md5stream);
   writeDotDirDepGraph(md5stream,m_dir,linkRelations);
-  uchar md5_sig[16];
   QCString sigStr(33);
-  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.rawData(),33);
+  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
   bool regenerate=FALSE;
   if (checkAndUpdateMd5Signature(absBaseName,sigStr) ||
       !checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
@@ -4099,10 +4094,8 @@ void generateGraphLegend(const char *pat
   md5stream << "  Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";
   md5stream << "  Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";
   writeGraphFooter(md5stream);
-  uchar md5_sig[16];
   QCString sigStr(33);
-  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.rawData(),33);
+  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
   QCString absBaseName = (QCString)path+"/graph_legend";
   QCString absDotName  = absBaseName+".dot";
   QCString imgExt = getDotImageExtension();
@@ -4507,10 +4500,8 @@ QCString DotGroupCollaboration::writeGra
   }
 
   writeGraphFooter(md5stream);
-  uchar md5_sig[16];
   QCString sigStr(33);
-  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.rawData(),33);
+  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
   QCString imgExt = getDotImageExtension();
   QCString imgFmt = Config_getEnum(DOT_IMAGE_FORMAT);
   QCString baseName    = m_diskName;




--- src/dotgraph.cpp.orig	2019-06-13 19:36:00 UTC
+++ src/dotgraph.cpp
@@ -16,6 +16,7 @@
 #include "config.h"
 #include "doxygen.h"
 #include "index.h"
+#include <sys/types.h>
 #include "md5.h"
 #include "message.h"
 #include "util.h"
@@ -153,10 +154,8 @@ bool DotGraph::prepareDotFile()
 
   QCString sigStr(33);
   uchar md5_sig[16];
-  // calculate md5
-  MD5Buffer((const unsigned char*)m_theGraph.data(), m_theGraph.length(), md5_sig);
-  // convert result to a string
-  MD5SigToString(md5_sig, sigStr.rawData(), 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
 




--- src/CMakeLists.txt.orig	2019-08-08 12:11:46 UTC
+++ src/CMakeLists.txt
@@ -1,8 +1,7 @@
 # vim:ts=4:sw=4:expandtab:autoindent:

+include_directories(BEFORE
     ${CMAKE_SOURCE_DIR}/qtools
-    ${CMAKE_SOURCE_DIR}/libmd5
     ${CMAKE_SOURCE_DIR}/liblodepng
     ${CMAKE_SOURCE_DIR}/libmscgen
     ${CMAKE_SOURCE_DIR}/libversion
@@ -277,7 +276,7 @@ target_link_libraries(doxygen
     _doxygen
     doxycfg
     qtools
-    md5
+    md
     lodepng
     mscgen
     doxygen_version




--- vhdlparser/CMakeLists.txt.orig	2019-06-10 08:17:24 UTC
+++ vhdlparser/CMakeLists.txt
@@ -1,4 +1,4 @@
 )
 set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1)
 
-include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC})
+include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC})
 add_library(vhdlparser STATIC
 ${GENERATED_SRC}/configvalues.h
 CharStream.cc
 ParseException.cc

Return to bug 242347

Line 0 Link Here

(-)files/patch-cmake_git__watcher.cmake (+13 lines)
	1	Patch from https://github.com/doxygen/doxygen/pull/7291
	2
	3	--- cmake/git_watcher.cmake.orig 2019-07-30 13:10:10 UTC
	4	+++ cmake/git_watcher.cmake
	5	@@ -69,7 +69,7 @@ CHECK_OPTIONAL_VARIABLE(GIT_WORKING_DIR "${CMAKE_SOURC
	6	# Check the optional git variable.
	7	# If it's not set, we'll try to find it using the CMake packaging system.
	8	if(NOT DEFINED GIT_EXECUTABLE)
	9	- find_package(Git QUIET REQUIRED)
	10	+ find_package(Git QUIET)
	11	endif()
	12	CHECK_REQUIRED_VARIABLE(GIT_EXECUTABLE)
	13

Lines 1-12 Link Here

(-)files/patch-md5-Doxyfile (-8 / +6 lines)
1	--- Doxyfile.orig 2014-08-14 17:46:42 UTC	1	--- Doxyfile.orig 2019-07-30 13:23:30 UTC
2	+++ Doxyfile	2	+++ Doxyfile
3	@@ -261,8 +261,7 @@	3	@@ -276,7 +276,6 @@ MACRO_EXPANSION = YES
4	MACRO_EXPANSION = YES
5	EXPAND_ONLY_PREDEF = YES	4	EXPAND_ONLY_PREDEF = YES
6	SEARCH_INCLUDES = YES	5	SEARCH_INCLUDES = YES
7	-INCLUDE_PATH = qtools \	6	INCLUDE_PATH = qtools \
8	- libmd5	7	- libmd5 \
9	+INCLUDE_PATH = qtools	8	liblodepng \
		9	libmscgen
10	INCLUDE_FILE_PATTERNS =	10	INCLUDE_FILE_PATTERNS =
11	PREDEFINED =
12	EXPAND_AS_DEFINED =

Lines 1-70 Link Here

(-)files/patch-md5-dot (-70 lines)
1	--- src/dot.cpp.orig 2016-05-10 19:51:52 UTC
2	+++ src/dot.cpp
3	@@ -39,6 +39,7 @@
4	#include "dirdef.h"
5	#include "vhdldocgen.h"
6	#include "ftextstream.h"
7	+#include <sys/types.h>
8	#include "md5.h"
9	#include "memberlist.h"
10	#include "groupdef.h"
11	@@ -2271,10 +2272,8 @@ void DotGfxHierarchyTable::createGraph(D
12	}
13	}
14	writeGraphFooter(md5stream);
15	- uchar md5_sig[16];
16	QCString sigStr(33);
17	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
18	- MD5SigToString(md5_sig,sigStr.rawData(),33);
19	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
20	bool regenerate=FALSE;
21	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|
22	!checkDeliverables(absImgName,absMapName))
23	@@ -3039,10 +3038,8 @@ QCString computeMd5Signature(DotNode *ro
24	}
25	}
26	writeGraphFooter(md5stream);
27	- uchar md5_sig[16];
28	QCString sigStr(33);
29	- MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig);
30	- MD5SigToString(md5_sig,sigStr.rawData(),33);
31	+ MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.rawData());
32	graphStr=buf.data();
33	//printf("md5: %s \| file: %s\n",sigStr,baseName.data());
34	return sigStr;
35	@@ -3954,10 +3951,8 @@ QCString DotDirDeps::writeGraph(FTextStr
36	FTextStream md5stream(&theGraph);
37	//m_dir->writeDepGraph(md5stream);
38	writeDotDirDepGraph(md5stream,m_dir,linkRelations);
39	- uchar md5_sig[16];
40	QCString sigStr(33);
41	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
42	- MD5SigToString(md5_sig,sigStr.rawData(),33);
43	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
44	bool regenerate=FALSE;
45	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|
46	!checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
47	@@ -4099,10 +4094,8 @@ void generateGraphLegend(const char *pat
48	md5stream << " Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";
49	md5stream << " Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";
50	writeGraphFooter(md5stream);
51	- uchar md5_sig[16];
52	QCString sigStr(33);
53	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
54	- MD5SigToString(md5_sig,sigStr.rawData(),33);
55	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
56	QCString absBaseName = (QCString)path+"/graph_legend";
57	QCString absDotName = absBaseName+".dot";
58	QCString imgExt = getDotImageExtension();
59	@@ -4507,10 +4500,8 @@ QCString DotGroupCollaboration::writeGra
60	}
61
62	writeGraphFooter(md5stream);
63	- uchar md5_sig[16];
64	QCString sigStr(33);
65	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
66	- MD5SigToString(md5_sig,sigStr.rawData(),33);
67	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
68	QCString imgExt = getDotImageExtension();
69	QCString imgFmt = Config_getEnum(DOT_IMAGE_FORMAT);
70	QCString baseName = m_diskName;

Line 0 Link Here

(-)files/patch-md5-dotgraph (+23 lines)
	1	--- src/dotgraph.cpp.orig 2019-06-13 19:36:00 UTC
	2	+++ src/dotgraph.cpp
	3	@@ -16,6 +16,7 @@
	4	#include "config.h"
	5	#include "doxygen.h"
	6	#include "index.h"
	7	+#include <sys/types.h>
	8	#include "md5.h"
	9	#include "message.h"
	10	#include "util.h"
	11	@@ -153,10 +154,8 @@ bool DotGraph::prepareDotFile()
	12
	13	QCString sigStr(33);
	14	uchar md5_sig[16];
	15	- // calculate md5
	16	- MD5Buffer((const unsigned char*)m_theGraph.data(), m_theGraph.length(), md5_sig);
	17	- // convert result to a string
	18	- MD5SigToString(md5_sig, sigStr.rawData(), 33);
	19	+ // calculate md5 and convert result to a string
	20	+ MD5Data((const unsigned char*)m_theGraph.data(), m_theGraph.length(), sigStr.rawData());
	21
	22	// already queued files are processed again in case the output format has changed
	23

Lines 1-4 Link Here

(-)files/patch-src_CMakeLists.txt (-8 / +8 lines)
1	--- src/CMakeLists.txt.orig 2015-05-31 19:01:12 UTC	1	--- src/CMakeLists.txt.orig 2019-08-08 12:11:46 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -1,8 +1,7 @@	3	@@ -1,8 +1,7 @@
4	# vim:ts=4:sw=4:expandtab:autoindent:	4	# vim:ts=4:sw=4:expandtab:autoindent:
Lines 7-21 Link Here
7	+include_directories(BEFORE	7	+include_directories(BEFORE
8	${CMAKE_SOURCE_DIR}/qtools	8	${CMAKE_SOURCE_DIR}/qtools
9	- ${CMAKE_SOURCE_DIR}/libmd5	9	- ${CMAKE_SOURCE_DIR}/libmd5
10	${CMAKE_SOURCE_DIR}/vhdlparser/	10	${CMAKE_SOURCE_DIR}/liblodepng
11	${CMAKE_SOURCE_DIR}/src	11	${CMAKE_SOURCE_DIR}/libmscgen
12	${CLANG_INCLUDEDIR}	12	${CMAKE_SOURCE_DIR}/libversion
13	@@ -229,7 +228,7 @@ target_link_libraries(doxygen	13	@@ -277,7 +276,7 @@ target_link_libraries(doxygen
14	_doxygen	14	_doxygen
15	doxycfg	15	doxycfg
16	qtools	16	qtools
17	- md5	17	- md5
18	+ md	18	+ md
19	vhdlparser	19	lodepng
20	${SQLITE3_LIBRARIES}	20	mscgen
21	${ICONV_LIBRARIES}	21	doxygen_version

Lines 1-11 Link Here

(-)files/patch-vhdlparser_CMakeLists.txt (-6 / +3 lines)
1	--- vhdlparser/CMakeLists.txt.orig 2016-05-10 19:51:52 UTC	1	--- vhdlparser/CMakeLists.txt.orig 2019-06-10 08:17:24 UTC
2	+++ vhdlparser/CMakeLists.txt	2	+++ vhdlparser/CMakeLists.txt
3	@@ -6,7 +6,7 @@ add_custom_command(	3	@@ -1,4 +1,4 @@
4	)
5	set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1)
6
7	-include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC})	4	-include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC})
8	+include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC})	5	+include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC})
9	add_library(vhdlparser STATIC	6	add_library(vhdlparser STATIC
10	${GENERATED_SRC}/configvalues.h
11	CharStream.cc	7	CharStream.cc
		8	ParseException.cc