summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregorio Guidi <greg_g@gentoo.org>2005-08-05 10:50:18 +0000
committerGregorio Guidi <greg_g@gentoo.org>2005-08-05 10:50:18 +0000
commitd2087fe3d4bb995af9de91c4afb364a098a17c9f (patch)
tree95a653114c7c2508b34988f97fe583fa9bbc44c3 /kde-base/kdegraphics
parentPass --with-powerbook/--without-powerbook for bug #94731. (diff)
downloadgentoo-2-d2087fe3d4bb995af9de91c4afb364a098a17c9f.tar.gz
gentoo-2-d2087fe3d4bb995af9de91c4afb364a098a17c9f.tar.bz2
gentoo-2-d2087fe3d4bb995af9de91c4afb364a098a17c9f.zip
Add patch to fix compilation with gcc4 (#101384). Add patch to fix regression in kpdf (#101119).
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'kde-base/kdegraphics')
-rw-r--r--kde-base/kdegraphics/ChangeLog10
-rw-r--r--kde-base/kdegraphics/files/digest-kdegraphics-3.4.2-r11
-rw-r--r--kde-base/kdegraphics/files/kdegraphics-3.4-gcc4.patch26
-rw-r--r--kde-base/kdegraphics/files/kdegraphics-3.4.2-kpdf-fix.patch33
-rw-r--r--kde-base/kdegraphics/kdegraphics-3.4.2-r1.ebuild73
5 files changed, 142 insertions, 1 deletions
diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 3760286e8455..02f0200eb528 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,6 @@
# ChangeLog for kde-base/kdegraphics
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.172 2005/08/03 17:09:41 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.173 2005/08/05 10:50:18 greg_g Exp $
*kdegraphics-3.4.1-r1 (03 Aug 2005)
*kdegraphics-3.3.2-r3 (03 Aug 2005)
@@ -11,6 +11,14 @@
+kdegraphics-3.4.1-r1.ebuild:
Yet another xpdf fix.
+*kdegraphics-3.4.2-r1 (05 Aug 2005)
+
+ 05 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+ +files/kdegraphics-3.4.2-kpdf-fix.patch,
+ +files/kdegraphics-3.4-gcc4.patch, +kdegraphics-3.4.2-r1.ebuild:
+ Add patch to fix compilation with gcc4 (#101384). Add patch to fix
+ regression in kpdf (#101119).
+
*kdegraphics-3.4.2 (28 Jul 2005)
28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.4.2-r1 b/kde-base/kdegraphics/files/digest-kdegraphics-3.4.2-r1
new file mode 100644
index 000000000000..80c5b0d96ab2
--- /dev/null
+++ b/kde-base/kdegraphics/files/digest-kdegraphics-3.4.2-r1
@@ -0,0 +1 @@
+MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kdegraphics/files/kdegraphics-3.4-gcc4.patch b/kde-base/kdegraphics/files/kdegraphics-3.4-gcc4.patch
new file mode 100644
index 000000000000..d9bb7a101acd
--- /dev/null
+++ b/kde-base/kdegraphics/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/kdegraphics/files/kdegraphics-3.4.2-kpdf-fix.patch b/kde-base/kdegraphics/files/kdegraphics-3.4.2-kpdf-fix.patch
new file mode 100644
index 000000000000..5462c6e03539
--- /dev/null
+++ b/kde-base/kdegraphics/files/kdegraphics-3.4.2-kpdf-fix.patch
@@ -0,0 +1,33 @@
+diff -Nur kdegraphics-3.4.2.orig/kpdf/xpdf/xpdf/PDFDoc.cc kdegraphics-3.4.2/kpdf/xpdf/xpdf/PDFDoc.cc
+--- kdegraphics-3.4.2.orig/kpdf/xpdf/xpdf/PDFDoc.cc 2005-07-20 12:00:36.000000000 +0200
++++ kdegraphics-3.4.2/kpdf/xpdf/xpdf/PDFDoc.cc 2005-08-05 11:46:39.000000000 +0200
+@@ -115,23 +115,19 @@
+ GBool PDFDoc::setup(GString *ownerPassword, GString *userPassword) {
+ str->reset();
+
+- char eof[8];
++ char *eof = new char[1024];
+ int pos = str->getPos();
+- str->setPos(7, -1);
+- eof[0] = str->getChar();
+- eof[1] = str->getChar();
+- eof[2] = str->getChar();
+- eof[3] = str->getChar();
+- eof[4] = str->getChar();
+- eof[5] = str->getChar();
+- eof[6] = str->getChar();
+- eof[7] = '\0';
++ str->setPos(1024, -1);
++ for (int i = 0; i < 1024; i++) eof[i] = str->getChar();
++ eof[1024] = '\0';
+ if (strstr(eof, "%%EOF") == NULL)
+ {
+ error(-1, "Document does not have ending %%EOF");
+ errCode = errDamaged;
++ delete[] eof;
+ return gFalse;
+ }
++ delete[] eof;
+
+ str->setPos(pos);
+
diff --git a/kde-base/kdegraphics/kdegraphics-3.4.2-r1.ebuild b/kde-base/kdegraphics/kdegraphics-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..a84cee43d754
--- /dev/null
+++ b/kde-base/kdegraphics/kdegraphics-3.4.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.4.2-r1.ebuild,v 1.1 2005/08/05 10:50:18 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE graphics-related apps"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="gphoto2 imlib nodrm openexr opengl povray scanner tetex"
+
+DEPEND="~kde-base/kdebase-${PV}
+ >=media-libs/freetype-2
+ media-libs/fontconfig
+ gphoto2? ( media-libs/libgphoto2 )
+ scanner? ( media-gfx/sane-backends )
+ media-libs/libart_lgpl
+ media-libs/lcms
+ dev-libs/fribidi
+ imlib? ( media-libs/imlib )
+ virtual/ghostscript
+ media-libs/tiff
+ openexr? ( >=media-libs/openexr-1.2 )
+ povray? ( media-gfx/povray
+ virtual/opengl )"
+
+RDEPEND="${DEPEND}
+ app-text/xpdf
+ tetex? (
+ || ( >=app-text/tetex-2
+ app-text/ptex
+ app-text/cstetex
+ app-text/dvipdfm ) )"
+
+DEPEND="${DEPEND}
+ dev-util/pkgconfig"
+
+src_unpack() {
+ kde_src_unpack
+
+ # Fix detection of gocr (kde bug 90082).
+ epatch "${FILESDIR}/kdegraphics-3.4.1-gocr.patch"
+
+ # Fix regression in kpdf (kde bug 110000). Applied for 3.4.3.
+ epatch "${FILESDIR}/kdegraphics-3.4.2-kpdf-fix.patch"
+
+ # Fix compilation with gcc4. Applied for 3.5.
+ epatch "${FILESDIR}/kdegraphics-3.4-gcc4.patch"
+
+ # Configure patch. Applied for 3.5.
+ epatch "${FILESDIR}/kdegraphics-3.4-configure.patch"
+
+ # For the configure patch.
+ make -f admin/Makefile.common
+}
+
+src_compile() {
+ if use gphoto2; then
+ myconf="${myconf} --with-kamera \
+ --with-gphoto2-includes=/usr/include/gphoto2 \
+ --with-gphoto2-libraries=/usr/lib/gphoto2"
+ else
+ myconf="${myconf} --without-kamera"
+ fi
+
+ use scanner || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kooka libkscan"
+ use povray || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpovmodeler"
+
+ myconf="${myconf} $(use_with imlib) $(use_enable !nodrm kpdf-drm)
+ $(use_with openexr)"
+
+ kde_src_compile
+}