Backport patch from upstream to solve a hang wrt bug #521992.

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

4 files changed, 274 insertions, 17 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 29b0bb7b580d..4117d7fb20b1 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.268 2014/10/30 20:08:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.269 2014/12/01 12:27:16 kensington Exp $
+
+*digikam-4.4.0-r1 (01 Dec 2014)
+
+  01 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +digikam-4.4.0-r1.ebuild, +files/digikam-4.4.0-hang.patch:
+  Backport patch from upstream to solve a hang wrt bug #521992.
 
   30 Oct 2014; Andreas K. Huettel <dilfridge@gentoo.org> digikam-4.2.0.ebuild:
   Fix lensfun dependency, bug 526092
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 4b01a1d0b0a1..b550ab59091e 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX digikam-4.4.0-hang.patch 3491 SHA256 c7318579e23e0912940eda369335c34ed545d4a36391b414dffb357740493364 SHA512 91977b6184181624db3e0aa21d20a74452d839090b59187f98be6dbf25959fe211fb8c19d88722e6efe3f75b4867bee139f8bfa3deaaf9bf37d33869de804d1d WHIRLPOOL cc5d96e5fac6d088dbb757824715691d9ab73aa37177fc2d086e279c6d506ef79151393ed68a5ec49468d9b055619417fb7c10361e2a722b4b12f9844e3a6dc4
 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
@@ -9,25 +10,25 @@ DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad33
 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 4173 SHA256 1e4a8b893779bf01fc127effec2c4649d51480ae907ed61306409bd26cb638c2 SHA512 1a5b8d13d1b43c5e669ef07ca43c5e4f897a81f5317b140193f5421733c4cff3572a5cecce60de52b75fbaa0e6b8e812bb5e7d9e6bee3a0dc939cc9c5071b3fe WHIRLPOOL 579d78540aaa5bece8983b0b18328104dc6ccd5fe76d636f4acbdc9f08386f84cb53cd64d215dd51c8fe004122d2b13aec321c4b8dcea2628edc92b6f368eb8c
+EBUILD digikam-4.4.0-r1.ebuild 4369 SHA256 e57417521da677a5a15a9a0cd168661256f3360743c188881fe66e41a435ac15 SHA512 5179879fb0d08f09711e3be0bd034e98234af0bc306e8dfd623ced23a48648d302ed0439595c834fcee959a01233013f051acc506b804fa0da10d1fd98f08795 WHIRLPOOL 09497384456f7b7b144ed1bd19314d4e2bec620088c19876f440eb7892659ed6c4bc9cd298c037bec1df930d127b0c6cb2a7fafb03b6ff788e81ebbc3b97cb4f
 EBUILD digikam-4.4.0.ebuild 4333 SHA256 ec5b3765a88777a05cf6b38b6965f153a928ae2ef0b0ec2403957e5ef98c1ab8 SHA512 ff30494714a4e1cf90a9562c753039593a2d9c53a727bf075dfe81d0f92409854bfacb8d07bdd059d8d8b21eb76645147bd66a54ab68e23c74dd06b784afaeb5 WHIRLPOOL 1ff613beb006c2f442645c6400b94cd285330646ced6c6541b0ea2bbf506386a0011e59be5a62e48486bd21ca0e4be09a4e6dd8d880690344175df8a27e51550
-MISC ChangeLog 43674 SHA256 1fe8af5e7418189e9fb8b69711ddbdc132c2e4aff1aab77ac31142c1a99bfcf7 SHA512 ba51b678be647810d9f5cf1d40fbed2c5bf3ed5afc349b892456e3873b2405458881f06155563df5d510c2bb7b9cc799d2eca08753410e12bf0cf6f8ac3fcb38 WHIRLPOOL b2f7d11949a72da60dece6104a53cec4bc3376074ed7b92c98eeb849406c15adbd88ec9b8c05b8990defa1651a6d8fe86f05238d8f22a7f71ebc39b7d5bd4255
+MISC ChangeLog 43890 SHA256 6d438a3d7b44cd98dbc83e27c893ca71e7b70e36315fe3b6a1eb3283d03a4bd5 SHA512 d33f5ec4a187bd00bba0b4f67554263daa384bd013d7fa42c08b81ddd6113856de134d8d3fcd464a7ff549a1f5dea4ee83a646de20e744832956c03c4e0199e8 WHIRLPOOL dd28cc34c56fefeef940bc64d66d5dae08a399c8af47c00992f3ceeb9fb95cc0ada6216e03eb22fcbbf967c1d3379791acf9af0c252213c46095a2c854962013
 MISC metadata.xml 736 SHA256 86156e040ab866e9a95236a9e4a3943b02ed4b9309e688b0217a7449e9601613 SHA512 d19e6e93b72c8141e778c36b0cd032db08ad2a87fc8f8325a32ab5df3c457787520267a8b86cce7272590d971de835fdf647a1a84a4c7d4c656f605dfe42d01e WHIRLPOOL bcb65d07cc4325fbde7b748da9977ddccb52097398cb0ab9db9599505a477bff1c97388c8143fc747d854d42ecab534d81160cb09c9e868b7c63f7bcea3c53f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUUprWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc3AYQAMmA2Aj5VJfSGqzk/bCAGQ+b
-ENS5M5CPSioAntWPhSOqK1vJVlstU8DgT7LbF47BVfc6uHrb3TvOnulreeTGrmxr
-loSnjgFaF/upqieUSHsgAC+P7vbBZ1aohO51MuvI4P6vAtmKKNXUByJc8PuJBXy4
-jE67K9ncTPTUnqXVIb87YAzwiW6A+4YNI8WGugP3CYzEQCydcipo9O83V3lVEu8e
-ycILPx+7sQzlbccIcJ6etRadrbsJqy/rd3a4nqHXLo9d2pFlhDBJdDUZDkiwPr/S
-EdeVpd+IM2mgSR8O4S/E53Nektt6BWjzUFbLrVaWSNMXscpIWPEAhYql5IuZnTOF
-SbQv2Dc02rYQ0Dwyx2Ncma0kuoXiXvyvPaQ1x7xn6n64c/qE2236U5CK+ZJPTTq0
-+xnSVorYlAGz89uWKIH/H+vJqifbLqbILCfM2PJJW/lsgisubB312kjJlRlmsPi+
-OrV2iqE3CL/0HGwlfo+4jELx5/ZAWMSukwwYKH7gElyhwgNHFX5UULg4Xc4bcuvs
-1YU1L7Scyvh4cOSd3of5FIpXzI4czwGsbE1rve/wNW9UQiJtfbH0pnTNoo4/95YY
-Y8USHV6M19GJa9aPrCJ31giSyfEwjmRCUQrYXaWi9T+fd53CjNMNu02Tgj/LAUCJ
-XD2sM39dUo7B9K49BPBF
-=BmBY
+iQJiBAEBCABMBQJUfF68RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7L9iD/4+wOIu4Rh2PnZFmtUFe2Q+9jLYCpqOyR5FfMKgoeCXqQ7/OYH6GWjTBJCM
+D1Lb0zZ0RxVrFVpUAEM3vnqIglCRGJNIw8F1Y1rEsOYElJExrgytv1FHhUHU8n6Y
+SzS8++P+2XXUgT3IVkbdIELUNv3rEOYvZ4a5WWxziqI/12zoas5chaQ4jkzdAKHZ
+9C7R96OwDe2N7T7HvGehg2UUY9OxcvpCOcPRMfYzpv/OcvMM7umXRJTCprefsaL0
+KycYGNjwse5AiLLTdKRqTMVCOJqYCALukQwSlAVDwacy/jr4gysgc5TwsDIp62Gp
+EQB9K5LBDjcvSopsBE95n1q+vo5XiGxhjKUSkBCageH+yxrgIvVc+pTSGoEEspYa
++RlKgoa5EXcvCYQqJzrGbqN9fgqF70lSQqxz+fGPAvFoPcJ2NZPC61kA/Cd2XOdJ
+r6mJAUk6gpEuRikVB6H4yBKsPD+fT36rlWWiAczELRcHRrG9vn6gO/X43qt6geyG
+ezozOkH3mjsBoQK8yaJodyDxjWNc4mnHrpCcufp0l08s+20/qdtV7EpoqzyEzRsa
+8cv6qjjRFir4x5eBKOdihuiy7iR671I3LQ+4JQVxtPMIBD1BZCVF4xZ2ifimqeaG
+abf+i/Gibgm4PUH9+KGYilAkKaw9bc4SoTN6Ca+6Z7kzBL4KRQ==
+=08Ls
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-4.4.0-r1.ebuild b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..a53f1b437f61
--- /dev/null
+++ b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
@@ -0,0 +1,165 @@
+# 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-r1.ebuild,v 1.1 2014/12/01 12:27:16 kensington 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"
+	"${FILESDIR}/${P}-hang.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-hang.patch b/media-gfx/digikam/files/digikam-4.4.0-hang.patch
new file mode 100644
index 000000000000..2757a4a5947b
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-4.4.0-hang.patch
@@ -0,0 +1,85 @@
+commit f0400ec7e518e753e0c4ccab4eb2b8b022f91767
+Author: Gilles Caulier <caulier.gilles@gmail.com>
+Date:   Tue Oct 28 15:58:55 2014 +0100
+
+    apply patch #89156
+    BUGS: 337737
+    FIXED-IN: 4.5.0
+
+diff --git a/libs/widgets/common/databasewidget.cpp b/libs/widgets/common/databasewidget.cpp
+index b04355b..858cf40 100644
+--- a/core/libs/widgets/common/databasewidget.cpp
++++ b/core/libs/widgets/common/databasewidget.cpp
+@@ -172,30 +172,21 @@ void DatabaseWidget::setupMainArea()
+                                   "<p><b>MySQL</b> backend is a more robust solution especially for remote and shared database storage. "
+                                   "It is also more efficient to manage huge collection sizes. "
+                                   "Be careful: this one it is still in experimental stage.</p>"));
+-    setDatabaseInputFields(DatabaseParameters::SQLiteDatabaseType());
+-
+-    // --------------------------------------------------------
+ 
+-    adjustSize();
++    setDatabaseInputFields(DatabaseParameters::SQLiteDatabaseType());
+ 
+     // --------------------------------------------------------
+ 
+-    connect(databasePathEdit, SIGNAL(urlSelected(KUrl)),
+-            this, SLOT(slotChangeDatabasePath(KUrl)));
+-
+-    connect(databasePathEdit, SIGNAL(textChanged(QString)),
+-            this, SLOT(slotDatabasePathEditedDelayed()));
+-
+     connect(databaseType, SIGNAL(currentIndexChanged(int)),
+             this, SLOT(slotHandleDBTypeIndexChanged(int)));
+ 
++    connect(checkDatabaseConnectionButton, SIGNAL(clicked()),
++            this, SLOT(checkDatabaseConnection()));
++    
+ #ifdef HAVE_INTERNALMYSQL
+     connect(internalServer, SIGNAL(stateChanged(int)),
+             this, SLOT(slotHandleInternalServerCheckbox(int)));
+ #endif // HAVE_INTERNALMYSQL
+-
+-    connect(checkDatabaseConnectionButton, SIGNAL(clicked()),
+-            this, SLOT(checkDatabaseConnection()));
+ }
+ 
+ QString DatabaseWidget::currentDatabaseType() const
+@@ -261,12 +252,24 @@ void DatabaseWidget::setDatabaseInputFields(const QString& currentIndexStr)
+         d->databasePathLabel->setVisible(true);
+         databasePathEdit->setVisible(true);
+         d->expertSettings->setVisible(false);
++
++        connect(databasePathEdit, SIGNAL(urlSelected(KUrl)),
++                this, SLOT(slotChangeDatabasePath(KUrl)));
++
++        connect(databasePathEdit, SIGNAL(textChanged(QString)),
++                this, SLOT(slotDatabasePathEditedDelayed()));
+     }
+     else
+     {
+         d->databasePathLabel->setVisible(false);
+         databasePathEdit->setVisible(false);
+         d->expertSettings->setVisible(true);
++        
++        disconnect(databasePathEdit, SIGNAL(urlSelected(KUrl)),
++                   this, SLOT(slotChangeDatabasePath(KUrl)));
++
++        disconnect(databasePathEdit, SIGNAL(textChanged(QString)),
++                   this, SLOT(slotDatabasePathEditedDelayed()));
+     }
+ 
+     adjustSize();
+@@ -355,9 +358,9 @@ void DatabaseWidget::setParametersFromSettings(const ApplicationSettings* const
+ 
+     password->setText(settings->getDatabasePassword());
+ 
+-    /* Now set the type according the database type from the settings.
+-     * If no item is found, ignore the setting.
+-     */
++    // Now set the type according the database type from the settings.
++    // If no item is found, ignore the setting.
++
+     for (int i=0; i<databaseType->count(); ++i)
+     {
+         //kDebug(50003) << "Comparing comboboxentry on index ["<< i <<"] [" << databaseType->itemData(i)