diff options
Diffstat (limited to 'devel/doxygen/files/patch-md5')
-rw-r--r-- | devel/doxygen/files/patch-md5 | 112 |
1 files changed, 74 insertions, 38 deletions
diff --git a/devel/doxygen/files/patch-md5 b/devel/doxygen/files/patch-md5 index 44e0d676f3d0..a3a763e85f07 100644 --- a/devel/doxygen/files/patch-md5 +++ b/devel/doxygen/files/patch-md5 @@ -4,8 +4,8 @@ implementation. Try to trim this insanity, where we can... -mi diff -ruN src/definition.cpp src/definition.cpp ---- src/definition.cpp.orig 2009-12-08 14:19:28.000000000 -0500 -+++ src/definition.cpp 2009-12-31 11:52:30.000000000 -0500 +--- src/definition.cpp.orig 2010-06-10 07:50:15.000000000 -0400 ++++ src/definition.cpp 2010-06-15 07:52:03.000000000 -0400 @@ -18,6 +18,7 @@ #include "qtbc.h" #include <ctype.h> @@ -14,7 +14,7 @@ diff -ruN src/definition.cpp src/definition.cpp #include <md5.h> #include <stdio.h> #include <stdlib.h> -@@ -364,13 +365,11 @@ +@@ -362,13 +363,11 @@ bool Definition::_docsAlreadyAdded(const QCString &doc) { @@ -30,14 +30,14 @@ diff -ruN src/definition.cpp src/definition.cpp { m_impl->docSignatures+=":"+sigStr; diff -ruN src/dirdef.cpp src/dirdef.cpp ---- src/dirdef.cpp.orig 2009-10-04 15:15:11.000000000 -0400 -+++ src/dirdef.cpp 2009-12-31 11:55:59.000000000 -0500 +--- src/dirdef.cpp.orig 2010-04-30 06:45:25.000000000 -0400 ++++ src/dirdef.cpp 2010-06-15 07:55:03.000000000 -0400 @@ -1,3 +1,4 @@ +#include <sys/types.h> #include <md5.h> #include "dirdef.h" -@@ -74,10 +75,8 @@ +@@ -75,10 +76,8 @@ QCString result; // convert to md5 hash @@ -50,55 +50,91 @@ diff -ruN src/dirdef.cpp src/dirdef.cpp // old algorithm diff -ruN src/dot.cpp src/dot.cpp ---- src/dot.cpp.orig 2009-10-10 06:50:28.000000000 -0400 -+++ src/dot.cpp 2009-12-31 11:57:49.000000000 -0500 +--- src/dot.cpp.orig 2010-06-11 08:03:22.000000000 -0400 ++++ src/dot.cpp 2010-06-15 08:12:47.000000000 -0400 @@ -39,6 +39,7 @@ #include <qdir.h> #include <qfile.h> - #include <qtextstream.h> + #include "ftextstream.h" +#include <sys/types.h> #include <md5.h> - - #define MAP_CMD "cmapx" -@@ -1144,10 +1145,8 @@ + #include <qqueue.h> + +@@ -1569,10 +1570,8 @@ } writeGraphFooter(md5stream); resetReNumbering(); - uchar md5_sig[16]; QCString sigStr(33); -- MD5Buffer((const unsigned char *)theGraph.ascii(),theGraph.length(),md5_sig); +- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); - MD5SigToString(md5_sig,sigStr.data(),33); -+ MD5Data((const unsigned char *)theGraph.ascii(),theGraph.length(),sigStr.data()); - if (checkAndUpdateMd5Signature(absBaseName,sigStr) || - !QFileInfo(absMapName).exists()) - { -@@ -1805,10 +1804,8 @@ ++ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data()); + bool regenerate=FALSE; + if (checkAndUpdateMd5Signature(absBaseName,sigStr) || + !checkDeliverables(absMapName)) +@@ -2227,10 +2226,8 @@ } } writeGraphFooter(md5stream); - uchar md5_sig[16]; QCString sigStr(33); -- MD5Buffer((const unsigned char *)buf.ascii(),buf.length(),md5_sig); +- MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig); - MD5SigToString(md5_sig,sigStr.data(),33); -+ MD5Data((const unsigned char *)buf.ascii(),buf.length(),sigStr.data()); ++ MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.data()); if (reNumber) { resetReNumbering(); +@@ -3023,10 +3020,8 @@ + QGString theGraph; + FTextStream md5stream(&theGraph); + m_dir->writeDepGraph(md5stream); +- uchar md5_sig[16]; + QCString sigStr(33); +- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); +- MD5SigToString(md5_sig,sigStr.data(),33); ++ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data()); + bool regenerate=FALSE; + if (checkAndUpdateMd5Signature(absBaseName,sigStr) || + !checkDeliverables(format==BITMAP ? absImgName : +@@ -3135,10 +3130,8 @@ + 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.data(),33); ++ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data()); + QCString absBaseName = (QCString)path+"/graph_legend"; + QCString absDotName = absBaseName+".dot"; + QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); +@@ -3501,10 +3494,8 @@ + + writeGraphFooter(md5stream); + resetReNumbering(); +- uchar md5_sig[16]; + QCString sigStr(33); +- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); +- MD5SigToString(md5_sig,sigStr.data(),33); ++ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data()); + QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString baseName = m_diskName; + QCString imgName = baseName+"."+imgExt; diff -ruN src/doxygen.pro.in src/doxygen.pro.in ---- src/doxygen.pro.in.orig 2009-08-02 09:55:02.000000000 -0400 -+++ src/doxygen.pro.in 2009-12-31 11:58:49.000000000 -0500 +--- src/doxygen.pro.in.orig 2010-05-08 04:57:08.000000000 -0400 ++++ src/doxygen.pro.in 2010-06-15 07:58:47.000000000 -0400 @@ -18,7 +18,7 @@ CONFIG = console warn_on $extraopts HEADERS = doxygen.h SOURCES = main.cpp --unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -+unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd +-unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread ++unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd -lpthread win32:INCLUDEPATH += . - win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 + win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib @@ -28,7 +28,7 @@ win32:TMAKE_CXXFLAGS += -DQT_NODLL - win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -liconv + win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -liconv -lpthread win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti -INCLUDEPATH += ../qtools ../libmd5 . +INCLUDEPATH += ../qtools . @@ -106,17 +142,17 @@ diff -ruN src/doxygen.pro.in src/doxygen.pro.in TARGET = doxygen unix:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a diff -ruN src/memberdef.cpp src/memberdef.cpp ---- src/memberdef.cpp.orig 2009-11-21 17:58:04.000000000 -0500 -+++ src/memberdef.cpp 2009-12-31 12:00:03.000000000 -0500 -@@ -17,6 +17,7 @@ - +--- src/memberdef.cpp.orig 2010-05-13 06:11:21.000000000 -0400 ++++ src/memberdef.cpp 2010-06-15 08:00:50.000000000 -0400 +@@ -18,6 +18,7 @@ #include <stdio.h> #include <qregexp.h> -+#include <sys/types.h> #include <assert.h> ++#include <sys/types.h> #include <md5.h> #include "memberdef.h" -@@ -2516,10 +2517,8 @@ + #include "membername.h" +@@ -2556,10 +2557,8 @@ memAnchor.prepend(definition()); // convert to md5 hash @@ -129,8 +165,8 @@ diff -ruN src/memberdef.cpp src/memberdef.cpp } diff -ruN src/membergroup.cpp src/membergroup.cpp ---- src/membergroup.cpp.orig 2009-12-22 06:35:39.000000000 -0500 -+++ src/membergroup.cpp 2009-12-31 12:01:18.000000000 -0500 +--- src/membergroup.cpp.orig 2010-01-01 06:52:59.000000000 -0500 ++++ src/membergroup.cpp 2010-06-15 08:02:18.000000000 -0400 @@ -261,10 +261,8 @@ QCString MemberGroup::anchor() const @@ -144,8 +180,8 @@ diff -ruN src/membergroup.cpp src/membergroup.cpp } diff -ruN src/util.cpp src/util.cpp ---- src/util.cpp.orig 2009-12-28 06:00:55.000000000 -0500 -+++ src/util.cpp 2009-12-31 12:03:47.000000000 -0500 +--- src/util.cpp.orig 2010-06-14 05:15:31.000000000 -0400 ++++ src/util.cpp 2010-06-15 08:06:41.000000000 -0400 @@ -19,6 +19,7 @@ #include <ctype.h> #include <errno.h> @@ -154,7 +190,7 @@ diff -ruN src/util.cpp src/util.cpp #include <md5.h> #include "qtbc.h" -@@ -4844,16 +4845,16 @@ +@@ -4886,16 +4887,16 @@ if (resultLen>=128) // prevent names that cannot be created! { // third algorithm based on MD5 hash @@ -174,7 +210,7 @@ diff -ruN src/util.cpp src/util.cpp #if MAP_ALGO==ALGO_COUNT // old algorithm, has the problem that after regeneration the -@@ -4884,12 +4885,13 @@ +@@ -4926,12 +4927,13 @@ l2Dir = (dirNum>>4)&0xff; #elif MAP_ALGO==ALGO_MD5 // third algorithm based on MD5 hash |