Don't save corrupt png files.

Package-Manager: portage-2.1.2_pre3-r6

4 files changed, 98 insertions, 1 deletions

diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog
index 7665ef9e3f6a..03bda1794d7d 100644
--- a/app-office/krita/ChangeLog
+++ b/app-office/krita/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/krita
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.59 2006/10/19 16:40:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.60 2006/10/22 16:34:11 carlo Exp $
+
+*krita-1.6.0-r1 (22 Oct 2006)
+
+  22 Oct 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/krita-1.6.0-corrupt_png_save.diff, +krita-1.6.0-r1.ebuild:
+  Don't save corrupt png files.
 
 *krita-1.6.0 (19 Oct 2006)
 
diff --git a/app-office/krita/files/digest-krita-1.6.0-r1 b/app-office/krita/files/digest-krita-1.6.0-r1
new file mode 100644
index 000000000000..2e01d4cedd36
--- /dev/null
+++ b/app-office/krita/files/digest-krita-1.6.0-r1
@@ -0,0 +1,3 @@
+MD5 e669cf19b2e1c7db7029c0772c527c0d koffice-1.6.0.tar.bz2 56718478
+RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c koffice-1.6.0.tar.bz2 56718478
+SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2 koffice-1.6.0.tar.bz2 56718478
diff --git a/app-office/krita/files/krita-1.6.0-corrupt_png_save.diff b/app-office/krita/files/krita-1.6.0-corrupt_png_save.diff
new file mode 100644
index 000000000000..471650ceec6c
--- /dev/null
+++ b/app-office/krita/files/krita-1.6.0-corrupt_png_save.diff
@@ -0,0 +1,13 @@
+Index: filters/krita/png/kis_png_converter.cc
+===================================================================
+--- filters/krita/png/kis_png_converter.cc	(revision 598005)
++++ filters/krita/png/kis_png_converter.cc	(revision 598006)
+@@ -123,7 +123,7 @@
+ 
+ class KisPNGStream {
+     public:
+-        KisPNGStream(Q_UINT8* buf,  Q_UINT32 depth ) : m_posinc(8),m_depth(depth), m_buf(buf) {};
++        KisPNGStream(Q_UINT8* buf,  Q_UINT32 depth ) : m_posinc(8),m_depth(depth), m_buf(buf) { *m_buf = 0;};
+         int nextValue()
+         {
+             if( m_posinc == 0)
diff --git a/app-office/krita/krita-1.6.0-r1.ebuild b/app-office/krita/krita-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..230ad78d54a8
--- /dev/null
+++ b/app-office/krita/krita-1.6.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-1.6.0-r1.ebuild,v 1.1 2006/10/22 16:34:11 carlo Exp $
+
+MAXKOFFICEVER=${PV}
+KMNAME=koffice
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice image manipulation program."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+# See bug #130442.
+#IUSE="opengl"
+IUSE=""
+
+DEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
+	>=media-gfx/imagemagick-6.2.5.5
+	>=media-libs/lcms-1.15
+	media-libs/tiff
+	media-libs/jpeg
+	>=media-libs/openexr-1.2.2-r2
+	media-libs/libpng
+	>=media-libs/libexif-0.6.13-r1
+	virtual/opengl
+	virtual/glu"
+
+#opengl? ( virtual/opengl virtual/glu )"
+
+KMCOPYLIB="libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkopalette lib/kopalette
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store
+	libkrossapi lib/kross/api/
+	libkrossmain lib/kross/main/"
+
+KMEXTRACTONLY="lib/"
+
+KMEXTRA="filters/krita"
+
+need-kde 3.4
+
+PATCHES="${FILESDIR}/krita-1.6.0-corrupt_png_save.diff"
+
+pkg_setup() {
+	# use opengl &&
+		if ! built_with_use =x11-libs/qt-3* opengl ; then
+			eerror "You need to build x11-libs/qt with opengl use flag enabled."
+			die
+		fi
+}
+
+src_unpack() {
+	kde-meta_src_unpack
+	# FIXME - disable broken tests for now
+	sed -i -e "s:TESTSDIR =.*:TESTSDIR=:" ${S}/krita/core/Makefile.am \
+		`ls ${S}/krita/colorspaces/*/Makefile.am`
+}
+
+src_compile() {
+#	local myconf="$(use_with opengl gl)"
+
+	for i in $(find ${S}/lib -iname "*\.ui"); do
+		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
+	done
+
+	kde-meta_src_compile
+}
\ No newline at end of file