diff options
author | Matthias Maier <tamiko@43-1.org> | 2015-08-09 01:18:41 -0500 |
---|---|---|
committer | Matthias Maier <tamiko@43-1.org> | 2015-08-09 01:18:41 -0500 |
commit | 712f0e23350786c458cbbae65fc1691ca5deabb2 (patch) | |
tree | 0128c1e0c092fd921f03d276dc5f5642e47d1150 /app-doc/doxygen/files | |
parent | app-doc/doxygen: ebuild maintenance and rekeyword 1.8.10-r1 (diff) | |
download | gentoo-712f0e23350786c458cbbae65fc1691ca5deabb2.tar.gz gentoo-712f0e23350786c458cbbae65fc1691ca5deabb2.tar.bz2 gentoo-712f0e23350786c458cbbae65fc1691ca5deabb2.zip |
app-doc/doxygen: remove old; remove unused patches
Package-Manager: portage-2.2.20
Diffstat (limited to 'app-doc/doxygen/files')
-rw-r--r-- | app-doc/doxygen/files/1.4.7/01_all_cp1251.patch | 35 | ||||
-rw-r--r-- | app-doc/doxygen/files/1.4.7/05_all_system-libpng.patch | 124 | ||||
-rw-r--r-- | app-doc/doxygen/files/1.4.7/06_all_qtools.patch | 44 | ||||
-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.6-prefix-misc-alt.patch | 78 | ||||
-rw-r--r-- | app-doc/doxygen/files/doxygen-1.5.8-kdedocs.patch | 32 | ||||
-rw-r--r-- | app-doc/doxygen/files/doxygen-1.8.4-infinite_loop.patch | 26 | ||||
-rw-r--r-- | app-doc/doxygen/files/doxygen-1.8.4-libreoffice.patch | 30 |
10 files changed, 0 insertions, 688 deletions
diff --git a/app-doc/doxygen/files/1.4.7/01_all_cp1251.patch b/app-doc/doxygen/files/1.4.7/01_all_cp1251.patch deleted file mode 100644 index 0ffed14733e1..000000000000 --- a/app-doc/doxygen/files/1.4.7/01_all_cp1251.patch +++ /dev/null @@ -1,35 +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; diff --git a/app-doc/doxygen/files/1.4.7/05_all_system-libpng.patch b/app-doc/doxygen/files/1.4.7/05_all_system-libpng.patch deleted file mode 100644 index 491e3a22a801..000000000000 --- a/app-doc/doxygen/files/1.4.7/05_all_system-libpng.patch +++ /dev/null @@ -1,124 +0,0 @@ ---- 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 diff --git a/app-doc/doxygen/files/1.4.7/06_all_qtools.patch b/app-doc/doxygen/files/1.4.7/06_all_qtools.patch deleted file mode 100644 index 38a4fcbf000e..000000000000 --- a/app-doc/doxygen/files/1.4.7/06_all_qtools.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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-legacy-patches.diff b/app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff deleted file mode 100644 index 2ceb2628ac90..000000000000 --- 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; } -+ diff --git a/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch b/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch deleted file mode 100644 index 34aaef42d2dd..000000000000 --- a/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index dbd95b879ba4..000000000000 --- a/app-doc/doxygen/files/doxygen-1.5-system-libpng.patch +++ /dev/null @@ -1,105 +0,0 @@ -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.6-prefix-misc-alt.patch b/app-doc/doxygen/files/doxygen-1.5.6-prefix-misc-alt.patch deleted file mode 100644 index 04d69e84f808..000000000000 --- a/app-doc/doxygen/files/doxygen-1.5.6-prefix-misc-alt.patch +++ /dev/null @@ -1,78 +0,0 @@ -* make sure we always look for tools in the path, no "do it yourself paths" - ---- configure -+++ configure -@@ -169,21 +169,12 @@ - ;; - Darwin:*) - f_platform=macosx-c++ -- if test "$f_insttool" = NO; then -- f_insttool=/usr/bin/install -- fi - ;; - FreeBSD:*) - f_platform=freebsd-g++ -- if test "$f_insttool" = NO; then -- f_insttool=/usr/bin/install -- fi - ;; - HP-UX:*) - f_platform=hpux-g++ -- if test "$f_insttool" = NO; then -- f_insttool=/usr/bin/install -- fi - ;; - IRIX64:*) - f_platform=irix-64 -@@ -214,9 +205,6 @@ - ;; - SunOS:5*) - f_platform=solaris-g++ -- if test "$f_insttool" = NO; then -- f_insttool=/usr/bin/install -- fi - ;; - ULTRIX:*) - f_platform=ultrix-g++ -@@ -311,8 +299,8 @@ - - echo -n " Checking for GNU make tool... " - if test "$f_make" = NO; then -- make_names="gmake make" -- make_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" -+ make_names="make" -+ make_dirs="$bin_dirs" - make_prog=NO - for i in $make_names; do - for j in $make_dirs; do -@@ -338,8 +326,8 @@ - - echo -n " Checking for GNU install tool... " - if test "$f_insttool" = NO; then -- install_names="ginstall install" -- install_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin /usr/ucb" -+ install_names="install" -+ install_dirs="$bin_dirs" - install_prog=NO - install_found=NO - for i in $install_names; do -@@ -397,7 +385,7 @@ - echo -n " Checking for perl... " - if test "$f_perl" = NO; then - perl_names="perl perl5" -- perl_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" -+ perl_dirs="$bin_dirs" - perl_prog=NO - perl_found=NO - for i in $perl_names; do -@@ -550,10 +538,6 @@ - cat >> .tmakeconfig <<EOF - TMAKE_LFLAGS += -non_shared - EOF -- elif test "$f_platform" = "solaris-cc"; then -- cat >> .tmakeconfig <<EOF -- TMAKE_LFLAGS += -Bstatic --EOF - elif test "$f_platform" = "hpux-cc"; then - cat >> .tmakeconfig <<EOF - TMAKE_LFLAGS += -noshared diff --git a/app-doc/doxygen/files/doxygen-1.5.8-kdedocs.patch b/app-doc/doxygen/files/doxygen-1.5.8-kdedocs.patch deleted file mode 100644 index bf3d00535bf6..000000000000 --- a/app-doc/doxygen/files/doxygen-1.5.8-kdedocs.patch +++ /dev/null @@ -1,32 +0,0 @@ -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-1.8.4-infinite_loop.patch b/app-doc/doxygen/files/doxygen-1.8.4-infinite_loop.patch deleted file mode 100644 index 840baa810520..000000000000 --- a/app-doc/doxygen/files/doxygen-1.8.4-infinite_loop.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix inifite loop - -https://bugs.gentoo.org/show_bug.cgi?id=474716 -https://bugzilla.gnome.org/show_bug.cgi?id=701295 - -Patch written by Dimitri van Heesch <dimitri@stack.nl> - ---- a/src/util.cpp -+++ b/src/util.cpp -@@ -1843,11 +1843,15 @@ int findParameterList(const QString &name) - ++templateDepth; - pos=nextOpenPos-1; - } -- else -+ else if (nextClosePos!=-1) - { - --templateDepth; - pos=nextClosePos-1; - } -+ else // more >'s than <'s, see bug701295 -+ { -+ return -1; -+ } - } - else - { diff --git a/app-doc/doxygen/files/doxygen-1.8.4-libreoffice.patch b/app-doc/doxygen/files/doxygen-1.8.4-libreoffice.patch deleted file mode 100644 index 7aa7baa37596..000000000000 --- a/app-doc/doxygen/files/doxygen-1.8.4-libreoffice.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b3e1f10a2d795d0cf31f6efb3f88a31ad4c68980 Mon Sep 17 00:00:00 2001 -From: Michael Stahl <mstahl@redhat.com> -Date: Wed, 29 May 2013 16:29:04 +0200 -Subject: [PATCH] fix "Constant Groups" regression on file pages - -Due to a copy/paste error in the UNO IDL patch the "Namespaces" -listed on the "File Reference" pages are erroneously duplicated. -(thanks to Stephan Bergmann for finding this problem) - -Signed-off-by: Dimitri van Heesch <dimitri@stack.nl> ---- - src/layout.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/layout.cpp b/src/layout.cpp -index c2b1ac5..010c850 100644 ---- a/src/layout.cpp -+++ b/src/layout.cpp -@@ -582,7 +582,7 @@ class LayoutParser : public QXmlDefaultHandler - SrcLangExt_Fortran,theTranslator->trModules() - ))); - m_sHandler.insert("file/memberdecl/constantgroups", -- new StartElementHandlerSection(this,LayoutDocEntry::FileNamespaces,&LayoutParser::startSectionEntry, -+ new StartElementHandlerSection(this,LayoutDocEntry::FileConstantGroups,&LayoutParser::startSectionEntry, - theTranslator->trConstantGroups())); - m_sHandler.insert("file/memberdecl/defines", - new StartElementHandlerMember(this,&LayoutParser::startMemberDeclEntry, --- -1.8.1.6 - |