Attachment #107372 for bug #148156

View | Details | Raw Unified | Return to bug 148156
Collapse All | Expand All

Lines 6-13 Link Here

(-)/kirby/shared/ports/doxygen/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= doxygen	8	PORTNAME= doxygen
9	PORTVERSION= 1.6.3	9	PORTVERSION= 1.7.1
10	PORTREVISION= 1
11	CATEGORIES= devel	10	CATEGORIES= devel
12	MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \	11	MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \
13	http://ftp.stack.nl/pub/users/dimitri/	12	http://ftp.stack.nl/pub/users/dimitri/

Lines 1-3 Link Here

(-)/kirby/shared/ports/doxygen/distinfo (-3 / +3 lines)
1	MD5 (doxygen-1.6.3.src.tar.gz) = 2d6ea20a9d850d94321cee78bab7bb87	1	MD5 (doxygen-1.7.1.src.tar.gz) = 13e76e10fb55581a16ee04de35c264f0
2	SHA256 (doxygen-1.6.3.src.tar.gz) = a3a6524b5fc1da084fd0e081507c99240abaffff85f76ef7b15c9fb3ae248492	2	SHA256 (doxygen-1.7.1.src.tar.gz) = 4b866f3b194970d7e0768944255d89b0a1aae7bf337f5ae3e4b8358da349da31
3	SIZE (doxygen-1.6.3.src.tar.gz) = 3986440	3	SIZE (doxygen-1.7.1.src.tar.gz) = 4116363

Lines 1-11 Link Here

(-)/kirby/shared/ports/doxygen/files/patch-addon-doxywizard-Makefile.in (-4 / +4 lines)
1	--- addon/doxywizard/Makefile.in.orig 2009-07-13 16:09:03.000000000 -0400	1	--- addon/doxywizard/Makefile.in.orig 2010-05-23 10:51:31.000000000 -0400
2	+++ addon/doxywizard/Makefile.in 2009-08-21 00:47:10.000000000 -0400	2	+++ addon/doxywizard/Makefile.in 2010-06-15 07:44:44.000000000 -0400
3	@@ -10,7 +10,7 @@	3	@@ -10,7 +10,7 @@
4	# See the GNU General Public License for more details.	4	# See the GNU General Public License for more details.
5	#	5	#
6		6
7	-QMAKE=qmake	7	-QMAKE=qmake $(MKSPECS)
8	+QMAKE=qmake-qt4	8	+QMAKE=qmake-qt4 $(MKSPECS)
9		9
10	all: Makefile.doxywizard	10	all: Makefile.doxywizard
11	$(MAKE) -f Makefile.doxywizard	11	$(MAKE) -f Makefile.doxywizard




--- configure.orig	2010-06-25 05:46:38.000000000 -0400
+++ configure	2010-06-25 18:22:03.000000000 -0400
@@ -269,7 +269,7 @@
     echo "  QTDIR environment variable not set!"
     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

     echo "check the Qt installation instructions!"
     exit 2
   fi
@@ -576,7 +576,7 @@
 fi
 if test "$f_wizard" = YES; then
   cat >> .tmakeconfig <<EOF

 EOF
 fi
 
@@ -586,7 +586,7 @@
 EOF
 fi
 

 
 for i in $f_inmakefiles ; do
      SRC=$i
@@ -603,7 +603,6 @@
        echo "" >> $DST
        echo "all: src/version.cpp " >> $DST
        echo "	\$(MAKE) -C qtools" >> $DST

        echo "	\$(MAKE) -C src" >> $DST
        if test $f_wizard = YES; then
          echo "	\$(MAKE) -C addon/doxywizard" >> $DST
@@ -626,7 +625,7 @@
      echo "  Created $DST from $SRC..."
 done
 




	-mi

diff -ruN src/definition.cpp src/definition.cpp
--- 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>

 #include <md5.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -362,13 +363,11 @@
 
 bool Definition::_docsAlreadyAdded(const QCString &doc)
 {

   {
     m_impl->docSignatures+=":"+sigStr;
diff -ruN src/dirdef.cpp src/dirdef.cpp
--- 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"
@@ -75,10 +76,8 @@
   QCString result;
 
   // convert to md5 hash

 
   // old algorithm
diff -ruN src/dot.cpp src/dot.cpp
--- 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 "ftextstream.h"
+#include <sys/types.h>
 #include <md5.h>
 #include <qqueue.h>

@@ -1569,10 +1570,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(absMapName))
@@ -2227,10 +2226,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();
@@ -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	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 -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 .

 TARGET                     =  doxygen
 unix:TARGETDEPS            =  ../lib/libdoxygen.a ../lib/libdoxycfg.a
diff -ruN src/memberdef.cpp src/memberdef.cpp
--- 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"
 #include "membername.h"
@@ -2556,10 +2557,8 @@
   memAnchor.prepend(definition());
   
   // convert to md5 hash

 }
 
diff -ruN src/membergroup.cpp src/membergroup.cpp
--- 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

 }
 
diff -ruN src/util.cpp src/util.cpp
--- 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>

 #include <md5.h>
 
 #include "qtbc.h"
@@ -4886,16 +4887,16 @@
     if (resultLen>=128) // prevent names that cannot be created!
     {
       // third algorithm based on MD5 hash

 
 #if MAP_ALGO==ALGO_COUNT 
     // old algorithm, has the problem that after regeneration the
@@ -4926,12 +4927,13 @@
     l2Dir = (dirNum>>4)&0xff;
 #elif MAP_ALGO==ALGO_MD5
     // third algorithm based on MD5 hash

Return to bug 148156

Lines 1-9 Link Here

(-)/kirby/shared/ports/doxygen/files/patch-configure (-7 / +7 lines)
1	--- configure.orig 2009-08-20 08:15:07.000000000 -0400	1	--- configure.orig 2010-06-25 05:46:38.000000000 -0400
2	+++ configure 2009-08-21 00:50:54.000000000 -0400	2	+++ configure 2010-06-25 18:22:03.000000000 -0400
3	@@ -269,7 +269,7 @@	3	@@ -269,7 +269,7 @@
4	echo " QTDIR environment variable not set!"	4	echo " QTDIR environment variable not set!"
5	echo -n " Checking for Qt..."	5	echo -n " Checking for Qt..."
6	for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do	6	for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
7	- if test -x "$d/bin/qmake"; then	7	- if test -x "$d/bin/qmake"; then
8	+ if test -x "$d/bin/qmake-qt4"; then	8	+ if test -x "$d/bin/qmake-qt4"; then
9	QTDIR=$d	9	QTDIR=$d
Lines 18-24 Link Here
18	echo "check the Qt installation instructions!"	18	echo "check the Qt installation instructions!"
19	exit 2	19	exit 2
20	fi	20	fi
21	@@ -565,7 +565,7 @@	21	@@ -576,7 +576,7 @@
22	fi	22	fi
23	if test "$f_wizard" = YES; then	23	if test "$f_wizard" = YES; then
24	cat >> .tmakeconfig <<EOF	24	cat >> .tmakeconfig <<EOF
Lines 27-33 Link Here
27	EOF	27	EOF
28	fi	28	fi
29		29
30	@@ -575,7 +575,7 @@	30	@@ -586,7 +586,7 @@
31	EOF	31	EOF
32	fi	32	fi
33		33
Lines 36-42 Link Here
36		36
37	for i in $f_inmakefiles ; do	37	for i in $f_inmakefiles ; do
38	SRC=$i	38	SRC=$i
39	@@ -592,7 +592,6 @@	39	@@ -603,7 +603,6 @@
40	echo "" >> $DST	40	echo "" >> $DST
41	echo "all: src/version.cpp " >> $DST	41	echo "all: src/version.cpp " >> $DST
42	echo " \$(MAKE) -C qtools" >> $DST	42	echo " \$(MAKE) -C qtools" >> $DST
Lines 44-50 Link Here
44	echo " \$(MAKE) -C src" >> $DST	44	echo " \$(MAKE) -C src" >> $DST
45	if test $f_wizard = YES; then	45	if test $f_wizard = YES; then
46	echo " \$(MAKE) -C addon/doxywizard" >> $DST	46	echo " \$(MAKE) -C addon/doxywizard" >> $DST
47	@@ -615,7 +614,7 @@	47	@@ -626,7 +625,7 @@
48	echo " Created $DST from $SRC..."	48	echo " Created $DST from $SRC..."
49	done	49	done
50		50

Lines 4-11 Link Here

(-)/kirby/shared/ports/doxygen/files/patch-md5 (-38 / +74 lines)
4	-mi	4	-mi
5		5
6	diff -ruN src/definition.cpp src/definition.cpp	6	diff -ruN src/definition.cpp src/definition.cpp
7	--- src/definition.cpp.orig 2009-12-08 14:19:28.000000000 -0500	7	--- src/definition.cpp.orig 2010-06-10 07:50:15.000000000 -0400
8	+++ src/definition.cpp 2009-12-31 11:52:30.000000000 -0500	8	+++ src/definition.cpp 2010-06-15 07:52:03.000000000 -0400
9	@@ -18,6 +18,7 @@	9	@@ -18,6 +18,7 @@
10	#include "qtbc.h"	10	#include "qtbc.h"
11	#include <ctype.h>	11	#include <ctype.h>
Lines 14-20 Link Here
14	#include <md5.h>	14	#include <md5.h>
15	#include <stdio.h>	15	#include <stdio.h>
16	#include <stdlib.h>	16	#include <stdlib.h>
17	@@ -364,13 +365,11 @@	17	@@ -362,13 +363,11 @@
18		18
19	bool Definition::_docsAlreadyAdded(const QCString &doc)	19	bool Definition::_docsAlreadyAdded(const QCString &doc)
20	{	20	{
Lines 30-43 Link Here
30	{	30	{
31	m_impl->docSignatures+=":"+sigStr;	31	m_impl->docSignatures+=":"+sigStr;
32	diff -ruN src/dirdef.cpp src/dirdef.cpp	32	diff -ruN src/dirdef.cpp src/dirdef.cpp
33	--- src/dirdef.cpp.orig 2009-10-04 15:15:11.000000000 -0400	33	--- src/dirdef.cpp.orig 2010-04-30 06:45:25.000000000 -0400
34	+++ src/dirdef.cpp 2009-12-31 11:55:59.000000000 -0500	34	+++ src/dirdef.cpp 2010-06-15 07:55:03.000000000 -0400
35	@@ -1,3 +1,4 @@	35	@@ -1,3 +1,4 @@
36	+#include <sys/types.h>	36	+#include <sys/types.h>
37	#include <md5.h>	37	#include <md5.h>
38		38
39	#include "dirdef.h"	39	#include "dirdef.h"
40	@@ -74,10 +75,8 @@	40	@@ -75,10 +76,8 @@
41	QCString result;	41	QCString result;
42		42
43	// convert to md5 hash	43	// convert to md5 hash
Lines 50-104 Link Here
50		50
51	// old algorithm	51	// old algorithm
52	diff -ruN src/dot.cpp src/dot.cpp	52	diff -ruN src/dot.cpp src/dot.cpp
53	--- src/dot.cpp.orig 2009-10-10 06:50:28.000000000 -0400	53	--- src/dot.cpp.orig 2010-06-11 08:03:22.000000000 -0400
54	+++ src/dot.cpp 2009-12-31 11:57:49.000000000 -0500	54	+++ src/dot.cpp 2010-06-15 08:12:47.000000000 -0400
55	@@ -39,6 +39,7 @@	55	@@ -39,6 +39,7 @@
56	#include <qdir.h>	56	#include <qdir.h>
57	#include <qfile.h>	57	#include <qfile.h>
58	#include <qtextstream.h>	58	#include "ftextstream.h"
59	+#include <sys/types.h>	59	+#include <sys/types.h>
60	#include <md5.h>	60	#include <md5.h>
61		61	#include <qqueue.h>
62	#define MAP_CMD "cmapx"	62
63	@@ -1144,10 +1145,8 @@	63	@@ -1569,10 +1570,8 @@
64	}	64	}
65	writeGraphFooter(md5stream);	65	writeGraphFooter(md5stream);
66	resetReNumbering();	66	resetReNumbering();
67	- uchar md5_sig[16];	67	- uchar md5_sig[16];
68	QCString sigStr(33);	68	QCString sigStr(33);
69	- MD5Buffer((const unsigned char *)theGraph.ascii(),theGraph.length(),md5_sig);	69	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
70	- MD5SigToString(md5_sig,sigStr.data(),33);	70	- MD5SigToString(md5_sig,sigStr.data(),33);
71	+ MD5Data((const unsigned char *)theGraph.ascii(),theGraph.length(),sigStr.data());	71	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
72	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|	72	bool regenerate=FALSE;
73	!QFileInfo(absMapName).exists())	73	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|
74	{	74	!checkDeliverables(absMapName))
75	@@ -1805,10 +1804,8 @@	75	@@ -2227,10 +2226,8 @@
76	}	76	}
77	}	77	}
78	writeGraphFooter(md5stream);	78	writeGraphFooter(md5stream);
79	- uchar md5_sig[16];	79	- uchar md5_sig[16];
80	QCString sigStr(33);	80	QCString sigStr(33);
81	- MD5Buffer((const unsigned char *)buf.ascii(),buf.length(),md5_sig);	81	- MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig);
82	- MD5SigToString(md5_sig,sigStr.data(),33);	82	- MD5SigToString(md5_sig,sigStr.data(),33);
83	+ MD5Data((const unsigned char *)buf.ascii(),buf.length(),sigStr.data());	83	+ MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.data());
84	if (reNumber)	84	if (reNumber)
85	{	85	{
86	resetReNumbering();	86	resetReNumbering();
		87	@@ -3023,10 +3020,8 @@
		88	QGString theGraph;
		89	FTextStream md5stream(&theGraph);
		90	m_dir->writeDepGraph(md5stream);
		91	- uchar md5_sig[16];
		92	QCString sigStr(33);
		93	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
		94	- MD5SigToString(md5_sig,sigStr.data(),33);
		95	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
		96	bool regenerate=FALSE;
		97	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|
		98	!checkDeliverables(format==BITMAP ? absImgName :
		99	@@ -3135,10 +3130,8 @@
		100	md5stream << " Node18 -> Node9 [dir=back,color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";
		101	md5stream << " Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";
		102	writeGraphFooter(md5stream);
		103	- uchar md5_sig[16];
		104	QCString sigStr(33);
		105	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
		106	- MD5SigToString(md5_sig,sigStr.data(),33);
		107	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
		108	QCString absBaseName = (QCString)path+"/graph_legend";
		109	QCString absDotName = absBaseName+".dot";
		110	QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
		111	@@ -3501,10 +3494,8 @@
		112
		113	writeGraphFooter(md5stream);
		114	resetReNumbering();
		115	- uchar md5_sig[16];
		116	QCString sigStr(33);
		117	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
		118	- MD5SigToString(md5_sig,sigStr.data(),33);
		119	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
		120	QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
		121	QCString baseName = m_diskName;
		122	QCString imgName = baseName+"."+imgExt;
87	diff -ruN src/doxygen.pro.in src/doxygen.pro.in	123	diff -ruN src/doxygen.pro.in src/doxygen.pro.in
88	--- src/doxygen.pro.in.orig 2009-08-02 09:55:02.000000000 -0400	124	--- src/doxygen.pro.in.orig 2010-05-08 04:57:08.000000000 -0400
89	+++ src/doxygen.pro.in 2009-12-31 11:58:49.000000000 -0500	125	+++ src/doxygen.pro.in 2010-06-15 07:58:47.000000000 -0400
90	@@ -18,7 +18,7 @@	126	@@ -18,7 +18,7 @@
91	CONFIG = console warn_on $extraopts	127	CONFIG = console warn_on $extraopts
92	HEADERS = doxygen.h	128	HEADERS = doxygen.h
93	SOURCES = main.cpp	129	SOURCES = main.cpp
94	-unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5	130	-unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread
95	+unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd	131	+unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd -lpthread
96	win32:INCLUDEPATH += .	132	win32:INCLUDEPATH += .
97	win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5	133	win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread
98	win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib	134	win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib
99	@@ -28,7 +28,7 @@	135	@@ -28,7 +28,7 @@
100	win32:TMAKE_CXXFLAGS += -DQT_NODLL	136	win32:TMAKE_CXXFLAGS += -DQT_NODLL
101	win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -liconv	137	win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -liconv -lpthread
102	win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti	138	win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
103	-INCLUDEPATH += ../qtools ../libmd5 .	139	-INCLUDEPATH += ../qtools ../libmd5 .
104	+INCLUDEPATH += ../qtools .	140	+INCLUDEPATH += ../qtools .
Lines 106-122 Link Here
106	TARGET = doxygen	142	TARGET = doxygen
107	unix:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a	143	unix:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a
108	diff -ruN src/memberdef.cpp src/memberdef.cpp	144	diff -ruN src/memberdef.cpp src/memberdef.cpp
109	--- src/memberdef.cpp.orig 2009-11-21 17:58:04.000000000 -0500	145	--- src/memberdef.cpp.orig 2010-05-13 06:11:21.000000000 -0400
110	+++ src/memberdef.cpp 2009-12-31 12:00:03.000000000 -0500	146	+++ src/memberdef.cpp 2010-06-15 08:00:50.000000000 -0400
111	@@ -17,6 +17,7 @@	147	@@ -18,6 +18,7 @@
112
113	#include <stdio.h>	148	#include <stdio.h>
114	#include <qregexp.h>	149	#include <qregexp.h>
115	+#include <sys/types.h>
116	#include <assert.h>	150	#include <assert.h>
		151	+#include <sys/types.h>
117	#include <md5.h>	152	#include <md5.h>
118	#include "memberdef.h"	153	#include "memberdef.h"
119	@@ -2516,10 +2517,8 @@	154	#include "membername.h"
		155	@@ -2556,10 +2557,8 @@
120	memAnchor.prepend(definition());	156	memAnchor.prepend(definition());
121		157
122	// convert to md5 hash	158	// convert to md5 hash
Lines 129-136 Link Here
129	}	165	}
130		166
131	diff -ruN src/membergroup.cpp src/membergroup.cpp	167	diff -ruN src/membergroup.cpp src/membergroup.cpp
132	--- src/membergroup.cpp.orig 2009-12-22 06:35:39.000000000 -0500	168	--- src/membergroup.cpp.orig 2010-01-01 06:52:59.000000000 -0500
133	+++ src/membergroup.cpp 2009-12-31 12:01:18.000000000 -0500	169	+++ src/membergroup.cpp 2010-06-15 08:02:18.000000000 -0400
134	@@ -261,10 +261,8 @@	170	@@ -261,10 +261,8 @@
135		171
136	QCString MemberGroup::anchor() const	172	QCString MemberGroup::anchor() const
Lines 144-151 Link Here
144	}	180	}
145		181
146	diff -ruN src/util.cpp src/util.cpp	182	diff -ruN src/util.cpp src/util.cpp
147	--- src/util.cpp.orig 2009-12-28 06:00:55.000000000 -0500	183	--- src/util.cpp.orig 2010-06-14 05:15:31.000000000 -0400
148	+++ src/util.cpp 2009-12-31 12:03:47.000000000 -0500	184	+++ src/util.cpp 2010-06-15 08:06:41.000000000 -0400
149	@@ -19,6 +19,7 @@	185	@@ -19,6 +19,7 @@
150	#include <ctype.h>	186	#include <ctype.h>
151	#include <errno.h>	187	#include <errno.h>
Lines 154-160 Link Here
154	#include <md5.h>	190	#include <md5.h>
155		191
156	#include "qtbc.h"	192	#include "qtbc.h"
157	@@ -4844,16 +4845,16 @@	193	@@ -4886,16 +4887,16 @@
158	if (resultLen>=128) // prevent names that cannot be created!	194	if (resultLen>=128) // prevent names that cannot be created!
159	{	195	{
160	// third algorithm based on MD5 hash	196	// third algorithm based on MD5 hash
Lines 174-180 Link Here
174		210
175	#if MAP_ALGO==ALGO_COUNT	211	#if MAP_ALGO==ALGO_COUNT
176	// old algorithm, has the problem that after regeneration the	212	// old algorithm, has the problem that after regeneration the
177	@@ -4884,12 +4885,13 @@	213	@@ -4926,12 +4927,13 @@
178	l2Dir = (dirNum>>4)&0xff;	214	l2Dir = (dirNum>>4)&0xff;
179	#elif MAP_ALGO==ALGO_MD5	215	#elif MAP_ALGO==ALGO_MD5
180	// third algorithm based on MD5 hash	216	// third algorithm based on MD5 hash