From: Maciej Mrozowski <reavertm@gentoo.org>
Date: Fri, 11 Jun 2010 02:46:35 +0000 (+0000)
Subject: Initialize jpeg_transform_info struct, bug 314613
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5b8bef5e13cac4b6766b6222db1176b8cc7662fb;p=gentoo.git

Initialize jpeg_transform_info struct, bug 314613
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/kde-base/gwenview/ChangeLog b/kde-base/gwenview/ChangeLog
index 6bc56644dee2..d62d6b6043ba 100644
--- a/kde-base/gwenview/ChangeLog
+++ b/kde-base/gwenview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/gwenview
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/ChangeLog,v 1.63 2010/06/06 14:41:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/ChangeLog,v 1.64 2010/06/11 02:46:34 reavertm Exp $
+
+*gwenview-4.4.4-r1 (11 Jun 2010)
+
+  11 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -gwenview-4.4.4.ebuild, +gwenview-4.4.4-r1.ebuild,
+  +files/gwenview-4.4.4-jpeg.patch:
+  Initialize jpeg_transform_info struct, bug 314613
 
 *gwenview-4.4.4 (06 Jun 2010)
 
diff --git a/kde-base/gwenview/Manifest b/kde-base/gwenview/Manifest
index 23eb74992e20..9e01a8c1233d 100644
--- a/kde-base/gwenview/Manifest
+++ b/kde-base/gwenview/Manifest
@@ -1,8 +1,9 @@
+AUX gwenview-4.4.4-jpeg.patch 635 RMD160 1695873c991008a09fb40fa826e79bf2d85aa228 SHA1 29c5a325d6a1d62f65d9aad411a867d940f823a1 SHA256 531b857de3bf7282e7cbeb66789c17a5bb25c3904f0e1cb53a6b845ee446abd8
 DIST kdegraphics-4.3.3.tar.bz2 3621439 RMD160 2b9a02cbefb07bb2191eaf94b8f078f43ef2e393 SHA1 f3d3155a6edf4fbf39e4dc07d9a6a52965f3f344 SHA256 f846d42d26cf5a3aad711ea1d1f05871f6467e8f5ecc6ca0722daa41719b396d
 DIST kdegraphics-4.3.5.tar.bz2 3621398 RMD160 4ff533350eae5df929a7f02a2f545af348783eeb SHA1 f8cb6afe5df3e548dafc0d0757bdc635675f85e8 SHA256 aa5a8783f56906c4569604687fd2fdc196b17dcda59659adcc60b4bca1710fd8
 DIST kdegraphics-4.4.4.tar.bz2 3822181 RMD160 f3c5790fd05a82f86d39627bcfc45237b9f5e91a SHA1 cdec759477af915fe661b4a4e605708cdb2eebd8 SHA256 c1d6a16903188325465356dbc7af6ebb2d5a84beac92adbbe264de3b9856f9b3
 EBUILD gwenview-4.3.3.ebuild 1128 RMD160 807b2ad354063f6d01bec564d37248c8b321706c SHA1 9223e875212a2e34a68bf1a94fb4b589f53a97fb SHA256 9c1c3a726472e9da50bc6b1d03162602807be7a85de57c35f8da363bbcf817c4
 EBUILD gwenview-4.3.5.ebuild 1056 RMD160 2e85982e284a2714e96ff5e73b56b3e47f74ce9f SHA1 427feb55df7d66741d23884c5b29f66fe8ba0235 SHA256 7a2284477072ca677d518c6f52868b27c416c40dfa3528942aae95824740d7e2
-EBUILD gwenview-4.4.4.ebuild 1060 RMD160 46cb5a25140a8ea10d65ca7e8c3be77f3f20bf93 SHA1 eff174b0cc6c506e1ac7325e991dcf0698e9cb5d SHA256 c197ef8a5a141751b218d5d82e46d800bc8d7d7fd6242df23ff64560017d79d0
-MISC ChangeLog 8255 RMD160 b89191d5085b3447efbb534efe1498f4a4dbfd30 SHA1 4c46f6f0e15e6ae8752696820eb029f17767f2c8 SHA256 289179012c64cdd41fb426dd625a182a0884236f59f83cf876880c595795e736
+EBUILD gwenview-4.4.4-r1.ebuild 1113 RMD160 4efd3f25df8d0cff07fe7c787672581af39f5de8 SHA1 20d42c9b34190d93c86416df52548eea473ad242 SHA256 b1e5c0dfb412c5c45f26433bc5563e9baaca4cafae25a6ef42e1c56c5b112457
+MISC ChangeLog 8484 RMD160 1fef4f5daa1476953ee805c5efec63ffbc11dd92 SHA1 e43ae7764edb3b26e95c84598f819645e81c6f25 SHA256 886f8c7722f5d8f4259434d5c82d101cb8bee9b59a9a3367c98af130242074e7
 MISC metadata.xml 239 RMD160 b218b61258c1ece22447d55118fe7ff55e99a00f SHA1 35300419c890900492c7accf7a1cacd20c1100ab SHA256 ebd8c616ad3cd4d1f1f9b5b1f2bba51432942a82e2138c687e4ad25b5fcbe5b1
diff --git a/kde-base/gwenview/files/gwenview-4.4.4-jpeg.patch b/kde-base/gwenview/files/gwenview-4.4.4-jpeg.patch
new file mode 100644
index 000000000000..202eae6660f3
--- /dev/null
+++ b/kde-base/gwenview/files/gwenview-4.4.4-jpeg.patch
@@ -0,0 +1,15 @@
+Index: kdegraphics/gwenview/lib/jpegcontent.cpp
+===================================================================
+--- kdegraphics/gwenview/lib/jpegcontent.cpp	(Revision 1098733)
++++ kdegraphics/gwenview/lib/jpegcontent.cpp	(Revision 1098734)
+@@ -455,9 +455,8 @@
+ 
+ 	// Init transformation
+ 	jpeg_transform_info transformoption;
++	memset(&transformoption, 0, sizeof(jpeg_transform_info));
+ 	transformoption.transform = findJxform(d->mTransformMatrix);
+-	transformoption.force_grayscale = false;
+-	transformoption.trim = false;
+ 	jtransform_request_workspace(&srcinfo, &transformoption);
+ 
+ 	/* Read source file as DCT coefficients */
diff --git a/kde-base/gwenview/gwenview-4.4.4.ebuild b/kde-base/gwenview/gwenview-4.4.4-r1.ebuild
similarity index 90%
rename from kde-base/gwenview/gwenview-4.4.4.ebuild
rename to kde-base/gwenview/gwenview-4.4.4-r1.ebuild
index d9e6737c9d0a..8927c4cd1331 100644
--- a/kde-base/gwenview/gwenview-4.4.4.ebuild
+++ b/kde-base/gwenview/gwenview-4.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/gwenview-4.4.4.ebuild,v 1.1 2010/06/06 14:41:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/gwenview-4.4.4-r1.ebuild,v 1.1 2010/06/11 02:46:35 reavertm Exp $
 
 EAPI="3"
 
@@ -22,6 +22,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.4-jpeg.patch"
+)
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with semantic-desktop Soprano)