diff options
Diffstat (limited to 'app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff')
| -rw-r--r-- | app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff | 203 |
1 files changed, 0 insertions, 203 deletions
diff --git a/app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff b/app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff deleted file mode 100644 index 2ceb262..0000000 --- a/app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff +++ /dev/null @@ -1,203 +0,0 @@ ---- 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; } -+ |