commit: fbb811bda394349a5d139a58b4409e89458f411b
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Apr 18 20:39:26 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 20:39:26 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fbb811bd
[media-gfx/digikam] 4.9.0 version bump
Package-Manager: portage-2.2.14
media-gfx/digikam/digikam-4.9.0.ebuild | 163 +++++++++++++++++++++
.../digikam/files/digikam-4.9.0-fix-hang.patch | 21 +++
media-gfx/digikam/metadata.xml | 14 ++
3 files changed, 198 insertions(+)
diff --git a/media-gfx/digikam/digikam-4.9.0.ebuild
b/media-gfx/digikam/digikam-4.9.0.ebuild
new file mode 100644
index 0000000..14385ec
--- /dev/null
+++ b/media-gfx/digikam/digikam-4.9.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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"
+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 semantic-desktop +thumbnails video"
+
+CDEPEND="
+ || (
+ ( kde-apps/kdebase-kioslaves:4
+ kde-apps/libkdcraw:4=
+ kde-apps/libkexiv2:4=
+ kde-apps/libkipi:4
+ kde-apps/marble:4=[plasma] )
+ ( $(add_kdebase_dep kdebase-kioslaves)
+ kde-base/libkdcraw:4=
+ kde-base/libkexiv2:4=
+ $(add_kdebase_dep libkipi)
+ kde-base/marble:4=[plasma] )
+ )
+ dev-qt/qtgui:4
+ media-libs/jasper
+ media-libs/lcms:2
+ >=media-libs/lensfun-0.2.6
+ || ( >=kde-apps/libkface-14.12.0:4 >=media-libs/libkface-4.6.0 )
+ >=media-libs/libkgeomap-4.6.0:=
+ media-libs/liblqr
+ >=media-libs/libpgf-6.12.27
+ media-libs/libpng:0=
+ >=media-libs/opencv-2.4.9
+ media-libs/phonon[qt4]
+ >=media-libs/tiff-3.8.2
+ virtual/jpeg
+ x11-libs/libX11
+ || ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] )
+ addressbook? ( $(add_kdebase_dep kdepimlibs) )
+ gphoto2? ( media-libs/libgphoto2:= )
+ mysql? ( virtual/mysql )
+ semantic-desktop? (
+ $(add_kdebase_dep baloo '' 4.12.0)
+ )
+"
+RDEPEND="${CDEPEND}
+ || ( kde-apps/kreadconfig:4 $(add_kdebase_dep kreadconfig) )
+ media-plugins/kipi-plugins
+ video? (
+ || (
+ kde-apps/ffmpegthumbs:4
+ kde-apps/mplayerthumbs:4
+ $(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}-fix-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
+ -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_enable thumbnails THUMBS_DB)
+ $(cmake-utils_use_enable mysql INTERNALMYSQL)
+ $(cmake-utils_use_enable mysql MYSQLSUPPORT)
+ $(cmake-utils_use_enable debug DEBUG_MESSAGES)
+ $(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.9.0-fix-hang.patch
b/media-gfx/digikam/files/digikam-4.9.0-fix-hang.patch
new file mode 100644
index 0000000..4885a74
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-4.9.0-fix-hang.patch
@@ -0,0 +1,21 @@
+commit 685e0764bb3b771afbc465e246307e278a12e18d
+Author: Maik Qualmann <[email protected]>
+Date: Tue Apr 7 21:24:05 2015 +0200
+
+ apply patch #91925 from Kristian Karl to corrects the signal connection in
the ProgressManager
+ BUGS: 345954
+ FIXED-IN: 4.10.0
+
+diff --git a/libs/progressmanager/progressmanager.cpp
b/libs/progressmanager/progressmanager.cpp
+index 840362c..74a806e 100644
+--- a/libs/progressmanager/progressmanager.cpp
++++ b/libs/progressmanager/progressmanager.cpp
+@@ -483,7 +483,7 @@ void ProgressManager::addProgressItemImpl(ProgressItem*
const t, ProgressItem* c
+ connect(t, SIGNAL(progressItemCompleted(ProgressItem*)),
+ this, SLOT(slotTransactionCompleted(ProgressItem*)),
Qt::DirectConnection);
+
+- connect(this, SIGNAL(completeTransactionDeferred(ProgressItem*)),
++ connect(t, SIGNAL(completeTransactionDeferred(ProgressItem*)),
+ this, SLOT(slotTransactionCompletedDeferred(ProgressItem*)));
+
+ connect(t, SIGNAL(progressItemProgress(ProgressItem*,uint)),
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
new file mode 100644
index 0000000..08c5402
--- /dev/null
+++ b/media-gfx/digikam/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+<herd>kde</herd>
+<maintainer><email>[email protected]</email></maintainer>
+<use>
+ <flag name="addressbook">Add support for kdepim</flag>
+ <flag name="thumbnails">Enable thumbnails database support</flag>
+ <flag name="video">Pull in mplayerthumbs to enable video
thumbnails</flag>
+ <flag name="linguas_ha">Hausa translation</flag>
+ <flag name="linguas_mi">Maori translation</flag>
+ <flag name="linguas_ven">Venda translation</flag>
+</use>
+</pkgmetadata>
