diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2006-05-27 19:04:36 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2006-05-27 19:04:36 +0000 |
| commit | 8c90db11b0c0a8288a5114085f8daf1c8bbc0784 (patch) | |
| tree | d00346e6c5549221e71c671bdf4435b3c1dc60b7 /app-doc | |
| parent | Version bump, thanks to Anton in bug #132519. (diff) | |
| download | gentoo-2-8c90db11b0c0a8288a5114085f8daf1c8bbc0784.tar.gz gentoo-2-8c90db11b0c0a8288a5114085f8daf1c8bbc0784.tar.bz2 gentoo-2-8c90db11b0c0a8288a5114085f8daf1c8bbc0784.zip | |
removed offending amd64_qtools patch from 1.4.6
(Portage version: 2.1_rc1-r3)
Diffstat (limited to 'app-doc')
| -rw-r--r-- | app-doc/doxygen/ChangeLog | 7 | ||||
| -rw-r--r-- | app-doc/doxygen/files/doxygen-gcc4.patch | 30 |
2 files changed, 17 insertions, 20 deletions
diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog index 51396dcbd957..f107a6a5af18 100644 --- a/app-doc/doxygen/ChangeLog +++ b/app-doc/doxygen/ChangeLog @@ -1,6 +1,11 @@ # 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.98 2006/05/08 00:17:47 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.99 2006/05/27 19:04:36 nerdboy Exp $ + + 27 May 2006; Steve Arnold <nerdboy@gentoo.org> + -files/1.4.6/04_amd64_qtools.patch, files/doxygen-gcc4.patch: + Removed offending amd64_qtools patch from 1.4.6; graphviz still needs work + before newer doxygen versions can go stable... 08 May 2006; Steve Arnold <nerdboy@gentoo.org> +files/1.4.6/01_all_cp1251.patch, +files/1.4.6/03_all_segfault.patch, diff --git a/app-doc/doxygen/files/doxygen-gcc4.patch b/app-doc/doxygen/files/doxygen-gcc4.patch index 253914f307d9..ea81015cfe2d 100644 --- a/app-doc/doxygen/files/doxygen-gcc4.patch +++ b/app-doc/doxygen/files/doxygen-gcc4.patch @@ -1,19 +1,11 @@ -*** qtools/qvaluestack.h.old Wed Nov 23 22:27:00 2005 ---- qtools/qvaluestack.h Wed Nov 23 22:27:06 2005 -*************** -*** 54,60 **** - { - T elem( this->last() ); - if ( !this->isEmpty() ) -! remove( this->fromLast() ); - return elem; - } - T& top() { return this->last(); } ---- 54,60 ---- - { - T elem( this->last() ); - if ( !this->isEmpty() ) -! this->remove( this->fromLast() ); - return elem; - } - T& top() { return this->last(); } +--- 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(); } |