diff options
| author |   Gregorio Guidi <greg_g@gentoo.org> | 2005-08-05 10:53:12 +0000 |
|---|---|---|
| committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-08-05 10:53:12 +0000 |
| commit | d4b54a91f8cc34397a6365e1ffe531cc3aef990e (patch) | |
| tree | 9829a712f1d12b0c624fe01a36943f678d736dcc | |
| parent | Add patch to fix regression in kpdf (#101119). (diff) | |
| download | historical-d4b54a91f8cc34397a6365e1ffe531cc3aef990e.tar.gz historical-d4b54a91f8cc34397a6365e1ffe531cc3aef990e.tar.bz2 historical-d4b54a91f8cc34397a6365e1ffe531cc3aef990e.zip | |
Add patch to fix compilation with gcc4 (#101384).
Package-Manager: portage-2.0.51.22-r2
| -rw-r--r-- | kde-base/kghostview/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kghostview/files/kdegraphics-3.4-gcc4.patch | 26 | ||||
| -rw-r--r-- | kde-base/kghostview/kghostview-3.4.2.ebuild | 5 |
3 files changed, 35 insertions, 2 deletions
diff --git a/kde-base/kghostview/ChangeLog b/kde-base/kghostview/ChangeLog index 3a380d6c10a0..ef617fda8a87 100644 --- a/kde-base/kghostview/ChangeLog +++ b/kde-base/kghostview/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kghostview # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kghostview/ChangeLog,v 1.13 2005/07/28 21:16:17 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kghostview/ChangeLog,v 1.14 2005/08/05 10:53:12 greg_g Exp $ + + 05 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/kdegraphics-3.4-gcc4.patch, kghostview-3.4.2.ebuild: + Add patch to fix compilation with gcc4 (#101384). *kghostview-3.4.2 (28 Jul 2005) diff --git a/kde-base/kghostview/files/kdegraphics-3.4-gcc4.patch b/kde-base/kghostview/files/kdegraphics-3.4-gcc4.patch new file mode 100644 index 000000000000..d9bb7a101acd --- /dev/null +++ b/kde-base/kghostview/files/kdegraphics-3.4-gcc4.patch @@ -0,0 +1,26 @@ +diff -Nur kdegraphics-3.4.2.orig/kghostview/displayoptions.cpp kdegraphics-3.4.2/kghostview/displayoptions.cpp +--- kdegraphics-3.4.2.orig/kghostview/displayoptions.cpp 2005-07-20 12:00:39.000000000 +0200 ++++ kdegraphics-3.4.2/kghostview/displayoptions.cpp 2005-08-05 12:02:27.000000000 +0200 +@@ -56,7 +56,7 @@ + res.setMagnification( args->getOption( "scale" ).toFloat() ); + res.setPage( args->getOption( "page" ).toInt() - 1 ); // transform from 1-based into 0-based + //res._overridePageMedia = args->getOption( "paper" ); +- kdDebug(4500 ) << "Parsed options: " << res << endl; ++ kdDebug(4500 ) << "Parsed options: " << DisplayOptions::toString( res ) << endl; + return res; + } + +diff -Nur kdegraphics-3.4.2.orig/kghostview/displayoptions.h kdegraphics-3.4.2/kghostview/displayoptions.h +--- kdegraphics-3.4.2.orig/kghostview/displayoptions.h 2005-05-23 14:06:10.000000000 +0200 ++++ kdegraphics-3.4.2/kghostview/displayoptions.h 2005-08-05 12:02:27.000000000 +0200 +@@ -109,10 +109,4 @@ + setMagnification( 1.0 ); + } + +-template <typename OutStream> +-OutStream& operator << ( OutStream& out, const DisplayOptions& obj ) { +- out << DisplayOptions::toString( obj ).utf8().data(); +- return out; +-} +- + #endif // DISPLAYOPTIONS_H diff --git a/kde-base/kghostview/kghostview-3.4.2.ebuild b/kde-base/kghostview/kghostview-3.4.2.ebuild index 7caee514edfa..081f93df59f5 100644 --- a/kde-base/kghostview/kghostview-3.4.2.ebuild +++ b/kde-base/kghostview/kghostview-3.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kghostview/kghostview-3.4.2.ebuild,v 1.1 2005/07/28 21:16:17 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kghostview/kghostview-3.4.2.ebuild,v 1.2 2005/08/05 10:53:12 greg_g Exp $ KMNAME=kdegraphics MAXKDEVER=$PV @@ -13,3 +13,6 @@ IUSE="" RDEPEND="${DEPEND} virtual/ghostscript" KMEXTRA="kfile-plugins/ps" + +# Fix compilation with gcc4. Applied for 3.5. +PATCHES1="${FILESDIR}/kdegraphics-3.4-gcc4.patch" |