From cd2c922f9791212a3f7b494566e3dc3b2148a31a Mon Sep 17 00:00:00 2001 From: ziggi Date: Mon, 25 May 2020 06:39:25 +0000 Subject: [PATCH] add devel/doxygen/files/ --- devel/doxygen/files/patch-CMakeLists.txt | 10 +++ .../files/patch-doc-doxygen_manual.tex | 11 +++ devel/doxygen/files/patch-doc_CMakeLists.txt | 11 +++ devel/doxygen/files/patch-md5-Doxyfile | 12 ++++ devel/doxygen/files/patch-md5-definition | 25 +++++++ devel/doxygen/files/patch-md5-dirdef | 19 +++++ devel/doxygen/files/patch-md5-dot | 70 +++++++++++++++++++ devel/doxygen/files/patch-md5-memberdef | 23 ++++++ devel/doxygen/files/patch-md5-membergroup | 24 +++++++ devel/doxygen/files/patch-md5-util | 48 +++++++++++++ .../doxygen/files/patch-qtools_CMakeLists.txt | 8 +++ devel/doxygen/files/patch-src_CMakeLists.txt | 21 ++++++ devel/doxygen/files/patch-src_formula.cpp | 15 ++++ 13 files changed, 297 insertions(+) create mode 100644 devel/doxygen/files/patch-CMakeLists.txt create mode 100644 devel/doxygen/files/patch-doc-doxygen_manual.tex create mode 100644 devel/doxygen/files/patch-doc_CMakeLists.txt create mode 100644 devel/doxygen/files/patch-md5-Doxyfile create mode 100644 devel/doxygen/files/patch-md5-definition create mode 100644 devel/doxygen/files/patch-md5-dirdef create mode 100644 devel/doxygen/files/patch-md5-dot create mode 100644 devel/doxygen/files/patch-md5-memberdef create mode 100644 devel/doxygen/files/patch-md5-membergroup create mode 100644 devel/doxygen/files/patch-md5-util create mode 100644 devel/doxygen/files/patch-qtools_CMakeLists.txt create mode 100644 devel/doxygen/files/patch-src_CMakeLists.txt create mode 100644 devel/doxygen/files/patch-src_formula.cpp diff --git a/devel/doxygen/files/patch-CMakeLists.txt b/devel/doxygen/files/patch-CMakeLists.txt new file mode 100644 index 00000000..8a4ce792 --- /dev/null +++ b/devel/doxygen/files/patch-CMakeLists.txt @@ -0,0 +1,10 @@ +--- CMakeLists.txt.orig 2015-06-16 17:42:32 UTC ++++ CMakeLists.txt +@@ -122,7 +122,6 @@ if (win_static) + endif() + + +-add_subdirectory(libmd5) + add_subdirectory(qtools) + add_subdirectory(vhdlparser) + add_subdirectory(src) diff --git a/devel/doxygen/files/patch-doc-doxygen_manual.tex b/devel/doxygen/files/patch-doc-doxygen_manual.tex new file mode 100644 index 00000000..63db7009 --- /dev/null +++ b/devel/doxygen/files/patch-doc-doxygen_manual.tex @@ -0,0 +1,11 @@ +--- doc/doxygen_manual.tex.orig 2015-02-28 15:26:54 UTC ++++ doc/doxygen_manual.tex +@@ -13,7 +13,7 @@ + % input used in their production; they are not affected by this license. + + \documentclass{book} +-\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_CMakeLists.txt b/devel/doxygen/files/patch-doc_CMakeLists.txt new file mode 100644 index 00000000..7e8cc1d8 --- /dev/null +++ b/devel/doxygen/files/patch-doc_CMakeLists.txt @@ -0,0 +1,11 @@ +--- doc/CMakeLists.txt.orig 2017-10-31 19:36:00 UTC ++++ doc/CMakeLists.txt +@@ -168,7 +168,7 @@ install(FILES + "${PROJECT_BINARY_DIR}/man/doxywizard.1" + "${PROJECT_BINARY_DIR}/man/doxysearch.1" + "${PROJECT_BINARY_DIR}/man/doxyindexer.1" +- DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 ++ DESTINATION man/man1 + ) + + install(FILES diff --git a/devel/doxygen/files/patch-md5-Doxyfile b/devel/doxygen/files/patch-md5-Doxyfile new file mode 100644 index 00000000..3a07d0e3 --- /dev/null +++ b/devel/doxygen/files/patch-md5-Doxyfile @@ -0,0 +1,12 @@ +--- Doxyfile.orig 2014-08-14 17:46:42 UTC ++++ Doxyfile +@@ -261,8 +261,7 @@ + MACRO_EXPANSION = YES + EXPAND_ONLY_PREDEF = YES + SEARCH_INCLUDES = YES +-INCLUDE_PATH = qtools \ +- libmd5 ++INCLUDE_PATH = qtools + INCLUDE_FILE_PATTERNS = + PREDEFINED = + EXPAND_AS_DEFINED = diff --git a/devel/doxygen/files/patch-md5-definition b/devel/doxygen/files/patch-md5-definition new file mode 100644 index 00000000..6e085edb --- /dev/null +++ b/devel/doxygen/files/patch-md5-definition @@ -0,0 +1,25 @@ +--- src/definition.cpp.orig 2015-01-03 22:38:57 UTC ++++ src/definition.cpp +@@ -17,6 +17,7 @@ + + #include + #include ++#include + #include "md5.h" + #include + #include +@@ -537,13 +538,11 @@ void Definition::writeDocAnchorsToTagFil + + bool Definition::_docsAlreadyAdded(const QCString &doc,QCString &sigList) + { +- uchar md5_sig[16]; + QCString sigStr(33); + // to avoid mismatches due to differences in indenting, we first remove + // double whitespaces... + QCString docStr = doc.simplifyWhiteSpace(); +- MD5Buffer((const unsigned char *)docStr.data(),docStr.length(),md5_sig); +- MD5SigToString(md5_sig,sigStr.rawData(),33); ++ MD5Data((const unsigned char *)docStr.data(),docStr.length(),sigStr.rawData()); + //printf("%s:_docsAlreadyAdded doc='%s' sig='%s' docSigs='%s'\n", + // name().data(),doc.data(),sigStr.data(),sigList.data()); + if (sigList.find(sigStr)==-1) // new docs, add signature to prevent re-adding it diff --git a/devel/doxygen/files/patch-md5-dirdef b/devel/doxygen/files/patch-md5-dirdef new file mode 100644 index 00000000..26661181 --- /dev/null +++ b/devel/doxygen/files/patch-md5-dirdef @@ -0,0 +1,19 @@ +--- src/dirdef.cpp.orig 2015-01-03 22:38:57 UTC ++++ src/dirdef.cpp +@@ -1,3 +1,4 @@ ++#include + #include "md5.h" + + #include "dirdef.h" +@@ -81,10 +82,8 @@ void DirDef::addFile(FileDef *fd) + static QCString encodeDirName(const QCString &anchor) + { + // convert to md5 hash +- uchar md5_sig[16]; + QCString sigStr(33); +- MD5Buffer((const unsigned char *)anchor.data(),anchor.length(),md5_sig); +- MD5SigToString(md5_sig,sigStr.rawData(),33); ++ MD5Data((const unsigned char *)anchor.data(),anchor.length(),sigStr.rawData()); + return sigStr; + + // old algorithm diff --git a/devel/doxygen/files/patch-md5-dot b/devel/doxygen/files/patch-md5-dot new file mode 100644 index 00000000..b98d4e01 --- /dev/null +++ b/devel/doxygen/files/patch-md5-dot @@ -0,0 +1,70 @@ +--- 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 + #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; diff --git a/devel/doxygen/files/patch-md5-memberdef b/devel/doxygen/files/patch-md5-memberdef new file mode 100644 index 00000000..2ebb2828 --- /dev/null +++ b/devel/doxygen/files/patch-md5-memberdef @@ -0,0 +1,23 @@ +--- src/memberdef.cpp.orig 2015-01-03 22:38:57 UTC ++++ src/memberdef.cpp +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + #include "md5.h" + #include "memberdef.h" + #include "membername.h" +@@ -3326,11 +3327,9 @@ void MemberDef::setAnchor() + } + + // convert to md5 hash +- uchar md5_sig[16]; + QCString sigStr(33); +- MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig); + //printf("memAnchor=%s\n",memAnchor.data()); +- MD5SigToString(md5_sig,sigStr.rawData(),33); ++ MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.rawData()); + m_impl->anc = "a"+sigStr; + } + diff --git a/devel/doxygen/files/patch-md5-membergroup b/devel/doxygen/files/patch-md5-membergroup new file mode 100644 index 00000000..3947df3c --- /dev/null +++ b/devel/doxygen/files/patch-md5-membergroup @@ -0,0 +1,24 @@ +--- src/membergroup.cpp.orig 2015-01-03 22:38:57 UTC ++++ src/membergroup.cpp +@@ -28,6 +28,7 @@ + #include "docparser.h" + #include "marshal.h" + #include "entry.h" ++#include + #include "md5.h" + + //static QCString idToName(int id) +@@ -307,12 +308,10 @@ void MemberGroup::setInGroup(bool b) + + QCString MemberGroup::anchor() const + { +- uchar md5_sig[16]; + QCString sigStr(33); + QCString locHeader = grpHeader; + if (locHeader.isEmpty()) locHeader="[NOHEADER]"; +- MD5Buffer((const unsigned char *)locHeader.data(),locHeader.length(),md5_sig); +- MD5SigToString(md5_sig,sigStr.rawData(),33); ++ MD5Data((const unsigned char *)locHeader.data(),locHeader.length(),sigStr.rawData()); + return "amgrp"+sigStr; + } + diff --git a/devel/doxygen/files/patch-md5-util b/devel/doxygen/files/patch-md5-util new file mode 100644 index 00000000..e9c962a5 --- /dev/null +++ b/devel/doxygen/files/patch-md5-util @@ -0,0 +1,48 @@ +--- src/util.cpp.orig 2015-01-03 22:45:44 UTC ++++ src/util.cpp +@@ -19,6 +19,7 @@ + #include + #include + ++#include + #include "md5.h" + + #include +@@ -5335,16 +5336,16 @@ QCString convertNameToFile(const char *n + if (resultLen>=128) // prevent names that cannot be created! + { + // third algorithm based on MD5 hash +- uchar md5_sig[16]; + QCString sigStr(33); +- MD5Buffer((const unsigned char *)result.data(),resultLen,md5_sig); +- MD5SigToString(md5_sig,sigStr.rawData(),33); ++ MD5Data((const unsigned char *)result.data(),resultLen,sigStr.rawData()); + result=result.left(128-32)+sigStr; + } + } + if (createSubdirs) + { ++#if MAP_ALGO==ALGO_COUNT || MAP_ALGO==ALGO_CRC16 + int l1Dir=0,l2Dir=0; ++#endif + + #if MAP_ALGO==ALGO_COUNT + // old algorithm, has the problem that after regeneration the +@@ -5375,12 +5376,13 @@ QCString convertNameToFile(const char *n + l2Dir = (dirNum>>4)&0xff; + #elif MAP_ALGO==ALGO_MD5 + // third algorithm based on MD5 hash +- uchar md5_sig[16]; +- MD5Buffer((const unsigned char *)result.data(),result.length(),md5_sig); +- l1Dir = md5_sig[14]&0xf; +- l2Dir = md5_sig[15]; ++ char md5[33]; ++ MD5Data((const unsigned char *)result.data(),result.length(),md5); ++ result.prepend(QCString().sprintf("d%c/d%c%c/",md5[29],md5[30],md5[31])); + #endif ++#if MAP_ALGO==ALGO_COUNT || MAP_ALGO==ALGO_CRC16 + result.prepend(QCString().sprintf("d%x/d%02x/",l1Dir,l2Dir)); ++#endif + } + //printf("*** convertNameToFile(%s)->%s\n",name,result.data()); + return result; diff --git a/devel/doxygen/files/patch-qtools_CMakeLists.txt b/devel/doxygen/files/patch-qtools_CMakeLists.txt new file mode 100644 index 00000000..ab7b826b --- /dev/null +++ b/devel/doxygen/files/patch-qtools_CMakeLists.txt @@ -0,0 +1,8 @@ +--- qtools/CMakeLists.txt.orig 2015-05-31 19:01:12 UTC ++++ qtools/CMakeLists.txt +@@ -1,4 +1,4 @@ +-include_directories(.) ++include_directories(BEFORE .) + + list(APPEND qtools_src + qbuffer.cpp diff --git a/devel/doxygen/files/patch-src_CMakeLists.txt b/devel/doxygen/files/patch-src_CMakeLists.txt new file mode 100644 index 00000000..90099e5f --- /dev/null +++ b/devel/doxygen/files/patch-src_CMakeLists.txt @@ -0,0 +1,21 @@ +--- src/CMakeLists.txt.orig 2015-05-31 19:01:12 UTC ++++ src/CMakeLists.txt +@@ -1,8 +1,7 @@ + # vim:ts=4:sw=4:expandtab:autoindent: + +-include_directories( ++include_directories(BEFORE + ${CMAKE_SOURCE_DIR}/qtools +- ${CMAKE_SOURCE_DIR}/libmd5 + ${CMAKE_SOURCE_DIR}/vhdlparser/ + ${CMAKE_SOURCE_DIR}/src + ${CLANG_INCLUDEDIR} +@@ -229,7 +228,7 @@ target_link_libraries(doxygen + _doxygen + doxycfg + qtools +- md5 ++ md + vhdlparser + ${SQLITE3_LIBRARIES} + ${ICONV_LIBRARIES} diff --git a/devel/doxygen/files/patch-src_formula.cpp b/devel/doxygen/files/patch-src_formula.cpp new file mode 100644 index 00000000..0020c203 --- /dev/null +++ b/devel/doxygen/files/patch-src_formula.cpp @@ -0,0 +1,15 @@ +Upstream git commit 03daff4 resolving a problem with Ghostscript 9.50. + +--- src/formula.cpp ++++ src/formula.cpp +@@ -193,8 +193,8 @@ void FormulaList::generateBitmaps(const char *path) + // used. + + char gsArgs[4096]; +- sprintf(gsArgs,"-q -g%dx%d -r%dx%dx -sDEVICE=ppmraw " +- "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -- %s.ps", ++ sprintf(gsArgs,"-q -g%dx%d -r%dx%d -sDEVICE=ppmraw " ++ "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -dNOSAFER %s.ps", + gx,gy,(int)(scaleFactor*72),(int)(scaleFactor*72), + formBase.data(),formBase.data() + );