From owner-svn-ports-all@FreeBSD.ORG Mon Jun 16 07:54:43 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09E31EFA; Mon, 16 Jun 2014 07:54:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E97ED22AB; Mon, 16 Jun 2014 07:54:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5G7sg2I051370; Mon, 16 Jun 2014 07:54:42 GMT (envelope-from pi@svn.freebsd.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5G7sf1U051362; Mon, 16 Jun 2014 07:54:41 GMT (envelope-from pi@svn.freebsd.org) Message-Id: <201406160754.s5G7sf1U051362@svn.freebsd.org> From: Kurt Jaeger Date: Mon, 16 Jun 2014 07:54:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357956 - in head/devel/doxygen: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jun 2014 07:54:43 -0000 Author: pi Date: Mon Jun 16 07:54:40 2014 New Revision: 357956 URL: http://svnweb.freebsd.org/changeset/ports/357956 QAT: https://qat.redports.org/buildarchive/r357956/ Log: revert to doxygen 1.8.3.1 for now Added: head/devel/doxygen/files/patch-ah - copied unchanged from r357751, head/devel/doxygen/files/patch-ah head/devel/doxygen/files/patch-examples-Makefile.in - copied unchanged from r357751, head/devel/doxygen/files/patch-examples-Makefile.in head/devel/doxygen/files/patch-md5 - copied unchanged from r357751, head/devel/doxygen/files/patch-md5 head/devel/doxygen/files/patch-warnings - copied unchanged from r357751, head/devel/doxygen/files/patch-warnings Deleted: head/devel/doxygen/files/patch-Makefile.in head/devel/doxygen/files/patch-latex head/devel/doxygen/files/patch-md5-Doxyfile head/devel/doxygen/files/patch-md5-definition head/devel/doxygen/files/patch-md5-dirdef head/devel/doxygen/files/patch-md5-dot head/devel/doxygen/files/patch-md5-doxygen.pro.in head/devel/doxygen/files/patch-md5-memberdef head/devel/doxygen/files/patch-md5-membergroup head/devel/doxygen/files/patch-md5-util head/devel/doxygen/files/patch-refman Modified: head/devel/doxygen/Makefile head/devel/doxygen/distinfo head/devel/doxygen/files/patch-addon-doxywizard-Makefile.in head/devel/doxygen/files/patch-configure Modified: head/devel/doxygen/Makefile ============================================================================== --- head/devel/doxygen/Makefile Mon Jun 16 07:42:21 2014 (r357955) +++ head/devel/doxygen/Makefile Mon Jun 16 07:54:40 2014 (r357956) @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= doxygen -PORTVERSION= 1.8.7 +PORTVERSION= 1.8.3.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \ http://ftp.stack.nl/pub/users/dimitri/ @@ -14,18 +15,15 @@ COMMENT= Documentation system for C, C++ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= tmake:${PORTSDIR}/devel/tmake \ - flex>0:${PORTSDIR}/textproc/flex \ - python:${PORTSDIR}/lang/python -LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png +BUILD_DEPENDS= tmake:${PORTSDIR}/devel/tmake +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USES= bison iconv perl5 gmake ALL_TARGET= all HAS_CONFIGURE= yes -MAKE_JOBS_UNSAFE= yes QT_NONSTANDARD= yes # non-standard configure arguments CONFIGURE_ARGS= --prefix ${PREFIX} --perl ${PERL} --make ${GMAKE} \ - --install "${INSTALL}" --flex ${LOCALBASE}/bin/flex + --install "${INSTALL}" REINPLACE_ARGS= -i '' EXTRACT_AFTER_ARGS= --exclude '*/libmd5' \ Modified: head/devel/doxygen/distinfo ============================================================================== --- head/devel/doxygen/distinfo Mon Jun 16 07:42:21 2014 (r357955) +++ head/devel/doxygen/distinfo Mon Jun 16 07:54:40 2014 (r357956) @@ -1,2 +1,2 @@ -SHA256 (doxygen-1.8.7.src.tar.gz) = c6eac6b6e82148ae15ec5aecee4631547359f284af1ce94474d046ebca6ee3d9 -SIZE (doxygen-1.8.7.src.tar.gz) = 4796875 +SHA256 (doxygen-1.8.3.1.src.tar.gz) = 0c749f68101b6c04ccb0d9696dd37836a6ba62cd8002add275058a975ee72b55 +SIZE (doxygen-1.8.3.1.src.tar.gz) = 6196887 Modified: head/devel/doxygen/files/patch-addon-doxywizard-Makefile.in ============================================================================== --- head/devel/doxygen/files/patch-addon-doxywizard-Makefile.in Mon Jun 16 07:42:21 2014 (r357955) +++ head/devel/doxygen/files/patch-addon-doxywizard-Makefile.in Mon Jun 16 07:54:40 2014 (r357956) @@ -1,11 +1,11 @@ ---- addon/doxywizard/Makefile.in-orig 2014-06-13 23:29:16.000000000 +0200 -+++ addon/doxywizard/Makefile.in 2014-06-13 23:28:50.000000000 +0200 +--- addon/doxywizard/Makefile.in.orig 2010-05-23 10:51:31.000000000 -0400 ++++ addon/doxywizard/Makefile.in 2010-06-15 07:44:44.000000000 -0400 @@ -10,7 +10,7 @@ # See the GNU General Public License for more details. # --QMAKE=$(QTDIR)/bin/qmake $(MKSPECS) -+QMAKE=$(QTDIR)/bin/qmake-qt4 $(MKSPECS) - INCBUFSIZE=$(PYTHON) ../../src/increasebuffer.py +-QMAKE=qmake $(MKSPECS) ++QMAKE=qmake-qt4 $(MKSPECS) all: Makefile.doxywizard + $(MAKE) -f Makefile.doxywizard Copied: head/devel/doxygen/files/patch-ah (from r357751, head/devel/doxygen/files/patch-ah) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/doxygen/files/patch-ah Mon Jun 16 07:54:40 2014 (r357956, copy of r357751, head/devel/doxygen/files/patch-ah) @@ -0,0 +1,21 @@ +--- doc/doxygen_manual.tex.orig 2012-02-11 18:34:00.000000000 -0500 ++++ doc/doxygen_manual.tex 2012-03-04 13:56:33.000000000 -0500 +@@ -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} +@@ -28,8 +28,7 @@ + \usepackage{alltt} + \usepackage{ifpdf} + \ifpdf +-\usepackage[pdftex, +- pagebackref=true, ++\usepackage[pagebackref=true, + colorlinks=true, + linkcolor=blue, + unicode Modified: head/devel/doxygen/files/patch-configure ============================================================================== --- head/devel/doxygen/files/patch-configure Mon Jun 16 07:42:21 2014 (r357955) +++ head/devel/doxygen/files/patch-configure Mon Jun 16 07:54:40 2014 (r357956) @@ -1,28 +1,15 @@ ---- configure.orig 2014-04-20 17:17:29.000000000 +0200 -+++ configure 2014-06-13 23:25:23.000000000 +0200 -@@ -363,25 +363,25 @@ +--- configure.orig 2012-12-27 06:24:51.000000000 -0500 ++++ configure 2012-12-28 12:12:33.000000000 -0500 +@@ -281,7 +281,7 @@ echo " QTDIR environment variable not set!" - printf " Checking for Qt..." + echo -n " Checking for Qt..." for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do - if test -x "$d/bin/qmake"; then + if test -x "$d/bin/qmake-qt4"; then QTDIR=$d - break 2 fi done - else -- if test -e "$QTDIR/bin/qmake"; then -+ if test -e "$QTDIR/bin/qmake-qt4"; then - printf " Detected Qt via the QTDIR environment variable..." - else - printf "ERROR Detected Qt via the QTDIR environment variable..." -- echo ", but $QTDIR/bin/qmake does not exist." -- echo " Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists." -+ echo ", but $QTDIR/bin/qmake-qt4 does not exist." -+ echo " Set the QTDIR environment variable such that \$QTDIR/bin/qmake-qt4 exists." - exit 2 - fi - fi +@@ -292,7 +292,7 @@ if test -z "$QTDIR"; then echo "QTDIR not set and Qt not found at standard locations!" echo @@ -31,7 +18,7 @@ echo "check the Qt installation instructions!" exit 2 fi -@@ -848,7 +848,7 @@ +@@ -604,7 +604,7 @@ fi if test "$f_wizard" = YES; then cat >> .tmakeconfig <> $DST +@@ -645,7 +645,6 @@ + fi + echo "all: src/version.cpp $EXTRADEPS" >> $DST echo " \$(MAKE) -C qtools" >> $DST - echo " \$(MAKE) -C libmd5" >> $DST echo " \$(MAKE) -C src" >> $DST if test $f_wizard = YES; then echo " \$(MAKE) MAN1DIR=\$(MAN1DIR) -C addon/doxywizard" >> $DST -@@ -921,7 +920,7 @@ - cat src/libdoxycfg.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxycfg.t - cat src/libdoxygen.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxygen.t +@@ -678,7 +677,7 @@ + cat src/libdoxycfg.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" > src/libdoxycfg.t + cat src/libdoxygen.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" > src/libdoxygen.t -f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in" +f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in" Copied: head/devel/doxygen/files/patch-examples-Makefile.in (from r357751, head/devel/doxygen/files/patch-examples-Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/doxygen/files/patch-examples-Makefile.in Mon Jun 16 07:54:40 2014 (r357956, copy of r357751, head/devel/doxygen/files/patch-examples-Makefile.in) @@ -0,0 +1,16 @@ +Disables tests to avoid hang on stable/9 and head. + +Temporary fix until correct solution is found. + + +Index: examples/Makefile.in +@@ -124,7 +124,7 @@ + # $(DOXYGEN)/bin/doxygen dbusxml.cfg + + diagrams/html/index.html: diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg +-ifneq ($(HAVE_DOT),) +- $(DOXYGEN)/bin/doxygen diagrams.cfg +-endif ++#ifneq ($(HAVE_DOT),) ++# $(DOXYGEN)/bin/doxygen diagrams.cfg ++#endif Copied: head/devel/doxygen/files/patch-md5 (from r357751, head/devel/doxygen/files/patch-md5) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/doxygen/files/patch-md5 Mon Jun 16 07:54:40 2014 (r357956, copy of r357751, head/devel/doxygen/files/patch-md5) @@ -0,0 +1,221 @@ +--- src/definition.cpp.orig 2011-08-19 15:34:17.000000000 +0800 ++++ src/definition.cpp 2011-10-31 17:32:47.870380518 +0800 +@@ -18,6 +18,7 @@ + #include "qtbc.h" + #include + #include ++#include + #include "md5.h" + #include + #include +@@ -361,13 +362,11 @@ + + bool Definition::_docsAlreadyAdded(const QCString &doc) + { +- 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.data(),33); ++ MD5Data((const unsigned char *)docStr.data(),docStr.length(),sigStr.data()); + if (m_impl->docSignatures.find(sigStr)==-1) // new docs, add signature to prevent re-adding it + { + m_impl->docSignatures+=":"+sigStr; +--- src/dirdef.cpp.orig 2011-07-26 19:54:31.000000000 +0800 ++++ src/dirdef.cpp 2011-10-31 17:32:47.872380214 +0800 +@@ -1,3 +1,4 @@ ++#include + #include "md5.h" + + #include "dirdef.h" +@@ -75,10 +76,8 @@ + QCString result; + + // 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.data(),33); ++ MD5Data((const unsigned char *)anchor.data(),anchor.length(),sigStr.data()); + return sigStr; + + // old algorithm +--- src/dot.cpp.orig 2011-08-09 02:06:19.000000000 +0800 ++++ src/dot.cpp 2011-10-31 17:32:47.877389789 +0800 +@@ -39,6 +39,7 @@ + #include + #include + #include "ftextstream.h" ++#include + #include "md5.h" + #include + +@@ -2063,10 +2064,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()); + bool regenerate=FALSE; + if (checkAndUpdateMd5Signature(absBaseName,sigStr) || + !checkDeliverables(absImgName,absMapName)) +@@ -2758,10 +2757,8 @@ + } + } + writeGraphFooter(md5stream); +- uchar md5_sig[16]; + QCString sigStr(33); +- MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig); +- MD5SigToString(md5_sig,sigStr.data(),33); ++ MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.data()); + if (reNumber) + { + resetReNumbering(); +@@ -3609,10 +3606,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 : +@@ -3739,10 +3734,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"); +@@ -4139,10 +4132,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; +--- src/doxygen.pro.in.orig 2011-01-04 04:14:46.000000000 +0800 ++++ src/doxygen.pro.in 2011-10-31 17:32:47.879381383 +0800 +@@ -18,7 +18,7 @@ + CONFIG = console warn_on $extraopts + HEADERS = doxygen.h + SOURCES = main.cpp +-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 -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 -lpthread + win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti +-INCLUDEPATH += ../qtools ../libmd5 . ++INCLUDEPATH += ../qtools . + DESTDIR = ../bin + TARGET = doxygen + unix:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a +--- src/memberdef.cpp.orig 2011-08-18 22:46:40.000000000 +0800 ++++ src/memberdef.cpp 2011-10-31 17:35:14.027187598 +0800 +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include "md5.h" + #include "memberdef.h" + #include "membername.h" +@@ -2771,11 +2772,9 @@ + } + + // convert to md5 hash +- uchar md5_sig[16]; + QCString sigStr(33); +- MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig); ++ MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.data()); + //printf("memAnchor=%s\n",memAnchor.data()); +- MD5SigToString(md5_sig,sigStr.data(),33); + m_impl->anc = "a"+sigStr; + } + +--- src/membergroup.cpp.orig 2011-04-22 18:08:07.000000000 +0800 ++++ src/membergroup.cpp 2011-10-31 17:32:47.886381993 +0800 +@@ -265,12 +265,10 @@ + + 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.data(),33); ++ MD5Data((const unsigned char *)locHeader.data(),locHeader.length(),sigStr.data()); + return "amgrp"+sigStr; + } + +--- src/util.cpp.orig 2011-08-19 23:11:12.000000000 +0800 ++++ src/util.cpp 2011-10-31 17:32:47.892382197 +0800 +@@ -20,6 +20,7 @@ + #include + #include + ++#include + #include "md5.h" + + #include "qtbc.h" +@@ -4901,16 +4902,16 @@ + 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.data(),33); ++ MD5Data((const unsigned char *)result.data(),resultLen,sigStr.data()); + 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 +@@ -4941,12 +4942,13 @@ + 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; Copied: head/devel/doxygen/files/patch-warnings (from r357751, head/devel/doxygen/files/patch-warnings) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/doxygen/files/patch-warnings Mon Jun 16 07:54:40 2014 (r357956, copy of r357751, head/devel/doxygen/files/patch-warnings) @@ -0,0 +1,15 @@ +--- qtools/qgdict.cpp Wed Apr 13 15:51:44 2005 ++++ qtools/qgdict.cpp Wed Jun 14 01:43:49 2006 +@@ -41,4 +41,5 @@ + #include "qdatastream.h" + #include ++#include + + // NOT REVISED +@@ -1005,5 +1006,5 @@ + case PtrKey: + { +- Q_UINT32 k; ++ uintptr_t k; + s >> k; + read( s, d );