diff options
author | Steve Arnold <nerdboy@gentoo.org> | 2009-06-08 04:33:05 +0000 |
---|---|---|
committer | Steve Arnold <nerdboy@gentoo.org> | 2009-06-08 04:33:05 +0000 |
commit | 26d541856631873002e0c294bdfa903abd0b3273 (patch) | |
tree | c2b64cc6e6cdb4186426f9c2c1b235520249b56f /app-doc/doxygen | |
parent | Stable for HPPA (bug #257097). (diff) | |
download | gentoo-2-26d541856631873002e0c294bdfa903abd0b3273.tar.gz gentoo-2-26d541856631873002e0c294bdfa903abd0b3273.tar.bz2 gentoo-2-26d541856631873002e0c294bdfa903abd0b3273.zip |
Updated with back-ported patch, courtesy of Martin von Gagern.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'app-doc/doxygen')
-rw-r--r-- | app-doc/doxygen/ChangeLog | 7 | ||||
-rw-r--r-- | app-doc/doxygen/doxygen-1.5.8.ebuild | 9 | ||||
-rw-r--r-- | app-doc/doxygen/files/doxygen-1.5.8-kdedocs.patch | 32 |
3 files changed, 41 insertions, 7 deletions
diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog index 08c69813057b..5ce3fce4a6e4 100644 --- a/app-doc/doxygen/ChangeLog +++ b/app-doc/doxygen/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-doc/doxygen # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.161 2009/06/01 15:28:44 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.162 2009/06/08 04:33:04 nerdboy Exp $ + + 08 Jun 2009; Steve Arnold <nerdboy@gentoo.org> + +files/doxygen-1.5.8-kdedocs.patch, doxygen-1.5.8.ebuild: + Updated with back-ported patch, courtesy of (thanks!) Martin von Gagern + <Martin.vGagern@gmx.net>. 01 Jun 2009; Ferris McCormick <fmccor@gentoo.org> doxygen-1.5.8.ebuild: Sparc stable, Bug #263641, required for Bug #271815. diff --git a/app-doc/doxygen/doxygen-1.5.8.ebuild b/app-doc/doxygen/doxygen-1.5.8.ebuild index 85891aeb7368..ca330db7a4cf 100644 --- a/app-doc/doxygen/doxygen-1.5.8.ebuild +++ b/app-doc/doxygen/doxygen-1.5.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8.ebuild,v 1.7 2009/06/01 15:28:44 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8.ebuild,v 1.8 2009/06/08 04:33:04 nerdboy Exp $ EAPI=1 @@ -54,15 +54,12 @@ src_unpack() { # 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" - #epatch "${FILESDIR}/${P}-substitute.patch" + # backport fix for bug #266693 + epatch "${FILESDIR}/${P}-kdedocs.patch" # remove internal libpng - see bug #210237 epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch" - #if [ $(get_libdir) == "lib64" ] ; then - # epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch" - #fi - # fix final DESTDIR issue sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \ addon/doxywizard/Makefile.in || die "sed failed" 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 000000000000..bf3d00535bf6 --- /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); |