diff options
author | 2013-01-12 18:49:53 +0100 | |
---|---|---|
committer | 2013-01-12 18:49:53 +0100 | |
commit | 5e541879abdbb36c4532db55b3615bc40042d1b6 (patch) | |
tree | a93b629e8d40c5b1ede0334bf8a80319742c529d /app-doc/doxygen/files | |
parent | Added local ebuilds from Aug 2007 - Feb 2012 (diff) | |
download | AstroFloyd-5e541879abdbb36c4532db55b3615bc40042d1b6.tar.gz AstroFloyd-5e541879abdbb36c4532db55b3615bc40042d1b6.tar.bz2 AstroFloyd-5e541879abdbb36c4532db55b3615bc40042d1b6.zip |
Added all files to git repo
Diffstat (limited to 'app-doc/doxygen/files')
-rw-r--r-- | app-doc/doxygen/files/bsd-configure.patch | 16 | ||||
-rw-r--r-- | app-doc/doxygen/files/doxygen-1.4.3-cp1251.patch | 35 | ||||
-rw-r--r-- | app-doc/doxygen/files/doxygen-1.4.3-nls.patch | 15 | ||||
-rw-r--r-- | app-doc/doxygen/files/doxygen-1.4.4-darwin.patch | 18 | ||||
-rw-r--r-- | app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff | 203 | ||||
-rw-r--r-- | app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch | 11 | ||||
-rw-r--r-- | app-doc/doxygen/files/doxygen-1.5-system-libpng.patch | 105 | ||||
-rw-r--r-- | app-doc/doxygen/files/doxygen-1.5.7.1-substitute.patch | 24 | ||||
-rw-r--r-- | app-doc/doxygen/files/doxygen-1.5.8-fortran.patch | 105 | ||||
-rw-r--r-- | app-doc/doxygen/files/doxygen-1.5.8-kdedocs.patch | 32 | ||||
-rw-r--r-- | app-doc/doxygen/files/doxygen-gcc4.patch | 11 | ||||
-rw-r--r-- | app-doc/doxygen/files/doxywizard.png | bin | 0 -> 4231 bytes |
12 files changed, 575 insertions, 0 deletions
diff --git a/app-doc/doxygen/files/bsd-configure.patch b/app-doc/doxygen/files/bsd-configure.patch new file mode 100644 index 0000000..fce643f --- /dev/null +++ b/app-doc/doxygen/files/bsd-configure.patch @@ -0,0 +1,16 @@ +--- doxygen-1.4.1/configure.orig Fri Feb 18 23:13:20 2005 ++++ doxygen-1.4.1/configure Fri Feb 18 23:13:37 2005 +@@ -305,11 +305,11 @@ + for i in $install_names; do + for j in $install_dirs; do + if test -x "$j/$i"; then +- if test -n "`$j/$i --version 2>/dev/null | grep utils`"; then ++ #if test -n "`$j/$i --version 2>/dev/null | grep utils`"; then + install_found=YES + install_prog="$j/$i" + break 2 +- fi ++ #fi + fi + done + done diff --git a/app-doc/doxygen/files/doxygen-1.4.3-cp1251.patch b/app-doc/doxygen/files/doxygen-1.4.3-cp1251.patch new file mode 100644 index 0000000..0ffed14 --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.4.3-cp1251.patch @@ -0,0 +1,35 @@ +--- qtools/qtextcodec.cpp.orig 2003-12-14 14:00:57.000000000 -0800 ++++ qtools/qtextcodec.cpp 2005-05-29 19:13:17.000000000 -0700 +@@ -1321,7 +1321,7 @@ + + + +-#ifndef QT_NO_CODECS ++// #ifndef QT_NO_CODECS + + class QSimpleTextCodec: public QTextCodec + { +@@ -1948,7 +1948,7 @@ + } + + +-#endif // QT_NO_CODECS ++// #endif // QT_NO_CODECS + + class QLatin1Codec: public QTextCodec + { +@@ -2048,12 +2048,13 @@ + { + (void)new QLatin1Codec; + +-#ifndef QT_NO_CODECS ++ + int i = 0; + do { + (void)new QSimpleTextCodec( i ); + } while( unicodevalues[i++].mib != LAST_MIB ); + ++#ifndef QT_NO_CODECS + (void)new QEucJpCodec; + (void)new QSjisCodec; + (void)new QJisCodec; diff --git a/app-doc/doxygen/files/doxygen-1.4.3-nls.patch b/app-doc/doxygen/files/doxygen-1.4.3-nls.patch new file mode 100644 index 0000000..9c863da --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.4.3-nls.patch @@ -0,0 +1,15 @@ +--- Makefile.in.old 2005-06-10 12:23:32.000000000 +0900 ++++ Makefile.in 2005-06-10 12:23:52.000000000 +0900 +@@ -53,9 +53,9 @@ + $(INSTTOOL) -m 755 bin/doxygen $(INSTALL)/bin + $(INSTTOOL) -m 755 bin/doxytag $(INSTALL)/bin + $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR) +- cat doc/doxygen.1 | sed -e "s/DATE/\$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > $(INSTALL)/$(MAN1DIR)/doxygen.1 ; \ +- cat doc/doxytag.1 | sed -e "s/DATE/\$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > $(INSTALL)/$(MAN1DIR)/doxytag.1 ; \ +- cat doc/doxywizard.1 | sed -e "s/DATE/\$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > $(INSTALL)/$(MAN1DIR)/doxywizard.1 ; ++ cat doc/doxygen.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > $(INSTALL)/$(MAN1DIR)/doxygen.1 ; \ ++ cat doc/doxytag.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > $(INSTALL)/$(MAN1DIR)/doxytag.1 ; \ ++ cat doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > $(INSTALL)/$(MAN1DIR)/doxywizard.1 ; + + install_docs: + $(INSTTOOL) -d $(DOCDIR) diff --git a/app-doc/doxygen/files/doxygen-1.4.4-darwin.patch b/app-doc/doxygen/files/doxygen-1.4.4-darwin.patch new file mode 100644 index 0000000..8df74b8 --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.4.4-darwin.patch @@ -0,0 +1,18 @@ +--- doxygen-1.4.4/tmake/lib/macosx-c++/tmake.conf.orig 2005-10-08 18:06:08.000000000 +0200 ++++ doxygen-1.4.4/tmake/lib/macosx-c++/tmake.conf 2005-10-08 18:17:33.000000000 +0200 +@@ -36,13 +36,12 @@ + + TMAKE_LINK = c++ + TMAKE_LINK_SHLIB = c++ +-TMAKE_LFLAGS = ++TMAKE_LFLAGS = -Wl,-search_paths_first + TMAKE_LFLAGS_RELEASE = + TMAKE_LFLAGS_DEBUG = + TMAKE_LFLAGS_SHLIB = -shared + +-# soname does not work on fbsd 2.x +-#TMAKE_LFLAGS_SONAME = -Wl,-soname ++TMAKE_LFLAGS_SONAME = -dynamiclib -install_name + + TMAKE_LIBS = + TMAKE_LIBS_X11 = diff --git a/app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff b/app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff new file mode 100644 index 0000000..2ceb262 --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff @@ -0,0 +1,203 @@ +--- qtools/qtextcodec.cpp.orig 2003-12-14 14:00:57.000000000 -0800 ++++ qtools/qtextcodec.cpp 2005-05-29 19:13:17.000000000 -0700 +@@ -1321,7 +1321,7 @@ + + + +-#ifndef QT_NO_CODECS ++// #ifndef QT_NO_CODECS + + class QSimpleTextCodec: public QTextCodec + { +@@ -1948,7 +1948,7 @@ + } + + +-#endif // QT_NO_CODECS ++// #endif // QT_NO_CODECS + + class QLatin1Codec: public QTextCodec + { +@@ -2048,12 +2048,13 @@ + { + (void)new QLatin1Codec; + +-#ifndef QT_NO_CODECS ++ + int i = 0; + do { + (void)new QSimpleTextCodec( i ); + } while( unicodevalues[i++].mib != LAST_MIB ); + ++#ifndef QT_NO_CODECS + (void)new QEucJpCodec; + (void)new QSjisCodec; + (void)new QJisCodec; +--- doxygen-1.4.6.orig/debian/patches/system-libpng.dpatch ++++ doxygen-1.4.6/debian/patches/system-libpng.dpatch +@@ -0,0 +1,121 @@ ++#! /bin/sh -e ++ ++# DP: Use the system libpng library ++ ++dir= ++if [ $# -eq 3 -a "$2" = '-d' ]; then ++ pdir="-d $3" ++ dir="$3/" ++elif [ $# -ne 1 ]; then ++ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]" ++ exit 1 ++fi ++case "$1" in ++ -patch) ++ patch $pdir -f --no-backup-if-mismatch -p1 < $0 ++ ;; ++ -unpatch) ++ patch $pdir -f --no-backup-if-mismatch -R -p1 < $0 ++ ;; ++ *) ++ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]" ++ exit 1 ++esac ++exit 0 ++ ++diff -u ./src/pngenc.cpp.orig ./src/pngenc.cpp ++--- ./src/pngenc.cpp.orig 2004-01-06 04:40:25.000000000 +0100 +++++ ./src/pngenc.cpp 2004-09-21 09:04:40.000000000 +0200 ++@@ -25,7 +25,7 @@ ++ #endif ++ ++ #define ALL_STATIC ++-#include <../libpng/png.h> +++#include <png.h> ++ #include <stdio.h> ++ #include <stdlib.h> ++ #include <string.h> ++diff -u ./Makefile.in.orig ./Makefile.in ++--- ./Makefile.in.orig 2003-11-13 04:40:21.000000000 +0100 +++++ ./Makefile.in 2004-09-21 09:04:40.000000000 +0200 ++@@ -7,7 +7,6 @@ ++ cd doc ; $(MAKE) clean ++ cd qtools ; $(MAKE) clean ++ cd src ; $(MAKE) clean ++- cd libpng ; $(MAKE) clean ++ cd libmd5 ; $(MAKE) clean ++ cd addon/doxywizard ; $(MAKE) clean ++ cd addon/doxmlparser/src ; $(MAKE) clean ++@@ -18,7 +17,6 @@ ++ ++ distclean: clean ++ cd src ; $(MAKE) distclean ++- cd libpng ; $(MAKE) distclean ++ cd libmd5 ; $(MAKE) distclean ++ cd addon/doxywizard ; $(MAKE) distclean ++ cd addon/doxmlparser/src ; $(MAKE) distclean ++@@ -31,11 +29,10 @@ ++ -rm -f objects/*.o ++ -rm -f src/Makefile.doxygen src/Makefile.libdoxygen ++ -rm -f src/Makefile.doxytag src/Makefile.libdoxycfg ++- -rm -f libpng/Makefile.libpng ++ -rm -f libmd5/Makefile.libmd5 ++ -rm -f Makefile qtools/Makefile src/Makefile examples/Makefile doc/Makefile ++ -rm -f .makeconfig .tmakeconfig ++- -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libpng/libpng.pro libmd5/libmd5.pro +++ -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro ++ -rm -f src/version.cpp ++ -rm -r addon/doxywizard/Makefile ++ -rm -f addon/doxywizard/Makefile.doxywizard ++diff -u ./configure.orig ./configure ++--- ./configure.orig 2004-09-14 04:40:12.000000000 +0200 +++++ ./configure 2004-09-21 09:09:06.000000000 +0200 ++@@ -457,7 +457,7 @@ ++ EOF ++ fi ++ ++-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in" +++f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in" ++ ++ for i in $f_inmakefiles ; do ++ SRC=$i ++@@ -474,7 +474,6 @@ ++ echo "" >> $DST ++ echo "all: src/version.cpp " >> $DST ++ echo " \$(MAKE) -C qtools" >> $DST ++- echo " \$(MAKE) -C libpng" >> $DST ++ echo " \$(MAKE) -C libmd5" >> $DST ++ echo " \$(MAKE) -C src" >> $DST ++ if test $f_wizard = YES; then ++@@ -491,7 +490,7 @@ ++ echo " Created $DST from $SRC..." ++ done ++ ++-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.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 libpng/libpng.pro.in libmd5/libmd5.pro.in" +++f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.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" ++ ++ for i in $f_inprofiles ; do ++ SRC=$i ++diff -u ./src/doxygen.pro.in.orig ./src/doxygen.pro.in ++--- ./src/doxygen.pro.in.orig 2004-05-18 04:40:13.000000000 +0200 +++++ ./src/doxygen.pro.in 2004-09-21 09:58:06.000000000 +0200 ++@@ -28,7 +28,7 @@ ++ win32:TMAKE_CXXFLAGS += -DQT_NODLL ++ win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 ++ win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti ++-INCLUDEPATH += ../qtools ../libpng ../libmd5 . +++INCLUDEPATH += ../qtools ../libmd5 . ++ #win32-g++:INCLUDEPATH -= ../libpng ++ DESTDIR = ../bin ++ TARGET = doxygen ++diff -u ./src/libdoxygen.pro.in.orig ./src/libdoxygen.pro.in ++--- ./src/libdoxygen.pro.in.orig 2004-08-25 04:40:18.000000000 +0200 +++++ ./src/libdoxygen.pro.in 2004-09-21 09:58:55.000000000 +0200 ++@@ -189,7 +189,6 @@ ++ win32-msvc:TMAKE_CXXFLAGS += -Zm200 ++ win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti ++ INCLUDEPATH += ../qtools ++-INCLUDEPATH += ../libpng ++ INCLUDEPATH += ../libmd5 ++ win32:INCLUDEPATH += . ++ win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5 +--- doxygen-1.4.6.orig/debian/patches/qstring-gcc40.dpatch ++++ doxygen-1.4.6/debian/patches/qstring-gcc40.dpatch +@@ -0,0 +1,41 @@ ++#! /bin/sh -e ++ ++# DP: Remove unused code that does not build with gcc 4.0 (#338099). ++ ++dir= ++if [ $# -eq 3 -a "$2" = '-d' ]; then ++ pdir="-d $3" ++ dir="$3/" ++elif [ $# -ne 1 ]; then ++ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]" ++ exit 1 ++fi ++case "$1" in ++ -patch) ++ patch $pdir -f --no-backup-if-mismatch -p0 < $0 ++ ;; ++ -unpatch) ++ patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 ++ ;; ++ *) ++ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]" ++ exit 1 ++esac ++exit 0 ++ ++--- qtools/qstring.h.orig 2004-12-01 19:26:16.000000000 +0000 +++++ qtools/qstring.h 2005-12-04 20:09:01.000000000 +0000 ++@@ -163,8 +163,13 @@ ++ bool isLetterOrNumber() const; ++ bool isDigit() const; ++ +++ // the non-const ::cell and ::row cannot be compiled with gcc 4.0 on ARM, +++ // so they have been removed; the methods are not needed for doxygen +++#if 0 ++ uchar& cell() { return cl; } ++ uchar& row() { return rw; } +++#endif +++ ++ uchar cell() const { return cl; } ++ uchar row() const { return rw; } ++ diff --git a/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch b/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch new file mode 100644 index 0000000..34aaef4 --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch @@ -0,0 +1,11 @@ +--- configure.orig 2008-02-15 18:40:57.000000000 -0800 ++++ configure 2008-02-15 19:06:13.000000000 -0800 +@@ -276,6 +276,8 @@ + echo "QTDIR is set to $QTDIR, but library directory $QTDIR/lib does not exist!" + exit 2 + fi ++ fi ++ if test -d "$QTDIR/lib64"; then + LIBDIR=lib64 + fi + if test ! -d "$QTDIR/include"; then diff --git a/app-doc/doxygen/files/doxygen-1.5-system-libpng.patch b/app-doc/doxygen/files/doxygen-1.5-system-libpng.patch new file mode 100644 index 0000000..dbd95b8 --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.5-system-libpng.patch @@ -0,0 +1,105 @@ +diff -ur doxygen-1.5.1/configure doxygen-fixed/configure +--- doxygen-1.5.1/configure 2006-11-01 22:52:27.711364356 +0200 ++++ doxygen-fixed/configure 2006-11-01 22:54:09.086952924 +0200 +@@ -525,7 +525,7 @@ + EOF + fi + +-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in" ++f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in" + + for i in $f_inmakefiles ; do + SRC=$i +@@ -542,7 +542,6 @@ + echo "" >> $DST + echo "all: src/version.cpp " >> $DST + echo " \$(MAKE) -C qtools" >> $DST +- echo " \$(MAKE) -C libpng" >> $DST + echo " \$(MAKE) -C libmd5" >> $DST + echo " \$(MAKE) -C src" >> $DST + if test $f_wizard = YES; then +@@ -562,7 +561,7 @@ + echo " Created $DST from $SRC..." + done + +-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.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 libpng/libpng.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in" ++f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.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" + + for i in $f_inprofiles ; do + SRC=$i +diff -ur doxygen-1.5.1/Makefile.in doxygen-fixed/Makefile.in +--- doxygen-1.5.1/Makefile.in 2006-11-01 22:52:31.257825212 +0200 ++++ doxygen-fixed/Makefile.in 2006-11-01 22:53:44.182738940 +0200 +@@ -7,7 +7,6 @@ + cd doc ; $(MAKE) clean + cd qtools ; $(MAKE) clean + cd src ; $(MAKE) clean +- cd libpng ; $(MAKE) clean + cd libmd5 ; $(MAKE) clean + cd addon/doxywizard ; $(MAKE) clean + cd addon/doxmlparser/src ; $(MAKE) clean +@@ -18,7 +17,6 @@ + + distclean: clean + cd src ; $(MAKE) distclean +- cd libpng ; $(MAKE) distclean + cd libmd5 ; $(MAKE) distclean + cd addon/doxywizard ; $(MAKE) distclean + cd addon/doxmlparser/src ; $(MAKE) distclean +@@ -32,11 +30,10 @@ + -rm -f objects/*.o + -rm -f src/Makefile.doxygen src/Makefile.libdoxygen + -rm -f src/Makefile.doxytag src/Makefile.libdoxycfg +- -rm -f libpng/Makefile.libpng + -rm -f libmd5/Makefile.libmd5 + -rm -f Makefile qtools/Makefile src/Makefile examples/Makefile doc/Makefile + -rm -f .makeconfig .tmakeconfig +- -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libpng/libpng.pro libmd5/libmd5.pro ++ -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro + -rm -f src/version.cpp + -rm -r addon/doxywizard/Makefile + -rm -f addon/doxywizard/Makefile.doxywizard +@@ -81,7 +78,7 @@ + pdf: docs + cd latex ; $(MAKE) + +-DISTFILES = Doxyfile libpng libmd5 addon tmake doc wintools examples bin lib objects \ ++DISTFILES = Doxyfile libmd5 addon tmake doc wintools examples bin lib objects \ + qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \ + Makefile.win_make.in INSTALL make.bat LANGUAGE.HOWTO LICENSE PLATFORMS \ + VERSION packages winbuild +diff -ur doxygen-1.5.1/src/doxygen.pro.in doxygen-fixed/src/doxygen.pro.in +--- doxygen-1.5.1/src/doxygen.pro.in 2006-11-01 22:52:32.611619404 +0200 ++++ doxygen-fixed/src/doxygen.pro.in 2006-11-01 22:54:39.508328172 +0200 +@@ -28,7 +28,7 @@ + win32:TMAKE_CXXFLAGS += -DQT_NODLL + win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 + win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti +-INCLUDEPATH += ../qtools ../libpng ../libmd5 . ++INCLUDEPATH += ../qtools ../libmd5 . + #win32-g++:INCLUDEPATH -= ../libpng + DESTDIR = ../bin + TARGET = doxygen +diff -ur doxygen-1.5.1/src/libdoxygen.pro.in doxygen-fixed/src/libdoxygen.pro.in +--- doxygen-1.5.1/src/libdoxygen.pro.in 2006-11-01 22:52:33.704453268 +0200 ++++ doxygen-fixed/src/libdoxygen.pro.in 2006-11-01 22:54:50.479660276 +0200 +@@ -207,7 +207,6 @@ + win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti + linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti + INCLUDEPATH += ../qtools +-INCLUDEPATH += ../libpng + INCLUDEPATH += ../libmd5 + win32:INCLUDEPATH += . + win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5 +diff -ur doxygen-1.5.1/src/pngenc.cpp doxygen-fixed/src/pngenc.cpp +--- doxygen-1.5.1/src/pngenc.cpp 2006-11-01 22:52:34.006407364 +0200 ++++ doxygen-fixed/src/pngenc.cpp 2006-11-01 22:53:13.023475868 +0200 +@@ -25,7 +25,7 @@ + #endif + + #define ALL_STATIC +-#include <../libpng/png.h> ++#include <png.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> diff --git a/app-doc/doxygen/files/doxygen-1.5.7.1-substitute.patch b/app-doc/doxygen/files/doxygen-1.5.7.1-substitute.patch new file mode 100644 index 0000000..7d87d4a --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.5.7.1-substitute.patch @@ -0,0 +1,24 @@ +--- doxygen-1.5.7.1-orig/src/util.cpp 2008-10-04 14:28:00.000000000 +0200 ++++ doxygen-1.5.7.1/src/util.cpp 2008-12-18 20:55:15.000000000 +0100 +@@ -4447,10 +4447,10 @@ + + QCString substitute(const char *s,const char *src,const char *dst) + { +- if (s==0 || src==0 || dst==0) return s; ++ if (s==0 || src==0) return s; + const char *p, *q; + int srcLen = strlen(src); +- int dstLen = strlen(dst); ++ int dstLen = dst ? strlen(dst) : 0; + int resLen; + if (srcLen!=dstLen) + { +@@ -4469,7 +4469,7 @@ + int l = (int)(q-p); + memcpy(r,p,l); + r+=l; +- memcpy(r,dst,dstLen); ++ if (dst) memcpy(r,dst,dstLen); + r+=dstLen; + } + strcpy(r,p); diff --git a/app-doc/doxygen/files/doxygen-1.5.8-fortran.patch b/app-doc/doxygen/files/doxygen-1.5.8-fortran.patch new file mode 100644 index 0000000..01b5235 --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.5.8-fortran.patch @@ -0,0 +1,105 @@ +--- doxygen-1.5.8-r1/work/doxygen-1.5.8/src/fortrancode.l 2008-12-25 14:48:57.000000000 -0600 ++++ doxygen-1.5.8-r2/work/doxygen-1.5.8/src/fortrancode.l 2009-06-20 11:51:47.000000000 -0500 +@@ -611,7 +611,7 @@ + + IDSYM [a-z_A-Z0-9] + ID [a-z_A-Z]+{IDSYM}* +-SUBPROG (subroutine|function) ++SUBPROG (program|subroutine|function) + B [ \t] + BS [ \t]* + BS_ [ \t]+ +@@ -708,7 +708,7 @@ + } + + /*-------- fortran module -----------------------------------------*/ +-<Start>("program"|"module"|"type"|"interface")/{BS_}|({COMMA}{ACCESS_SPEC})|\n { // ++<Start>("module"|"type"|"interface")/{BS_}|({COMMA}{ACCESS_SPEC})|\n { // + startUseScope(); + startFontClass("keyword"); + codifyLines(yytext); +@@ -730,7 +730,7 @@ + currentModule=0; + REJECT; + } +-<Start>^{BS}"end"({BS}("program"|"module"|"type"|"interface")({BS_}{ID})?)?{BS}/(\n|!) { // ++<Start>^{BS}"end"({BS}("module"|"type"|"interface")({BS_}{ID})?)?{BS}/(\n|!) { // + endUseScope(); + startFontClass("keyword"); + codifyLines(yytext); +@@ -743,14 +743,14 @@ + codifyLines(yytext); + endFontClass(); + } +-<Start>{SUBPROG}{BS_} { // Fortran subroutine or function found ++<Start>{SUBPROG}{BS_} { // Fortran program, subroutine or function found + startFontClass("keyword"); + codifyLines(yytext); + endFontClass(); + yy_push_state(YY_START); + BEGIN(Subprog); + } +-<Subprog>{ID} { // subroutine/function name ++<Subprog>{ID} { // program/subroutine/function name + //cout << "===> start procedure " << yytext << endl; + startUseScope(); + generateLink(*g_code,yytext); +@@ -761,7 +761,7 @@ + <Subprog>"\n" { codifyLines(yytext); + yy_pop_state(); + } +-<Start>"^{BS}end"({BS}{SUBPROG}({BS_}{ID})?)?{BS}/(\n|!) { // Fortran subroutine or function ends ++<Start>"^{BS}end"({BS}{SUBPROG}({BS_}{ID})?)?{BS}/(\n|!) { // Fortran program, subroutine or function ends + //cout << "===> end function " << yytext << endl; + endUseScope(); + startFontClass("keyword"); +--- doxygen-1.5.8-r1/work/doxygen-1.5.8/src/fortranscanner.l 2008-12-22 08:33:27.000000000 -0600 ++++ doxygen-1.5.8-r2/work/doxygen-1.5.8/src/fortranscanner.l 2009-06-20 11:56:03.000000000 -0500 +@@ -204,7 +204,7 @@ + ID [a-z_A-Z%]+{IDSYM}* + PP_ID {ID} + LABELID [a-z_A-Z]+[a-z_A-Z0-9\-]* +-SUBPROG (subroutine|function|block) ++SUBPROG (program|subroutine|function|block) + B [ \t] + BS [ \t]* + BS_ [ \t]+ +@@ -434,11 +434,11 @@ + <SubprogBody>^{BS}{CONTAINS}/({BS}|\n|!) { BEGIN(SubprogBodyContains); } + + /*------ module handling ------------------------------------------------------------*/ +-<Start>module|program{BS_} { // ++<Start>module{BS_} { // + yy_push_state(Module); + defaultProtection = Public; + } +-<Start,ModuleBody,ModuleBodyContains>^{BS}"end"({BS}(module|program)({BS_}{ID})?)?{BS}/(\n|!) { // end module ++<Start,ModuleBody,ModuleBodyContains>^{BS}"end"({BS}(module)({BS_}{ID})?)?{BS}/(\n|!) { // end module + resolveModuleProcedures(moduleProcedures, current_root); + if (!endScope(current_root)) + yyterminate(); +@@ -651,7 +651,7 @@ + } + <Initialization>. { initializer+=yytext; } + +- /*------ fortran subroutine/function handling ------------------------------------------------------------*/ ++ /*------ fortran program/subroutine/function handling ------------------------------------------------------------*/ + /* Start is initial condition */ + + <Start,ModuleBody,SubprogBody,InterfaceBody,ModuleBodyContains,SubprogBodyContains>^{BS}({PREFIX}{BS_})?{TYPE_SPEC}{BS}/{SUBPROG}{BS_} { +@@ -665,13 +665,13 @@ + } + + <SubprogPrefix>{BS}{SUBPROG}{BS_} { +- // Fortran subroutine or function found ++ // Fortran program, subroutine or function found + addSubprogram(yytext); + BEGIN(Subprog); + } + + <Start,ModuleBody,SubprogBody,InterfaceBody,ModuleBodyContains,SubprogBodyContains>^{BS}({PREFIX}{BS_})?{SUBPROG}{BS_} { +- // Fortran subroutine or function found ++ // Fortran program, subroutine or function found + result= yytext; + result= result.stripWhiteSpace(); + extractPrefix(result); diff --git a/app-doc/doxygen/files/doxygen-1.5.8-kdedocs.patch b/app-doc/doxygen/files/doxygen-1.5.8-kdedocs.patch new file mode 100644 index 0000000..bf3d005 --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.5.8-kdedocs.patch @@ -0,0 +1,32 @@ +Avoid infinite loop in resolveSymlink. +Backported from doxygen trunk to 1.5.8. +Reference: http://bugs.gentoo.org/266693 +2009-04-19 Martin von Gagern + +--- trunk/src/doxygen.cpp 2009/01/17 16:16:15 677 ++++ trunk/src/doxygen.cpp 2009/01/29 20:13:23 678 +@@ -8617,6 +8617,7 @@ + QDict<void> nonSymlinks; + QDict<void> known; + QCString result = path; ++ QCString oldPrefix = "/"; + do + { + #ifdef WIN32 +@@ -8637,7 +8638,7 @@ + QString target = fi.readLink(); + if (QFileInfo(target).isRelative()) + { +- target = QDir::cleanDirPath(prefix+"/"+target.data()); ++ target = QDir::cleanDirPath(oldPrefix+"/"+target.data()); + } + if (sepPos!=-1) + { +@@ -8656,6 +8657,7 @@ + { + nonSymlinks.insert(prefix,(void*)0x8); + } ++ oldPrefix = prefix; + } + } + while (sepPos!=-1); diff --git a/app-doc/doxygen/files/doxygen-gcc4.patch b/app-doc/doxygen/files/doxygen-gcc4.patch new file mode 100644 index 0000000..ea81015 --- /dev/null +++ b/app-doc/doxygen/files/doxygen-gcc4.patch @@ -0,0 +1,11 @@ +--- qtools/qvaluestack.h.orig ++++ qtools/qvaluestack.h +@@ -54,7 +54,7 @@ + { + T elem( this->last() ); + if ( !this->isEmpty() ) +- remove( this->fromLast() ); ++ this->remove( this->fromLast() ); + return elem; + } + T& top() { return this->last(); } diff --git a/app-doc/doxygen/files/doxywizard.png b/app-doc/doxygen/files/doxywizard.png Binary files differnew file mode 100644 index 0000000..c648231 --- /dev/null +++ b/app-doc/doxygen/files/doxywizard.png |