[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/

[Andreas Hüttel]

commit:     1c6a2382c21e6707f5d98eee6a1f27ed8dcc4f3f
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 09:27:14 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 09:27:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1c6a2382

[media-gfx/digikam] Version bump

(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit)

---
 media-gfx/digikam/digikam-2.0.0_rc.ebuild          |  136 ++++++++++++++++++++
 .../digikam/files/digikam-2.0.0_rc-oldpgf.patch    |   26 ++++
 2 files changed, 162 insertions(+), 0 deletions(-)

diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
new file mode 100644
index 0000000..2eaba0e
--- /dev/null
+++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_LINGUAS=""
+#KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
+#	ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
+
+KDE_HANDBOOK="optional"
+
+CMAKE_MIN_VERSION=2.8
+
+KDEGRAPHICS_MINIMAL="4.6.31"
+# please leave the weird number here for the moment
+
+inherit kde4-base
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="A digital photo management application for KDE."
+HOMEPAGE="http://www.digikam.org/"
+[[ ${PV} != *9999* ]] && 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 semantic-desktop themedesigner +thumbnails video"
+
+CDEPEND="
+	$(add_kdebase_dep kdelibs semantic-desktop)
+	$(add_kdebase_dep marble plasma)
+	$(add_kdebase_dep libkipi)
+	$(add_kdebase_dep libkexiv2)
+	>=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
+	>=media-libs/libkface-${PV}
+	>=media-libs/libkmap-${PV}
+	$(add_kdebase_dep solid)
+	media-libs/jasper
+	virtual/jpeg
+	media-libs/lcms:0
+	>=media-libs/lensfun-0.2.5
+	media-libs/liblqr
+	media-libs/libpng
+	media-libs/tiff
+	media-libs/libpgf
+	>=media-plugins/kipi-plugins-1.2.0-r1
+	|| ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
+	virtual/mysql
+	x11-libs/qt-gui[qt3support]
+	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
+	addressbook? ( $(add_kdebase_dep kdepimlibs) )
+	gphoto2? ( media-libs/libgphoto2 )
+"
+RDEPEND="${CDEPEND}
+	$(add_kdebase_dep kreadconfig)
+	video? (
+		|| (
+			$(add_kdebase_dep mplayerthumbs)
+			$(add_kdebase_dep ffmpegthumbs)
+		)
+	)
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch" )
+
+S="${WORKDIR}/${MY_P}/core"
+
+src_prepare() {
+	# just to make absolutely sure
+	rm -rf "${WORKDIR}/${MY_P}/extra" || die
+
+	mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
+	echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
+	echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
+
+	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 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.0.0_rc-oldpgf.patch b/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch
new file mode 100644
index 0000000..c60a7e3
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch
@@ -0,0 +1,26 @@
+commit 1f80f35b68702136ebd3d315fe4baf7d75b3c142
+Author: Gilles Caulier <caulier.gilles@×××××.com>
+Date:   Sun Jul 3 10:57:21 2011 +0200
+
+    compile with libpgf 6.09.44
+    BUGS: 276969
+
+diff --git a/libs/threadimageio/pgfutils.cpp b/libs/threadimageio/pgfutils.cpp
+index 2b5829f..758f12c 100644
+--- a/libs/threadimageio/pgfutils.cpp
++++ b/libs/threadimageio/pgfutils.cpp
+@@ -151,7 +151,14 @@ bool writePGFImageData(const QImage& img, QByteArray& data, int quality)
+         // TODO : optimize memory allocation...
+         CPGFMemoryStream stream(256000);
+         UINT32 nWrittenBytes = 0;
++
++#ifdef PGFCodecVersionID
++#   if PGFCodecVersionID >= 0x061124
+         pgfImg.Write(&stream, &nWrittenBytes);
++#   endif
++#else
++        pgfImg.Write(&stream, 0, 0, &nWrittenBytes);
++#endif
+ 
+         data = QByteArray((const char*)stream.GetBuffer(), nWrittenBytes);
+