View | Details | Raw Unified | Return to bug 242347 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-4 / +3 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	doxygen
4
PORTNAME=	doxygen
5
PORTVERSION=	1.8.15
5
PORTVERSION=	1.8.17
6
PORTREVISION=	3
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 15-21 Link Here
15
LICENSE=	GPLv2
14
LICENSE=	GPLv2
16
LICENSE_FILE=	${WRKSRC}/LICENSE
15
LICENSE_FILE=	${WRKSRC}/LICENSE
17
16
18
USES=		bison cmake:noninja compiler:c++11-lang iconv python shebangfix
17
USES=		bison cmake:noninja compiler:c++14-lang iconv python shebangfix
19
18
20
ALL_TARGET=	all
19
ALL_TARGET=	all
21
CMAKE_ARGS+=	-DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}
20
CMAKE_ARGS+=	-DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}
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
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1550430912
1
TIMESTAMP = 1579468939
2
SHA256 (doxygen-1.8.15.src.tar.gz) = bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d
2
SHA256 (doxygen-1.8.17.src.tar.gz) = 2cba988af2d495541cbbe5541b3bee0ee11144dcb23a81eada19f5501fd8b599
3
SIZE (doxygen-1.8.15.src.tar.gz) = 5097791
3
SIZE (doxygen-1.8.17.src.tar.gz) = 5138888
(-)files/patch-CMakeLists.txt (-5 / +5 lines)
Lines 1-10 Link Here
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)
(-)files/patch-doc-doxygen_manual.tex (-5 / +5 lines)
Lines 1-9 Link Here
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}
(-)files/patch-md5-Doxyfile (-8 / +6 lines)
Lines 1-12 Link Here
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      =
(-)files/patch-md5-dot (-70 lines)
Lines 1-70 Link Here
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;
(-)files/patch-md5-dotgraph (+23 lines)
Line 0 Link Here
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
 
(-)files/patch-md5-memberdef (-3 / +2 lines)
Lines 1-4 Link Here
1
--- src/memberdef.cpp.orig	2015-01-03 22:38:57 UTC
1
--- src/memberdef.cpp.orig	2019-12-27 17:52:30 UTC
2
+++ src/memberdef.cpp
2
+++ src/memberdef.cpp
3
@@ -17,6 +17,7 @@
3
@@ -17,6 +17,7 @@
4
 #include <qglobal.h>
4
 #include <qglobal.h>
Lines 8-14 Link Here
8
 #include "md5.h"
8
 #include "md5.h"
9
 #include "memberdef.h"
9
 #include "memberdef.h"
10
 #include "membername.h"
10
 #include "membername.h"
11
@@ -3326,11 +3327,9 @@ void MemberDef::setAnchor()
11
@@ -4283,10 +4284,8 @@ void MemberDefImpl::setAnchor()
12
   }
12
   }
13
 
13
 
14
   // convert to md5 hash
14
   // convert to md5 hash
Lines 15-21 Link Here
15
-  uchar md5_sig[16];
15
-  uchar md5_sig[16];
16
   QCString sigStr(33);
16
   QCString sigStr(33);
17
-  MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig);
17
-  MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig);
18
   //printf("memAnchor=%s\n",memAnchor.data());
19
-  MD5SigToString(md5_sig,sigStr.rawData(),33);
18
-  MD5SigToString(md5_sig,sigStr.rawData(),33);
20
+  MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.rawData());
19
+  MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.rawData());
21
   m_impl->anc = "a"+sigStr;
20
   m_impl->anc = "a"+sigStr;
(-)files/patch-src_CMakeLists.txt (-8 / +8 lines)
Lines 1-4 Link Here
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
(-)files/patch-src_formula.cpp (-15 lines)
Lines 1-15 Link Here
1
Upstream git commit 03daff4 resolving a problem with Ghostscript 9.50.
2
3
--- src/formula.cpp
4
+++ src/formula.cpp
5
@@ -193,8 +193,8 @@ void FormulaList::generateBitmaps(const char *path)
6
       // used.  
7
 
8
       char gsArgs[4096];
9
-      sprintf(gsArgs,"-q -g%dx%d -r%dx%dx -sDEVICE=ppmraw "
10
-                    "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -- %s.ps",
11
+      sprintf(gsArgs,"-q -g%dx%d -r%dx%d -sDEVICE=ppmraw "
12
+                    "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -dNOSAFER %s.ps",
13
                     gx,gy,(int)(scaleFactor*72),(int)(scaleFactor*72),
14
                     formBase.data(),formBase.data()
15
              );
(-)files/patch-vhdlparser_CMakeLists.txt (-6 / +3 lines)
Lines 1-11 Link Here
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

Return to bug 242347