Version bump

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

5 files changed, 246 insertions, 19 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 38edfc0694d1..fecd26ceb3c4 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.266 2014/08/15 18:58:17 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.267 2014/10/30 20:06:36 dilfridge Exp $
+
+*digikam-4.4.0 (30 Oct 2014)
+
+  30 Oct 2014; Andreas K. Huettel <dilfridge@gentoo.org> digikam-4.2.0.ebuild,
+  +digikam-4.4.0.ebuild, +files/digikam-4.4.0-libkexiv2.patch:
+  Version bump
 
 *digikam-4.2.0 (15 Aug 2014)
 
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index c2a1f0287cb4..45d3d130757d 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,28 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX digikam-4.4.0-libkexiv2.patch 1886 SHA256 66a8d2c682300d908677d7430b488de9daa4183c91aa4f4e3f7ea8e594f6a102 SHA512 9e797897f4a892d1a9e7aaa6a477a3300c7a11f170eb2a1768e89fa42009b9b30e33e2f3cc2d633b424681d9f37b2f5ecd812a90ad691359c20fd43d782f6c50 WHIRLPOOL a003726a30c9495d47d15eca45bb769ab15990ae246ef069b02c24ae2ddc5ad14158e9021cc6f89f128f338e46323555db5e47e6c2cc9dbdf296f238dd40fccd
 DIST digikam-3.5.0.tar.bz2 65698806 SHA256 57bd2aa4fdde44333d1362b02b26ebf6c1a70675bf5cb40de5172df02857c42a SHA512 d9c4651398ab85490016324ee69d1303e57e6ac646ab48ac5860d2966b3f3f0b5b4112de1d793795aef322d3dc6e7c3aba33bd2b164a084e5b65d38944fb0d73 WHIRLPOOL e7e6527270f3daf6ca97c007253793ea6e02b637f86f3355d675bfc0d562a36d5a7311d2e1be0701bc4f6119037398bbc6f2e9deb4da04f01cc008ec52679aba
 DIST digikam-4.0.0.tar.bz2 68931371 SHA256 984f7a47a3fdd5b5b30991b436848ed420fbcfffa01ffaa3abdf7202848b17ae SHA512 d76dbdc72fc5c42e2628d43bf669cce53b82e21eb5dbfa3c908740ec10f2bc949f6faba595f36e3a376f9d9c8b9db8af2c10a4921bd5b21d9c744b0bd8570661 WHIRLPOOL 55463465f2b1a6b9fa8bb9e63e1ac1fd5fa8a21f41ed94bf5a7e9ba8404ebf0cc3e4d027d51179881736a4cd40734774c2c666e7f3a4a40396230330f69b21c2
 DIST digikam-4.2.0.tar.bz2 68849613 SHA256 e86575b76672dfd0a7ed5f1d7b8b74425171804d7f16b0d743a5d2375c1c1b08 SHA512 ff9442360a343beff1643ef95f4dcff81e764a03cf18d8de800b45ca19b0a3727e59916ca0613cf4977c8e19ebc87f3f6682a48d5ab78b313b1d0189fbaa1169 WHIRLPOOL 5aee618acf79301a08d5efc30cc6a754d884b491fbf28bd555ac109b304725a8da1ff75c26af8d241414549957827665c9bf6299c030df5b7e71c74a4ca5886f
+DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
 EBUILD digikam-3.5.0.ebuild 4111 SHA256 d372538b818c5269d1cb5d69feb23d8bcc5e32a28651f3a3f0a9a0e456fa2fcb SHA512 f9973a8ee9bf0385b8b1a40c1c41c34400b1d1191228c16890d1677c77518aa63526e9330a26848bd419f28bff07081f37f02f4295aac0703f696c6ff9b0d7a3 WHIRLPOOL 37ac33b748e6f456663af60941fc995002c219e37ecd1b277d8b4b980edda017596e11b0bb3e7ee3bc4b2f60824b40ef548ca30285b06c6879798755410ac7e0
 EBUILD digikam-4.0.0.ebuild 4123 SHA256 f444ae5b2bd336fa9756764747da661dfbeddf8cec72f0b207c9803e6eccbf45 SHA512 d94f9e7f2d2d574ae33407e153955a81dbfb3d33e4e411b8ed10f5ff5d4a712d64668ea7c4024d7ed3bf5f301ee2cfa7e6790c1e8c73eb9f452f7fd710ce201f WHIRLPOOL 1cac3eee95763cc96038feb0e3b11aebef2fb02a85b1bb3d6082cf3b8ecbea132cb411dc2e921e2a734206b18866541222d3fb37109dbbfb03e7c940db07f374
-EBUILD digikam-4.2.0.ebuild 4127 SHA256 0b46bf2a20fdb51cf44e41283442d91b492b90a92865b8b67a447376bd18de94 SHA512 18929d7568c8c4c9a69850176ca548c5518146b98fa0bcba5b32bd3e77861aa1656452a3eea8224e56465f1e85aa13bd854fe2a5cdda2b5aed577f147e84329d WHIRLPOOL 048ff290d9a4736b1458fe6aea3a2680e8eefce64ece8fd41ed07d53ffa3abeb34af894ef8a1508cc5956c2ffb71536efac6c23e6dbdb779615eba985f688ff7
-MISC ChangeLog 43364 SHA256 2aff8036f6ce354913da88b5233d2fe2177130267955c66120a62f5a5e2785ef SHA512 b64078fd1cf66751e4c130abfeeb9f94089f1132a35e316d92bf51110ea95ddfb82e07adb6d928a2b589b92672f27cf53de193e1e0cb9542045a649fc2717b35 WHIRLPOOL b2b5d2c1e0bb94eb7f2c980e3706076e01baace1aa5d3c076d7fce1b67ebddc43eca65d170e56cf100be6bb92203d9b9db54a0e32ff6ba56c7840f4ec6527a45
+EBUILD digikam-4.2.0.ebuild 4166 SHA256 8534ed16ff0a5bbe6312dcd7715b9460d5d4c8f88deeedbd07a7a42875a42bdb SHA512 ca146df7927b2e773960b94f1dbc76cf8d09a6a65a20ce845cedd7984902c8dd30827a7c2bc4bc783a7f94c40ec7b57f2bd2f6bfac778b3a788ed468b341dc5d WHIRLPOOL b85cf454c8624802e4605b6c156fd6f56bf0051f64eb10025ea3e927858882397356b1705c704700ccb8d928505e07aa340ae2232a7bfb9d58c51ea771fdd4fa
+EBUILD digikam-4.4.0.ebuild 4333 SHA256 ec5b3765a88777a05cf6b38b6965f153a928ae2ef0b0ec2403957e5ef98c1ab8 SHA512 ff30494714a4e1cf90a9562c753039593a2d9c53a727bf075dfe81d0f92409854bfacb8d07bdd059d8d8b21eb76645147bd66a54ab68e23c74dd06b784afaeb5 WHIRLPOOL 1ff613beb006c2f442645c6400b94cd285330646ced6c6541b0ea2bbf506386a0011e59be5a62e48486bd21ca0e4be09a4e6dd8d880690344175df8a27e51550
+MISC ChangeLog 43557 SHA256 61010aacbc1649b207427c9ef45e1f7569b518b31fe4fb41bc26ba89a9d579b1 SHA512 5aeab3d4d7ec50c7107770e49d69e5ac66b5d2d2bc8224b5c25d1ffcb9c317f56b37aeac594b67bd2b4647fc96db80f3b9722a6250b0edbb1ff1cf473b40ca6d WHIRLPOOL dadf11f834ad57bb02758208410cbb238f13447495025df40b48bb3ff629fcc6fae6aa32c3a544ad32feea5be072340149e4028e2db343def4a7770bd731372d
 MISC metadata.xml 736 SHA256 86156e040ab866e9a95236a9e4a3943b02ed4b9309e688b0217a7449e9601613 SHA512 d19e6e93b72c8141e778c36b0cd032db08ad2a87fc8f8325a32ab5df3c457787520267a8b86cce7272590d971de835fdf647a1a84a4c7d4c656f605dfe42d01e WHIRLPOOL bcb65d07cc4325fbde7b748da9977ddccb52097398cb0ab9db9599505a477bff1c97388c8143fc747d854d42ecab534d81160cb09c9e868b7c63f7bcea3c53f9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT7lhOAAoJEGVpnaTzz9K9i5kQAI5ey/cOABtBXlD8VA9+sRxV
-oHzxR7v/PONmfhr0crQotAbrhBXZPUGC/qnmGBys30Sdxu4aU/aF2+uelRA9cR5T
-kNT1q1YTNlnDDmRmgXbNlYV0ZAAAnTom0R4gIUkJHdmI7sIKfcG4bTlko3uhwgOP
-KqpMYiPbsX6caRQQIr8LglDbUwTJJp4wyGyIupyxbX0qRzkcmP5VxY4YBRLzPJVU
-Jk1nVj46CIWWUobbJfplNpo4xNqs/gXi9Ji16gB+LxpKtw1VGMy9uySS23fTM6je
-0ATPJDDJzeVQQ6m4KPLU9zq2euSE0adqL4BbjS/mFMTd/A5yMTyKQwELN6IEDMnD
-bx4XET3BStVOyF2k7hYlL0R9Af1sHaS6gdoxe1ESVug9RiI9CQs4rMj1m1Z6Hnnc
-vFDjvgWslhQWqXJxwBIYJCgilF4yFqiE8U6wO25B4FB0lFSFTOctFSoTww6VmAba
-nEwBZoMLDhQqRWgHqyHBT4R21ISqwqdpj2PdlXZ/I5cAdOaM0vl71rbflN1rPcuw
-P4lJWSGEkOg8uMDq6+8lFfJzrQHzVOngZkLoXToSDi85l8ZtQ1Ei4z1I8wWWan15
-Ccd4CH3+rz4jS6mM+rI30eMD51y1Fhded39fHdj0DVlU916X+Eg7aqqzmU/lH4aa
-jLkrGO178LUjIL3Zxaxi
-=EuVE
+iQJ8BAEBCABmBQJUUppUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcz0YQAL95Dt+7TLoebD4cI3iUXzwC
++EOna1TasCItWol0jO5YIFr3uZgJ8Kav4qOw6t/WD32Ztjy9InRQu5Oag+EqphF2
+3Rkeu+ZD13N0+jTezE2qA4Nc+bL7GYVkX7myV1CIpI9r7oaKJ3v8ODYKE69lLe9L
+J47ad5b4o+Q/tedOkpdUB2hChBttMTYjn20K8oOkmYd/eI2VTdNQR8A/prjwDBIk
+S9Eo+mtRUg5hxvGmmQiCI2CPBc/DL9BmLIyIIBDcBCeuw2qFuwOR1Pau4HAwGCs2
+2nvrkT37A3/kP5s5ghIBLYxrA7jTcADD+tWk2GsUaTpABpQ0PdeuaTv1xmp5brik
+4hcbfwd7pRBbSO5aTzn6PqF1Jdno+LjtMHjN8kEKzWuYzl/y7ZUg3mBaT7WCa5f9
+U8ajovGCOQ28Bx+zda56ZOPSQPvTVdr8bxJeY+KhSOHchtjXg2bzansQucUM3G1A
+MwnV2PjVxv443oT1a2olc9vDF+x3ypxOduWpRReGH73eYBnqHt5mh0yVCSAS8eKN
+Zo0YLqkEvq5SA/Us7pwFuoE2SISuyvUFo1ejO5ZsbULSf6ww0Mq7dAWqbYRTtvnA
+COr4IE69iujogxoPrmtBMcd0bX57uZyjAO2tqdYLUbo2JeUlzp6PiVQzxVRUJgqM
+sX3L858xavxp2oZ7AZV1
+=Svqd
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-4.2.0.ebuild b/media-gfx/digikam/digikam-4.2.0.ebuild
index 8637679f3dfa..f270acfe5a01 100644
--- a/media-gfx/digikam/digikam-4.2.0.ebuild
+++ b/media-gfx/digikam/digikam-4.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.2.0.ebuild,v 1.1 2014/08/15 18:58:17 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.2.0.ebuild,v 1.2 2014/10/30 20:06:36 dilfridge Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
 KEYWORDS="~amd64 ~x86"
 SLOT="4"
-IUSE="addressbook debug doc gphoto2 mysql nepomuk themedesigner +thumbnails video"
+IUSE="addressbook debug doc gphoto2 mysql nepomuk test themedesigner +thumbnails video"
 
 CDEPEND="
 	$(add_kdebase_dep kdebase-kioslaves)
@@ -72,6 +72,7 @@ DEPEND="${CDEPEND}
 	dev-libs/boost
 	sys-devel/gettext
 	doc? ( app-doc/doxygen )
+	test? ( media-libs/opencv )
 "
 
 S="${WORKDIR}/${MY_P}/core"
diff --git a/media-gfx/digikam/digikam-4.4.0.ebuild b/media-gfx/digikam/digikam-4.4.0.ebuild
new file mode 100644
index 000000000000..3f89fde604c7
--- /dev/null
+++ b/media-gfx/digikam/digikam-4.4.0.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0.ebuild,v 1.1 2014/10/30 20:06:36 dilfridge Exp $
+
+EAPI=5
+
+KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl ha he hi hr hsb
+hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru
+rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
+
+KDE_HANDBOOK="optional"
+CMAKE_MIN_VERSION="2.8"
+KDE_MINIMAL="4.10"
+
+KDE_DOC_DIRS="doc-digikam doc-showfoto"
+
+inherit kde4-base
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Digital photo management application for KDE"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://kde/stable/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2
+	handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="addressbook debug doc gphoto2 mysql nepomuk semantic-desktop themedesigner +thumbnails video"
+
+CDEPEND="
+	$(add_kdebase_dep kdebase-kioslaves)
+	kde-base/libkdcraw:4=
+	kde-base/libkexiv2:4=
+	$(add_kdebase_dep libkipi)
+	kde-base/marble:4=[plasma]
+	media-libs/jasper
+	media-libs/lcms:2
+	media-libs/lensfun
+	>=media-libs/libkface-3.3.0
+	media-libs/libkgeomap
+	media-libs/liblqr
+	>=media-libs/libpgf-6.12.27
+	media-libs/libpng:0=
+	>=media-libs/opencv-2.4.9
+	media-libs/tiff
+	virtual/jpeg
+	dev-qt/qtgui:4
+	|| ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] )
+	addressbook? ( $(add_kdebase_dep kdepimlibs) )
+	gphoto2? ( media-libs/libgphoto2:= )
+	mysql? ( virtual/mysql )
+	nepomuk? (
+		dev-libs/shared-desktop-ontologies
+		dev-libs/soprano
+		$(add_kdebase_dep kdelibs 'semantic-desktop(+)')
+		$(add_kdebase_dep nepomuk-core)
+	)
+	semantic-desktop? (
+		$(add_kdebase_dep baloo)
+	)
+"
+RDEPEND="${CDEPEND}
+	$(add_kdebase_dep kreadconfig)
+	media-plugins/kipi-plugins
+	video? (
+		|| (
+			$(add_kdebase_dep mplayerthumbs)
+			$(add_kdebase_dep ffmpegthumbs)
+		)
+	)
+"
+DEPEND="${CDEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}/core"
+
+RESTRICT=test
+# bug 366505
+
+PATCHES=( "${FILESDIR}/${P}-libkexiv2.patch" )
+
+src_prepare() {
+	# just to make absolutely sure
+	rm -rf "${WORKDIR}/${MY_P}/extra" || die
+
+	# prepare the handbook
+	mkdir doc-digikam doc-showfoto || die
+	echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
+	mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
+	echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
+	mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
+	sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
+
+	# prepare the translations
+	mv "${WORKDIR}/${MY_P}/po" po || die
+	find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +
+
+	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
+	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
+	echo "add_subdirectory( po )" >> CMakeLists.txt || die
+
+	kde4-base_src_prepare
+
+	if use handbook; then
+		echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
+		echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt
+	fi
+}
+
+src_configure() {
+	# LQR = only allows to choose between bundled/external
+	local mycmakeargs=(
+		-DENABLE_LCMS2=ON
+		-DFORCED_UNBUNDLE=ON
+		-DWITH_LQR=ON
+		-DWITH_LENSFUN=ON
+		$(cmake-utils_use_enable addressbook KDEPIMLIBSSUPPORT)
+		-DWITH_MarbleWidget=ON
+		$(cmake-utils_use_enable gphoto2 GPHOTO2)
+		$(cmake-utils_use_with gphoto2)
+		$(cmake-utils_use_with nepomuk Soprano)
+		$(cmake-utils_use_enable themedesigner)
+		$(cmake-utils_use_enable thumbnails THUMBS_DB)
+		$(cmake-utils_use_enable mysql INTERNALMYSQL)
+		$(cmake-utils_use_enable debug DEBUG_MESSAGES)
+		$(cmake-utils_use_enable nepomuk NEPOMUKSUPPORT)
+		$(cmake-utils_use_enable semantic-desktop BALOOSUPPORT)
+	)
+
+	kde4-base_src_configure
+}
+
+src_compile() {
+	local mytargets="all"
+	use doc && mytargets+=" doc"
+
+	kde4-base_src_compile ${mytargets}
+}
+
+src_install() {
+	kde4-base_src_install
+
+	if use doc; then
+		# install the api documentation
+		insinto /usr/share/doc/${PF}/
+		doins -r ${CMAKE_BUILD_DIR}/api/html
+	fi
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if use doc; then
+		einfo "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
+	fi
+}
diff --git a/media-gfx/digikam/files/digikam-4.4.0-libkexiv2.patch b/media-gfx/digikam/files/digikam-4.4.0-libkexiv2.patch
new file mode 100644
index 000000000000..018ce67a57d2
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-4.4.0-libkexiv2.patch
@@ -0,0 +1,53 @@
+commit f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e
+Author: Pino Toscano <pino@kde.org>
+Date:   Tue Oct 14 22:26:19 2014 +0200
+
+    fix libkexiv2 version for AltLangStrEdit::textEdit()
+    
+    it is part of current libkexiv2/master only (i.e. post 4.14.x, which
+    is 2.3.x)
+
+diff --git a/libs/imageproperties/captionedit.cpp b/libs/imageproperties/captionedit.cpp
+index 88413fc..70bdb6d 100644
+--- a/libs/imageproperties/captionedit.cpp
++++ b/libs/imageproperties/captionedit.cpp
+@@ -202,7 +202,7 @@ void CaptionEdit::slotAuthorChanged(const QString& text)
+ 
+ MsgTextEdit* CaptionEdit::textEdit() const
+ {
+-#if KEXIV2_VERSION >= 0x020302
++#if KEXIV2_VERSION >= 0x020400
+     return d->altLangStrEdit->textEdit();
+ #else
+     return 0;
+diff --git a/libs/imageproperties/imagedescedittab.cpp b/libs/imageproperties/imagedescedittab.cpp
+index ebfbae1..3d12777 100644
+--- a/libs/imageproperties/imagedescedittab.cpp
++++ b/libs/imageproperties/imagedescedittab.cpp
+@@ -429,7 +429,7 @@ ImageDescEditTab::ImageDescEditTab(QWidget* const parent)
+ 
+     // Initialize ---------------------------------------------
+ 
+-#if KEXIV2_VERSION >= 0x020302
++#if KEXIV2_VERSION >= 0x020400
+     d->titleEdit->textEdit()->installEventFilter(this);
+     d->captionsEdit->textEdit()->installEventFilter(this);
+ #endif
+@@ -532,7 +532,7 @@ void ImageDescEditTab::setFocusToNewTagEdit()
+ void ImageDescEditTab::setFocusToTitlesEdit()
+ {
+     d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS);
+-#if KEXIV2_VERSION >= 0x020302
++#if KEXIV2_VERSION >= 0x020400
+     d->titleEdit->textEdit()->setFocus();
+ #endif
+ }
+@@ -540,7 +540,7 @@ void ImageDescEditTab::setFocusToTitlesEdit()
+ void ImageDescEditTab::setFocusToCommentsEdit()
+ {
+     d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS);
+-#if KEXIV2_VERSION >= 0x020302
++#if KEXIV2_VERSION >= 0x020400
+     d->captionsEdit->textEdit()->setFocus();
+ #endif
+ }