diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-01-03 16:30:12 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-01-03 16:30:12 +0000 |
commit | 7359fb728a57e773de8df027fc773e27adaea296 (patch) | |
tree | 6f0231345dcb1ec7560bbd75ed54aaa1258da672 /media-gfx/digikam | |
parent | Version bump (diff) | |
download | gentoo-2-7359fb728a57e773de8df027fc773e27adaea296.tar.gz gentoo-2-7359fb728a57e773de8df027fc773e27adaea296.tar.bz2 gentoo-2-7359fb728a57e773de8df027fc773e27adaea296.zip |
Version bump
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/digikam')
-rw-r--r-- | media-gfx/digikam/ChangeLog | 10 | ||||
-rw-r--r-- | media-gfx/digikam/digikam-2.5.0.ebuild | 146 | ||||
-rw-r--r-- | media-gfx/digikam/files/digikam-2.5.0-libkipi.patch | 75 | ||||
-rw-r--r-- | media-gfx/digikam/metadata.xml | 1 |
4 files changed, 229 insertions, 3 deletions
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog index a3b878682859..b62204f5556e 100644 --- a/media-gfx/digikam/ChangeLog +++ b/media-gfx/digikam/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/digikam -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.207 2011/12/25 22:34:59 dilfridge Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.208 2012/01/03 16:30:11 dilfridge Exp $ + +*digikam-2.5.0 (03 Jan 2012) + + 03 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> +digikam-2.5.0.ebuild, + +files/digikam-2.5.0-libkipi.patch, metadata.xml: + Version bump 25 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> -files/digikam-1.8.0-tests.patch, -digikam-1.9.0.ebuild, diff --git a/media-gfx/digikam/digikam-2.5.0.ebuild b/media-gfx/digikam/digikam-2.5.0.ebuild new file mode 100644 index 000000000000..2dfdbbc31c60 --- /dev/null +++ b/media-gfx/digikam/digikam-2.5.0.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.5.0.ebuild,v 1.1 2012/01/03 16:30:11 dilfridge Exp $ + +EAPI=4 + +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.7" + +inherit kde4-base + +MY_P="${PN}-${PV/_/-}" + +DESCRIPTION="Digital photo management application for KDE" +HOMEPAGE="http://www.digikam.org/" +SRC_URI="mirror://sourceforge/${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 themedesigner +thumbnails video" + +CDEPEND=" + $(add_kdebase_dep kdelibs 'semantic-desktop=') + $(add_kdebase_dep libkdcraw) + $(add_kdebase_dep libkexiv2) + $(add_kdebase_dep libkipi) + $(add_kdebase_dep marble plasma) + $(add_kdebase_dep solid) + media-libs/jasper + media-libs/lcms:0 + >=media-libs/lensfun-0.2.5 + >=media-libs/libkface-${PV} + >=media-libs/libkgeomap-${PV} + media-libs/liblqr + >=media-libs/libpgf-6.11.28 + media-libs/libpng + media-libs/tiff + virtual/jpeg + x11-libs/qt-gui[qt3support] + >=sci-libs/clapack-3.2.1-r6 + || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] ) + addressbook? ( $(add_kdebase_dep kdepimlibs) ) + gphoto2? ( media-libs/libgphoto2 ) + mysql? ( virtual/mysql ) +" +RDEPEND="${CDEPEND} + $(add_kdebase_dep kreadconfig) + media-plugins/kipi-plugins + video? ( + || ( + $(add_kdebase_dep mplayerthumbs) + $(add_kdebase_dep ffmpegthumbs) + ) + ) +" +DEPEND="${CDEPEND} + sys-devel/gettext + doc? ( app-doc/doxygen ) +" + +S="${WORKDIR}/${MY_P}/core" + +RESTRICT=test +# bug 366505 + +PATCHES=( "${FILESDIR}/${P}-libkipi.patch" ) + +src_prepare() { + # just to make absolutely sure + rm -rf "${WORKDIR}/${MY_P}/extra" || die + + # prepare the handbook + mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die + echo "add_subdirectory( digikam )" > doc/CMakeLists.txt + echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt + + # 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 )" >> CMakeLists.txt + fi +} + +src_configure() { + local backend + + use semantic-desktop && backend="Nepomuk" || backend="None" + # LQR = only allows to choose between bundled/external + local mycmakeargs=( + -DFORCED_UNBUNDLE=ON + -DWITH_LQR=ON + -DWITH_LENSFUN=ON + -DGWENVIEW_SEMANTICINFO_BACKEND=${backend} + $(cmake-utils_use_with addressbook KdepimLibs) + -DWITH_MarbleWidget=ON + $(cmake-utils_use_enable gphoto2 GPHOTO2) + $(cmake-utils_use_with gphoto2) + $(cmake-utils_use_with semantic-desktop 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) + ) + + 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}/html + doins -r ${CMAKE_BUILD_DIR}/api/html/* + fi +} + +pkg_postinst() { + kde4-base_pkg_postinst + + if use doc; then + elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html" + fi +} diff --git a/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch b/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch new file mode 100644 index 000000000000..fbbac97a9489 --- /dev/null +++ b/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch @@ -0,0 +1,75 @@ +From 25cc9c9876a5233bd630105d0110319892d4e18c Mon Sep 17 00:00:00 2001 +From: Gilles Caulier <caulier.gilles@gmail.com> +Date: Tue, 3 Jan 2012 15:16:37 +0100 +Subject: [PATCH] enable checkall and clearall buttons only with libkipi version 1.4.0 + BUGS: 290496 + +--- + utilities/setup/setupplugins.cpp | 13 +++++++++++-- + utilities/setup/setupplugins.h | 4 ++-- + 2 files changed, 13 insertions(+), 4 deletions(-) + +diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp +index 0f4030a..b8efb35 100644 +--- a/utilities/setup/setupplugins.cpp ++++ b/utilities/setup/setupplugins.cpp +@@ -6,8 +6,8 @@ + * Date : 2004-01-02 + * Description : setup Kipi plugins tab. + * +- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com> +- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com> ++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com> ++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com> + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General +@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent) + + panel->setLayout(mainLayout); + ++#if KIPI_VERSION < 0x010400 ++ d->checkAllBtn->setVisible(false); ++ d->clearBtn->setVisible(false); ++#endif ++ + initPlugins(); + + // -------------------------------------------------------- +@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins() + void SetupPlugins::slotCheckAll() + { + QApplication::setOverrideCursor(Qt::WaitCursor); ++#if KIPI_VERSION >= 0x010400 + d->kipiConfig->slotCheckAll(); ++#endif + QApplication::restoreOverrideCursor(); + } + + void SetupPlugins::slotClear() + { + QApplication::setOverrideCursor(Qt::WaitCursor); ++#if KIPI_VERSION >= 0x010400 + d->kipiConfig->slotClear(); ++#endif + QApplication::restoreOverrideCursor(); + } + +diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h +index 271a569..114e0fa 100644 +--- a/utilities/setup/setupplugins.h ++++ b/utilities/setup/setupplugins.h +@@ -6,8 +6,8 @@ + * Date : 2004-01-02 + * Description : setup Kipi plugins tab. + * +- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com> +- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com> ++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com> ++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com> + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General +-- +1.7.3.4 + diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml index 032404f527dc..3e9d0cb0ece5 100644 --- a/media-gfx/digikam/metadata.xml +++ b/media-gfx/digikam/metadata.xml @@ -5,7 +5,6 @@ <maintainer><email>dilfridge@gentoo.org</email></maintainer> <use> <flag name="addressbook">Add support for kdepim</flag> - <flag name="geolocation">Add support for marble</flag> <flag name="themedesigner">Build the digikam theme designer</flag> <flag name="thumbnails">Enable thumbnails database support</flag> <flag name="video">Pull in mplayerthumbs to enable video thumbnails</flag> |