Added an upstream patch to fix compilation with openexr-1.6.0 as per bug 189798.

Package-Manager: portage-2.1.3.7

5 files changed, 57 insertions, 20 deletions

diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 9a3475d196eb..61a411ecbcef 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.314 2007/08/23 17:40:16 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.315 2007/08/28 20:39:08 philantrop Exp $
+
+  28 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kdegraphics-kfile-plugins-3.5.7-openexr-1.6.0.patch,
+  kdegraphics-3.5.7-r1.ebuild, kdegraphics-3.5.7-r2.ebuild:
+  Added an upstream patch to fix compilation with openexr-1.6.0 as per bug
+  189798.
 
 *kdegraphics-3.5.7-r2 (23 Aug 2007)
 
diff --git a/kde-base/kdegraphics/Manifest b/kde-base/kdegraphics/Manifest
index 7ffbc968087d..b3af8f3ec9d6 100644
--- a/kde-base/kdegraphics/Manifest
+++ b/kde-base/kdegraphics/Manifest
@@ -5,6 +5,10 @@ AUX kamera-3.5.6-download-fix.diff 2659 RMD160 e3a753d083e92d6860da3fb4bc31600d5
 MD5 86d990a4ae4ad2dd010fd3206ef47ba5 files/kamera-3.5.6-download-fix.diff 2659
 RMD160 e3a753d083e92d6860da3fb4bc31600d5499cfe8 files/kamera-3.5.6-download-fix.diff 2659
 SHA256 36a88e64c3664488f272aae8fb481d9fb7c1a0fc95dcc5a21a17be2e686b80d2 files/kamera-3.5.6-download-fix.diff 2659
+AUX kdegraphics-kfile-plugins-3.5.7-openexr-1.6.0.patch 718 RMD160 af6cb5662e73a7d051ea87015189f328554a0878 SHA1 0aaac33f314b545204a9e732ed12dfdc5d02388d SHA256 7efb833afeb35b1f9246581f04556d9ffa1f3815cf676e91f5803e34a2d40535
+MD5 26fbad34d48ae375772006ac931db13c files/kdegraphics-kfile-plugins-3.5.7-openexr-1.6.0.patch 718
+RMD160 af6cb5662e73a7d051ea87015189f328554a0878 files/kdegraphics-kfile-plugins-3.5.7-openexr-1.6.0.patch 718
+SHA256 7efb833afeb35b1f9246581f04556d9ffa1f3815cf676e91f5803e34a2d40535 files/kdegraphics-kfile-plugins-3.5.7-openexr-1.6.0.patch 718
 AUX kpdf-3.5.7-hash_path.diff 443 RMD160 e9e45aa4955fe8c0118ce2b4d1322c5ebd557e60 SHA1 804d2b7824815e949e31114fd1ca6b311dbcdfa6 SHA256 8641659f9f43612d53ea68906fdefac01ebdd221e84c5d50ebdcb2b8ce61027b
 MD5 a4c57f5b3b43eefe35bf543c1237a632 files/kpdf-3.5.7-hash_path.diff 443
 RMD160 e9e45aa4955fe8c0118ce2b4d1322c5ebd557e60 files/kpdf-3.5.7-hash_path.diff 443
@@ -50,22 +54,22 @@ EBUILD kdegraphics-3.5.6.ebuild 2238 RMD160 c7664779cadd27732f7c63be6333c1b4dc3a
 MD5 c416f9c09ca10e56e9589d6470afde26 kdegraphics-3.5.6.ebuild 2238
 RMD160 c7664779cadd27732f7c63be6333c1b4dc3a7d01 kdegraphics-3.5.6.ebuild 2238
 SHA256 c4c7034c3ad1ce61388627c429e64cbcb5c8ad4958373de2c91724c0e532b11a kdegraphics-3.5.6.ebuild 2238
-EBUILD kdegraphics-3.5.7-r1.ebuild 2139 RMD160 8316bdf434bbcec573c3775d9fa8bbd047e26649 SHA1 80c2fa7399699c10fdeaea77c3c61cdb5d2d9b09 SHA256 3fa03dd929b11730901c5dda4ab54f895887c08665a97783f7fd00be0749244a
-MD5 79f69e09500a2143b996401c6a65b148 kdegraphics-3.5.7-r1.ebuild 2139
-RMD160 8316bdf434bbcec573c3775d9fa8bbd047e26649 kdegraphics-3.5.7-r1.ebuild 2139
-SHA256 3fa03dd929b11730901c5dda4ab54f895887c08665a97783f7fd00be0749244a kdegraphics-3.5.7-r1.ebuild 2139
-EBUILD kdegraphics-3.5.7-r2.ebuild 2191 RMD160 ace26f26e3491a7960adb815b455b8264b5af01a SHA1 071c4de06f5ef7afdda149bdf41e861c939b4093 SHA256 7435ee4f41839c50e95cd9363988e28853b3e1255191c41cb26d947f0c900060
-MD5 b180f0b7ecfd7345cec7e4eafe53e8c8 kdegraphics-3.5.7-r2.ebuild 2191
-RMD160 ace26f26e3491a7960adb815b455b8264b5af01a kdegraphics-3.5.7-r2.ebuild 2191
-SHA256 7435ee4f41839c50e95cd9363988e28853b3e1255191c41cb26d947f0c900060 kdegraphics-3.5.7-r2.ebuild 2191
+EBUILD kdegraphics-3.5.7-r1.ebuild 2213 RMD160 2649d08806c12ad2ad38e76cfd706a5fec67a721 SHA1 01becd71734241b5f66766ccbd52eb316e460910 SHA256 9ec86adca252fa71ad62169fc3dc4d6f1120fe96d232227c594c7bf9af0537cb
+MD5 b786ddf833fbf3f3e0df230f60f62dcc kdegraphics-3.5.7-r1.ebuild 2213
+RMD160 2649d08806c12ad2ad38e76cfd706a5fec67a721 kdegraphics-3.5.7-r1.ebuild 2213
+SHA256 9ec86adca252fa71ad62169fc3dc4d6f1120fe96d232227c594c7bf9af0537cb kdegraphics-3.5.7-r1.ebuild 2213
+EBUILD kdegraphics-3.5.7-r2.ebuild 2257 RMD160 eac9a0283a08a50dd04ec9fba0c83980891654ed SHA1 891980fd7919c7b9ffe9fc8022328dc65f0a7f90 SHA256 e373d9ba7207ffded102a5a2245e6bcf7a9e386fe8d7dcc28772acb0795470ba
+MD5 327a800481e4b993efbcf107cd84116d kdegraphics-3.5.7-r2.ebuild 2257
+RMD160 eac9a0283a08a50dd04ec9fba0c83980891654ed kdegraphics-3.5.7-r2.ebuild 2257
+SHA256 e373d9ba7207ffded102a5a2245e6bcf7a9e386fe8d7dcc28772acb0795470ba kdegraphics-3.5.7-r2.ebuild 2257
 EBUILD kdegraphics-3.5.7.ebuild 2081 RMD160 28aa1687f2613637b1dcc00eeda3398f94f8f521 SHA1 d2fded3c0d5b8064906536463dc895ae6bc94059 SHA256 209cb9a725e46809d4ddeaa916526d7789b653a512dbeae219e30e3bcf634e82
 MD5 7b53a281271a28dddc612310f411bb4c kdegraphics-3.5.7.ebuild 2081
 RMD160 28aa1687f2613637b1dcc00eeda3398f94f8f521 kdegraphics-3.5.7.ebuild 2081
 SHA256 209cb9a725e46809d4ddeaa916526d7789b653a512dbeae219e30e3bcf634e82 kdegraphics-3.5.7.ebuild 2081
-MISC ChangeLog 45097 RMD160 74a087f891ad97d263da161634e3dcee4b448aee SHA1 a1e8c70bb8833f9de6162dd9aeac794159850364 SHA256 372ca58ad3f3a27d0a2527cf3b37ada131240e0e4e66903fb41f6e210e3f5224
-MD5 72438d36d0fad0b2d6563b910b969627 ChangeLog 45097
-RMD160 74a087f891ad97d263da161634e3dcee4b448aee ChangeLog 45097
-SHA256 372ca58ad3f3a27d0a2527cf3b37ada131240e0e4e66903fb41f6e210e3f5224 ChangeLog 45097
+MISC ChangeLog 45360 RMD160 5df78981fe271f296cc17520d99ccba4b948f0f6 SHA1 86bffbf9e947322db70b4389cfc87aa78391b23a SHA256 15ef13ee826f4a6c07a97d7d3a3c6b655c2c20aae8a6797465afbbde9adf4c83
+MD5 2c434a08290e2bdd2ae271fbd96b1563 ChangeLog 45360
+RMD160 5df78981fe271f296cc17520d99ccba4b948f0f6 ChangeLog 45360
+SHA256 15ef13ee826f4a6c07a97d7d3a3c6b655c2c20aae8a6797465afbbde9adf4c83 ChangeLog 45360
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -100,7 +104,7 @@ SHA256 966352b87e403830c2a5583b276692e95d2fd1f2adfcca35e442eea893c7dc30 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGzcaHCkvF58q80IkRAi1xAJ9Aemfjf5q+Gw/3sdPRUbypNJFC3wCdEMkk
-M/itovyf3EMZ7qQixnAtwAE=
-=kcPf
+iD8DBQFG1If0CkvF58q80IkRAlEHAJ46gNEWpcShGhfLHGqHrD3+o4BJoQCfcFsa
+A3rXv8yx3shW9D2IOnRWeWI=
+=hKiu
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdegraphics/files/kdegraphics-kfile-plugins-3.5.7-openexr-1.6.0.patch b/kde-base/kdegraphics/files/kdegraphics-kfile-plugins-3.5.7-openexr-1.6.0.patch
new file mode 100644
index 000000000000..de82dba73000
--- /dev/null
+++ b/kde-base/kdegraphics/files/kdegraphics-kfile-plugins-3.5.7-openexr-1.6.0.patch
@@ -0,0 +1,25 @@
+--- kfile-plugins/exr/kfile_exr.cpp
++++ kfile-plugins/exr/kfile_exr.cpp
+@@ -32,6 +32,7 @@
+ #include <ImfVecAttribute.h>
+ #include <ImfPreviewImage.h>
+ #include <ImfVersion.h>
++#include <ImfCRgbaFile.h>
+ 
+ #include <iostream>
+ 
+@@ -226,7 +227,14 @@
+ 			qcapDateString.setLength(capDateString.size());
+ 			appendItem( stdgroup, "Capture Date", qcapDateString );
+ 		}
++		// This define was introduced in EXR 1.6.0
++#ifndef IMF_B44_COMPRESSION
++		// This is the 1.4 and earlier version
+ 		if ( hasutcOffset(h) ) {
++#else
++		// This is the 1.6.0 and later version
++		if ( hasUtcOffset(h) ) {
++#endif
+ 			QString UTCOffset;
+ 			if (utcOffset(h)>0.0) {
+ 				UTCOffset.append(QString("%1").arg(utcOffset(h)/3600, 0, 'f', 1));
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.7-r1.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.7-r1.ebuild
index 5c79f0f93bf3..3ce47ae1ca55 100644
--- a/kde-base/kdegraphics/kdegraphics-3.5.7-r1.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.5.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.7-r1.ebuild,v 1.9 2007/08/15 05:20:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.7-r1.ebuild,v 1.10 2007/08/28 20:39:08 philantrop Exp $
 
 inherit kde-dist eutils
 
@@ -33,7 +33,8 @@ RDEPEND="${DEPEND}
 		 app-text/cstetex
 		 app-text/dvipdfm ) )"
 
-PATCHES="${FILESDIR}/post-3.5.7-kdegraphics-CVE-2007-3387.diff"
+PATCHES="${FILESDIR}/post-3.5.7-kdegraphics-CVE-2007-3387.diff
+		${FILESDIR}/kdegraphics-kfile-plugins-3.5.7-openexr-1.6.0.patch"
 
 pkg_setup() {
 	kde_pkg_setup
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.7-r2.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.7-r2.ebuild
index 566b5836512b..b450289e6fb4 100644
--- a/kde-base/kdegraphics/kdegraphics-3.5.7-r2.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.5.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.7-r2.ebuild,v 1.1 2007/08/23 17:40:16 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.7-r2.ebuild,v 1.2 2007/08/28 20:39:08 philantrop Exp $
 
 inherit kde-dist eutils
 
@@ -34,7 +34,8 @@ RDEPEND="${DEPEND}
 		app-text/dvipdfm ) )"
 
 PATCHES="${FILESDIR}/post-3.5.7-kdegraphics-CVE-2007-3387.diff
-		${FILESDIR}/kpdf-3.5.7-hash_path.diff"
+		${FILESDIR}/kpdf-3.5.7-hash_path.diff
+		${FILESDIR}/kdegraphics-kfile-plugins-3.5.7-openexr-1.6.0.patch"
 
 pkg_setup() {
 	kde_pkg_setup