diff options
Diffstat (limited to 'app-doc/doxygen')
| -rw-r--r-- | app-doc/doxygen/ChangeLog | 8 | ||||
| -rw-r--r-- | app-doc/doxygen/Manifest | 20 | ||||
| -rw-r--r-- | app-doc/doxygen/doxygen-1.5.1.ebuild | 117 | ||||
| -rw-r--r-- | app-doc/doxygen/files/digest-doxygen-1.5.1 | 3 | ||||
| -rw-r--r-- | app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff | 203 |
5 files changed, 346 insertions, 5 deletions
diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog index 2d677fadaece..c5ff051205da 100644 --- a/app-doc/doxygen/ChangeLog +++ b/app-doc/doxygen/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-doc/doxygen # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.118 2006/10/24 19:42:18 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.119 2006/11/02 00:32:44 nerdboy Exp $ + +*doxygen-1.5.1 (01 Nov 2006) + + 01 Nov 2006; Steve Arnold <nerdboy@gentoo.org> + +files/doxygen-1.5-legacy-patches.diff, +doxygen-1.5.1.ebuild: + version bump (bug 152033) and patch consolidation 24 Oct 2006; Fabian Groffen <grobian@gentoo.org> doxygen-1.4.7.ebuild: Marked ppc-macos stable (bug #138937) diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest index 2c33e4c6eed2..cb118fef316c 100644 --- a/app-doc/doxygen/Manifest +++ b/app-doc/doxygen/Manifest @@ -46,6 +46,10 @@ AUX doxygen-1.4.4-darwin.patch 536 RMD160 367a923f0ddda5f52487896d86301aaef7328d MD5 461d2d8b233682be4ea9191058708a77 files/doxygen-1.4.4-darwin.patch 536 RMD160 367a923f0ddda5f52487896d86301aaef7328ddb files/doxygen-1.4.4-darwin.patch 536 SHA256 a7a0ff21dbff292e389d7c5a6ce26b7059ea8bf3aebc2187a78b88afc3f49b41 files/doxygen-1.4.4-darwin.patch 536 +AUX doxygen-1.5-legacy-patches.diff 7242 RMD160 0100a2305101b392764eaf867a32e0d14dcf9208 SHA1 bb564532f157e72436e0c8ecbbed163d96db3674 SHA256 f696c10fe571d281ed8178e7a07864c7a5bba9cc21ac723ee9669ac32e43e114 +MD5 382a10c75c67de91ecd64b1ca92cf75e files/doxygen-1.5-legacy-patches.diff 7242 +RMD160 0100a2305101b392764eaf867a32e0d14dcf9208 files/doxygen-1.5-legacy-patches.diff 7242 +SHA256 f696c10fe571d281ed8178e7a07864c7a5bba9cc21ac723ee9669ac32e43e114 files/doxygen-1.5-legacy-patches.diff 7242 AUX doxygen-gcc4.patch 267 RMD160 f96f301331db451247fc1fb061f35e173ec1cff8 SHA1 ac7ed139251d87876e67b3e5ce04652b3ac27795 SHA256 df914a5303499c5293c0fcec3e126260157a15bbdc605040d4161ef9599fa2ce MD5 9b79bcfbb78c577a9cf1e433cedf043d files/doxygen-gcc4.patch 267 RMD160 f96f301331db451247fc1fb061f35e173ec1cff8 files/doxygen-gcc4.patch 267 @@ -56,6 +60,7 @@ DIST doxygen-1.4.4.src.tar.gz 2854374 RMD160 7999f196b8deb2137e9d411a1c0ea257db3 DIST doxygen-1.4.5.src.tar.gz 2884510 RMD160 9fcc6820b2036e54ecee91650f2470d179d86e2e SHA1 cbd01c0f1369cdd078c7bee4646559f805bfb237 SHA256 9dca2f306c8ca3dbc576bacf7365dfc5b1e71c0353a6f113351790bae6f35b3d DIST doxygen-1.4.6.src.tar.gz 2889072 RMD160 00f09e7a6bd2d6e6ed3030a81a41b366b5999c1f SHA1 b40fb369b38cf82ec06826dc65574953c3ad8a3c SHA256 48ad46bbe03e904fffe0d5012c4f703ad7926951c76e5a2dcb1b447458b2f68c DIST doxygen-1.4.7.src.tar.gz 2928354 RMD160 4de02b866cef53a7fd6f54e0ba90111814a9d77a SHA1 42a33d676fbd471165d02f531bfe98f433ecb432 SHA256 5db0e9ddf6fe74273096419d53d3835e9f1822581f20f5f20c057500a5e512ed +DIST doxygen-1.5.1.src.tar.gz 2888159 RMD160 bacd34a5a69833e42e116d997c99df03dd837062 SHA1 eac525c670ef3f1f81c3038588b42e111a9ec6a6 SHA256 c00233e17f64b9da8d05b7bc2b077abebc03edbfa9fbc063359ef17ec6e11578 DIST doxygen-utf8-ru.patch.gz 14412 RMD160 ea1858024c2f24ecd4d4b6d77631e6bd432b52f6 SHA1 c293412c349feb6bd9b6b0e1b898f5b530b59c09 SHA256 d1366b061b8d1f3fc4809d48556a4b2a6956113416ed2bf263629e85c2774dce EBUILD doxygen-1.4.2.ebuild 3447 RMD160 c366f170aeae66b9434825e151502ee6aec88a15 SHA1 53f7e54204db16837e663c180d7ead412e527a7f SHA256 76bfbd159ae7d19b7313fd311526c40f1d38e9e28656885a7ea4e8d0e5892bff MD5 ae79678551027499181eb39083e40c8f doxygen-1.4.2.ebuild 3447 @@ -81,10 +86,14 @@ EBUILD doxygen-1.4.7.ebuild 3877 RMD160 0243be4b501dcc145ca2fe4c4af2f9c150d2058a MD5 55de20398ce8b10a01e01eb2697dc438 doxygen-1.4.7.ebuild 3877 RMD160 0243be4b501dcc145ca2fe4c4af2f9c150d2058a doxygen-1.4.7.ebuild 3877 SHA256 0beb45fb6c4fd6b8df71d66da7b3c390170c2935da64420ee40a754c671be1d3 doxygen-1.4.7.ebuild 3877 -MISC ChangeLog 19163 RMD160 9defd9b6f122e5bf83c5ccc22d1a9cd1f7909657 SHA1 d28853b749ce97ad2969905740dbc02a36fbb87b SHA256 7e0131cb7b975fb85bc40a6533e9f277157d5f8aaffc4518723afef9bfb42675 -MD5 d470a4a08da9bbc83adaaec528f80fea ChangeLog 19163 -RMD160 9defd9b6f122e5bf83c5ccc22d1a9cd1f7909657 ChangeLog 19163 -SHA256 7e0131cb7b975fb85bc40a6533e9f277157d5f8aaffc4518723afef9bfb42675 ChangeLog 19163 +EBUILD doxygen-1.5.1.ebuild 3852 RMD160 c2f95d17f7b02d046b5fd481f35fa2ab0ed9a8b2 SHA1 5c71c798abd54955b91dfce94d8d451f8d2a48f8 SHA256 115f96c09151761b3bf742f931f3e84dfb635789b8be9f1b0a3c858fa6204246 +MD5 da9ba22dd8c2147a649e268b7ea39fe0 doxygen-1.5.1.ebuild 3852 +RMD160 c2f95d17f7b02d046b5fd481f35fa2ab0ed9a8b2 doxygen-1.5.1.ebuild 3852 +SHA256 115f96c09151761b3bf742f931f3e84dfb635789b8be9f1b0a3c858fa6204246 doxygen-1.5.1.ebuild 3852 +MISC ChangeLog 19360 RMD160 c348736343c241bafc9b72e7c287d3bf452f2196 SHA1 00789a683a690f749b3de1c6cd83be51718625d5 SHA256 1e7e88e81a368a05848b1559d63939dea46b19717d259379065b3feb0034bd2c +MD5 8a7f219e7f1a794536e14e226f947923 ChangeLog 19360 +RMD160 c348736343c241bafc9b72e7c287d3bf452f2196 ChangeLog 19360 +SHA256 1e7e88e81a368a05848b1559d63939dea46b19717d259379065b3feb0034bd2c ChangeLog 19360 MISC metadata.xml 649 RMD160 2c8cc604548cc64104c075ff64d33190efdce45d SHA1 bfc826f792595110c799a2658d07293b4ab3e0fd SHA256 57a845bfcc6988eabb61ab1da130aeb637be936c93d47e20e53a67676f57c26b MD5 b8f1156ac2d88a9982011ecd8ff2275b metadata.xml 649 RMD160 2c8cc604548cc64104c075ff64d33190efdce45d metadata.xml 649 @@ -107,3 +116,6 @@ SHA256 9b9431d5b0d53d6f852c40914f9911c15d172b7f2aaa04429bac430b0193b347 files/di MD5 dd760d1b23e69682a20ed48883dd4204 files/digest-doxygen-1.4.7 256 RMD160 50d904036a5ccbd95ea4dae13d627db5a5ab34bf files/digest-doxygen-1.4.7 256 SHA256 db31a00fa3917c06ce3c6d294371cd36ae9ead0c9c0d4bf0c7e9c0079f36610a files/digest-doxygen-1.4.7 256 +MD5 cd749ea8114d0685becdf0e72225264f files/digest-doxygen-1.5.1 256 +RMD160 fe1c7b630832cb631644505dcb053948d41696c4 files/digest-doxygen-1.5.1 256 +SHA256 cede07ef1f58b251e7cc19e66b39e860afd31c000bad8e84afdcdecd64cc4065 files/digest-doxygen-1.5.1 256 diff --git a/app-doc/doxygen/doxygen-1.5.1.ebuild b/app-doc/doxygen/doxygen-1.5.1.ebuild new file mode 100644 index 000000000000..d16b70eb2e01 --- /dev/null +++ b/app-doc/doxygen/doxygen-1.5.1.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.1.ebuild,v 1.1 2006/11/02 00:32:44 nerdboy Exp $ + +inherit eutils flag-o-matic toolchain-funcs qt3 + +DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages" +HOMEPAGE="http://www.doxygen.org/" +SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="doc qt3 tetex" + +RDEPEND=">=media-gfx/graphviz-2.6 + qt3? ( $(qt_min_version 3.3) ) + tetex? ( virtual/tetex ) + virtual/ghostscript" +DEPEND=">=sys-apps/sed-4 + ${RDEPEND}" + +EPATCH_SUFFIX="patch" + +src_unpack() { + unpack ${A} + cd ${S} + # use CFLAGS, CXXFLAGS, LDFLAGS + sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \ + -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \ + -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \ + tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf + + # Consolidate patches, apply FreeBSD configure patch, codepage patch, + # qtools stuff, and patches for bugs 129142, 121770, and 129560. + epatch ${FILESDIR}/${PN}-1.5-legacy-patches.diff + + if is-flagq "-O3" ; then + echo + ewarn "Compiling with -O3 is known to produce incorrectly" + ewarn "optimized code which breaks doxygen." + echo + epause 6 + einfo "Continuing with -O2 instead ..." + echo + replace-flags "-O3" "-O2" + fi +} + +src_compile() { + export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}" + # set ./configure options (prefix, Qt based wizard, docdir) + local my_conf="--prefix ${D}usr" + if use qt3; then + einfo "using QTDIR: '$QTDIR'." + export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH} + export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH} + einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'." + einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'." + ./configure ${my_conf} $(use_with qt3 doxywizard) || die 'configure failed' + else + ./configure ${my_conf} || die 'configure failed' + fi + + # and compile + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \ + LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed' + + # generate html and pdf (if tetex in use) documents. + # errors here are not considered fatal, hence the ewarn message + # TeX's font caching in /var/cache/fonts causes sandbox warnings, + # so we allow it. + if use doc; then + if use tetex; then + addwrite /var/cache/fonts + addwrite /usr/share/texmf/fonts/pk + addwrite /usr/share/texmf/ls-R + make pdf || ewarn '"make pdf docs" failed.' + else + cp doc/Doxyfile doc/Doxyfile.orig + cp doc/Makefile doc/Makefile.orig + sed -i.orig -e "s/GENERATE_LATEX = YES/GENERATE_LATEX = NO/" doc/Doxyfile + sed -i.orig -e "s/@epstopdf/# @epstopdf/" \ + -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \ + -e "s/@sed/# @sed/" doc/Makefile + make docs || ewarn '"make html docs" failed.' + fi + fi +} + +src_install() { + make DESTDIR=${D} MAN1DIR=share/man/man1 \ + install || die '"make install" failed.' + + dodoc INSTALL LANGUAGE.HOWTO README + + # pdf and html manuals + if use doc; then + insinto /usr/share/doc/${PF} + if use tetex; then + doins latex/doxygen_manual.pdf + fi + dohtml -r html/* + fi +} + +pkg_postinst() { + einfo + einfo "The USE flags qt, doc, and tetex will enable doxywizard, or" + einfo "the html and pdf documentation, respectively. For examples" + einfo "and other goodies, see the source tarball. For some example" + einfo "output, run doxygen on the doxygen source using the Doxyfile" + einfo "provided in the top-level source dir." + einfo + einfo "See the Doxygen homepage for additional language support tools." + einfo +} diff --git a/app-doc/doxygen/files/digest-doxygen-1.5.1 b/app-doc/doxygen/files/digest-doxygen-1.5.1 new file mode 100644 index 000000000000..6b34e2e4cb77 --- /dev/null +++ b/app-doc/doxygen/files/digest-doxygen-1.5.1 @@ -0,0 +1,3 @@ +MD5 43b8e58e5ca70cb8f1285c35a171014e doxygen-1.5.1.src.tar.gz 2888159 +RMD160 bacd34a5a69833e42e116d997c99df03dd837062 doxygen-1.5.1.src.tar.gz 2888159 +SHA256 c00233e17f64b9da8d05b7bc2b077abebc03edbfa9fbc063359ef17ec6e11578 doxygen-1.5.1.src.tar.gz 2888159 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 000000000000..2ceb2628ac90 --- /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; } ++ |