Added upstream build fix for exiv2 api breakage (bug 349206)

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

4 files changed, 122 insertions, 15 deletions

diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog
index d2500764203f..69b41467bd13 100644
--- a/app-office/krita/ChangeLog
+++ b/app-office/krita/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/krita
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.124 2010/11/16 23:21:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.125 2010/12/23 00:08:17 dilfridge Exp $
+
+*krita-2.2.2-r1 (23 Dec 2010)
+
+  23 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  +krita-2.2.2-r1.ebuild, +files/krita-2.2.2-exiv2.patch:
+  Added upstream build fix for exiv2-0.21 api breakage
 
   16 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org>
   -krita-2.1.0.ebuild:
diff --git a/app-office/krita/Manifest b/app-office/krita/Manifest
index ca2e92086edd..a7d93ed415bd 100644
--- a/app-office/krita/Manifest
+++ b/app-office/krita/Manifest
@@ -4,27 +4,29 @@ Hash: SHA1
 AUX krita-2.1.0-opengl.patch 425 RMD160 957b1df959402314f5e5b2167d2c16ed8e32c960 SHA1 4f8fb8deea43a3303b5457dceecd1b330da23027 SHA256 aa7d65328462b8aefcd48da6ff2fe5571ef512c886448eadf9e44869a67ff565
 AUX krita-2.1.1-libpng14.patch 327 RMD160 9ec9c492d456d388b8d944b4a40e360693dd8605 SHA1 941850dc8485729edf3296cfd7bace6c1b56414c SHA256 93ef65c7da0e8f5d480ec90424e16e44c82068e7db5218ff4910f8e9a3b19b46
 AUX krita-2.1.2-gcc45.patch 3664 RMD160 f9e0766045b53102a6531b4aeec4f4a5be3a252d SHA1 b70b997572d5ff01e87b244c5f112e402794d72e SHA256 a054443342b5001f62f17fa5f1b705d160fb5cfca4f21b0265bad5ac9f1e067b
+AUX krita-2.2.2-exiv2.patch 2478 RMD160 799b173fd19096246e417427e67655584ba3d765 SHA1 7be5c485e72d856cd2f5233f0d7ed890bfb2e894 SHA256 6244d428ca3353d101e1d7cbe527d9ba4092028f0786bbefffcbc9d0a2c53e80
 AUX krita-2.2.2-xlibs.patch 595 RMD160 9c2fb5b5b1bec960bb8dae0b1073fee5d54d7de2 SHA1 0d881f3811e2b759d3a7405387e9c42e5d9ee62d SHA256 9d01cf6a68d904816eca84718d85dc49527a3099b583532f839fd2a29733de05
 DIST koffice-2.1.2.tar.bz2 50359739 RMD160 20f3b162d49cbd70492c597aec2d79cb3de5a2d7 SHA1 29f5b5e611408ac2a2e68352cb64299b78d83094 SHA256 64233bb7b5b18813a9da46ab0c347170904611b59480b91297db4c3deb14b7da
 DIST koffice-2.2.2.tar.bz2 56470974 RMD160 bdd75cb056e2fa96b799eeec0ecb5ed6b6aef4c2 SHA1 ab6405e0efae0d8e895879183f1369facae410e0 SHA256 e5b060f640dd7ecd13b5d17f7e9ace7c0d1c0621e5fb83529f6e6db2d5c1edcb
 EBUILD krita-2.1.2.ebuild 1353 RMD160 fba15179190639df777983d4b5b0a886615bac2c SHA1 19ec0bb7da1ca38955844e0bfbb169428b849fe7 SHA256 8362e4290772bf323eb2d29cc35ec5d319c8a86de6b119c8fe8307b17eca3a8c
+EBUILD krita-2.2.2-r1.ebuild 1345 RMD160 e2369139ff1caaaaf48f87d96a4223bd05fe9132 SHA1 a6aea953b9659ec1757a4d9536ca3a4cba04345b SHA256 9632613d0008335040304ae138c454680d0fc28c4c84c4ea6084d0a9929c38f1
 EBUILD krita-2.2.2.ebuild 1331 RMD160 60b682e94d3210112dfc7d00808581e6f3f1ff68 SHA1 18237bf66d91661efc1db07c0a272ba15e1d548f SHA256 7e06250ee07a6192a97b18e42669ff62065a2582927c4442d6799c33a3274ad8
-MISC ChangeLog 14978 RMD160 6dd006a2405bf52ba1c4704a465943170d07463e SHA1 753f8fc21a4774cad97536b9852b42e7cbc1a2a5 SHA256 c954c6e09333eb968fa5ec3b637d7ea0b5cf8e594298970b8ffae840144f8b0c
+MISC ChangeLog 15180 RMD160 42be3f17e406b3b9cae154c8401ba22196c1e710 SHA1 00d7dad6bd88d97b923c4f3e8054912fe9d19f67 SHA256 437bf20b30a4ff7bb48661395066fb91a7dec93365e5bb175d578979dd366daf
 MISC metadata.xml 379 RMD160 645c35ed94997af82a8575a07787eb097b2793f4 SHA1 27de1f0e93c2ab13086610395f5868cdd2a7a917 SHA256 cb16908b934ceaa242edba6fcdec7a187f5c8ae6fba345fc131bbb64cd11204c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJM4xCYAAoJENwGBM22xffepD8P/2UErLs8wRhg6oK5lVLNu5zA
-KIcJsq0XqUIBmo+IeGTi7npB3amcoBQy7AuUCp8ZgHJS4yF0wCN5f7RBW7CctVaA
-2YKqsQKxfdeJav+nOmYG5Y52m7JVzeH97VreHBBy/+5NTJOfZuPawhJAC9/n1/4b
-VM5BrHJb1EIlFdUoggXPXeg3u/JgpHRbdkMZv4ySIi3q86qj8mlLpQd7huGuWE3X
-FfS9kz9aPuWAGiiXmXB7+WAiT1BksJy4bBPQPFGRL2MtlYfheIyR0eGWhnj6tZRk
-ERrQRd8gZFTz67FZ6yfyQ97/aTpvvWvui88jiAodhzjnmsG4Wddx8ue/t/BekG8n
-cCpce0RyjEgtNdFuVfnz8iGZ3NZsFobG+iSGMMgcHbRq8bjYQP8sCcSnVsStfMpt
-FCAfa8JRmuNImukxDnVaen3naoEe8iK9CZB+Dz9jBb034ryETBORYnTY4E6dB/tJ
-8FsVYHf4JvXLRNUskYUdMrLS9RMh427Q9WTU/mDkG7dv+v7RcxWFlxuAmMeWeTNE
-SWBmoS+mhehv8r818A79lc6DPai27bGx1YKFE2Pxp4GKGGp+vNYtELxSXCkqS5nS
-PUjWpBh2TDYlUPOFsNP1gMO65sE+vdLKwesAGn+QlAIFXeKYSfvz4KDBZrjjLEDT
-YPl+FbrPjiDf91aq1UN4
-=ew4g
+iQIcBAEBAgAGBQJNEpLVAAoJENwGBM22xffeadIP/i6HCSof+d3jYdqgVbfaeDqL
+lbPKDG+5glvYbe0EwOjQLfWBsYcfhamb95NGGvJGTXiI/5YeezEqKmlVp/DRHpal
+Lk9vgmNh0oHmJ86pXGIG6sH2Atm/kw5uR+l++QSP7Kd9Xccwc0av8ynGv6DJ3GIh
+Acb1pElmzmsidH4dNxvwZBA9yRQ8lB9rrjY089TzvHkuTLHanfuvKAENwd+Z/IbL
+tXPHXe9Lv+nuzmjLCj5II7A4XVM5H2L0O/GPgdPHLRcYZf3a2wpXitHX3yuscD07
+p9v7iOYXXwD6uNkF9XExViPkUD7jYtgBzkFu1+D5AvyJ2Yk6BFVzoD+cYDlcSVkw
+OpvA9F/avdGiGlVEvCrvudoM3dqFRY8cS9tmttNnG7TiLlNFNC/mgwNBFku6MT6D
+hW91RzsUbJ5TaJ6voi2u49csBDWZvGboZ++7KwKnlW/Qa2tSxKmDrAWvqGFSuJLq
+l0HzLHj30xZhJLE8+0+F3aE1Xy+gq5RX1Hfm1vgvcPdyxrcm6OO1KukfHOVPm+sj
+weHnNh9+KHYK1/tYVqn1gsOPBXJ9Tte/vzI8gGmRSi5KEnvfMQfxjs9g+8dAn4TN
+qMOpK7TLQMKEv7a2Bv/yrguG15AOpcej4koIG5YdhnUXB00byXM4b97DotwVlEgV
+u8LniacrA/roORmQaqNC
+=jz0C
 -----END PGP SIGNATURE-----
diff --git a/app-office/krita/files/krita-2.2.2-exiv2.patch b/app-office/krita/files/krita-2.2.2-exiv2.patch
new file mode 100644
index 000000000000..0b29f8d187c6
--- /dev/null
+++ b/app-office/krita/files/krita-2.2.2-exiv2.patch
@@ -0,0 +1,42 @@
+diff --git a/krita/ui/kisexiv2/kis_exif_io.cpp b/krita/ui/kisexiv2/kis_exif_io.cpp
+index 6eb7f30..c85da65 100644
+--- a/krita/ui/kisexiv2/kis_exif_io.cpp
++++ b/krita/ui/kisexiv2/kis_exif_io.cpp
+@@ -406,7 +406,11 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
+                 v = kmdIntOrderedArrayToExifArray(entry.value());
+             } else if (exivKey == "Exif.Image.Artist") { // load as dc:creator
+                 KisMetaData::Value creator = entry.value().asArray()[0];
++#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
+                 v = kmdValueToExivValue(creator, Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
++#else
++                v = kmdValueToExivValue(creator, exifKey.defaultTypeId());
++#endif
+             } else if (exivKey == "Exif.Photo.OECF") {
+                 v = kmdOECFStructureToExifOECF(entry.value());
+             } else if (exivKey == "Exif.Photo.DeviceSettingDescription") {
+@@ -419,13 +423,25 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
+                 Q_ASSERT(entry.value().type() == KisMetaData::Value::LangArray);
+                 QMap<QString, KisMetaData::Value> langArr = entry.value().asLangArray();
+                 if (langArr.contains("x-default")) {
++#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
+                     v = kmdValueToExivValue(langArr.value("x-default"), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
++#else
++                    v = kmdValueToExivValue(langArr.value("x-default"), exifKey.defaultTypeId());
++#endif
+                 } else if (langArr.size() > 0) {
++#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
+                     v = kmdValueToExivValue(langArr.begin().value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
++#else
++                    v = kmdValueToExivValue(langArr.begin().value(), exifKey.defaultTypeId());
++#endif
+                 }
+             } else {
+                 dbgFile << exifKey.tag();
++#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
+                 v = kmdValueToExivValue(entry.value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
++#else
++                v = kmdValueToExivValue(entry.value(), exifKey.defaultTypeId());
++#endif
+             }
+             if (v && v->typeId() != Exiv2::invalidTypeId) {
+                 dbgFile << "Saving key" << exivKey; // << " of KMD value" << entry.value();
diff --git a/app-office/krita/krita-2.2.2-r1.ebuild b/app-office/krita/krita-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..48d385a1a07d
--- /dev/null
+++ b/app-office/krita/krita-2.2.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.2.2-r1.ebuild,v 1.1 2010/12/23 00:08:17 dilfridge Exp $
+
+EAPI="2"
+
+KMNAME="koffice"
+KMMODULE="${PN}"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="KOffice image manipulation program."
+
+KEYWORDS="~amd64 ~x86"
+IUSE="gmm +kdcraw openexr +pdf +tiff"
+
+DEPEND="
+	>=app-office/koffice-libs-${PV}:${SLOT}[openexr=]
+	>=dev-cpp/eigen-2.0.3:2
+	>=media-libs/qimageblitz-0.0.4
+	>=media-gfx/exiv2-0.16
+	gmm? ( sci-mathematics/gmm )
+	kdcraw? ( >=kde-base/libkdcraw-${KDE_MINIMAL} )
+	opengl? ( media-libs/glew )
+	pdf? ( >=app-text/poppler-0.12.3-r3[qt4] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}"-{xlibs,exiv2}.patch )
+
+KMEXTRACTONLY="libs/"
+
+KMLOADLIBS="koffice-libs"
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_Eigen2=ON
+		-DWITH_Exiv2=ON
+		-DWITH_JPEG=ON
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with gmm)
+		$(cmake-utils_use_with tiff)
+		$(cmake-utils_use_with kdcraw)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with opengl GLEW)
+	)
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	# this is already installed by koffice-data
+	rm -f "${D}/usr/include/config-opengl.h"
+}