From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rh0A7-0006JQ-GG for garchives@archives.gentoo.org; Sat, 31 Dec 2011 14:43:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37A2B21C053; Sat, 31 Dec 2011 14:43:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A648C21C042 for ; Sat, 31 Dec 2011 14:43:47 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 921341B4003 for ; Sat, 31 Dec 2011 14:43:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DE05480043 for ; Sat, 31 Dec 2011 14:43:45 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: Subject: [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/ X-VCS-Repository: dev/dilfridge X-VCS-Files: media-gfx/digikam/ChangeLog media-gfx/digikam/Manifest media-gfx/digikam/digikam-1.8.0.ebuild media-gfx/digikam/digikam-1.9.0-r1.ebuild media-gfx/digikam/digikam-1.9.0.ebuild media-gfx/digikam/digikam-2.0.0.ebuild media-gfx/digikam/digikam-2.0.0_rc.ebuild media-gfx/digikam/files/digikam-1.1.0-libpgf.patch media-gfx/digikam/files/digikam-1.1.0-libpng14.patch media-gfx/digikam/files/digikam-1.2.0-docs-r3.patch media-gfx/digikam/files/digikam-1.2.0-lapack.patch media-gfx/digikam/files/digikam-1.2.0-libpgf-r3.patch media-gfx/digikam/files/digikam-1.2.0-libpgf.patch media-gfx/digikam/files/digikam-1.2.0-ratingwidget.patch media-gfx/digikam/files/digikam-1.3.0-docs.patch media-gfx/digikam/files/digikam-1.3.0-pgf.patch media-gfx/digikam/files/digikam-1.4.0-clapack.patch media-gfx/digikam/files/digikam-1.4.0-docs.patch media-gfx/digikam/files/digikam-1.5.0-unbundle.patch media-gfx/digikam/files/digikam-1.6.0-docs.patch media-gfx/digikam/files/digikam-1.7.0-docs.patch med ia-gfx/digikam/files/digikam-1.8.0-gcc46.patch media-gfx/digikam/files/digikam-1.8.0-tests.patch media-gfx/digikam/files/digikam-1.9.0-docs.patch media-gfx/digikam/files/digikam-1.9.0-newpgf.patch media-gfx/digikam/files/digikam-1.9.0-nomysql.patch media-gfx/digikam/files/digikam-1.9.0-turbo.patch media-gfx/digikam/files/digikam-2.0.0_beta1-docs.patch media-gfx/digikam/files/digikam-2.0.0_beta4-docs.patch media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch media-gfx/digikam/metadata.xml X-VCS-Directories: media-gfx/digikam/ media-gfx/digikam/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: b3e335668294bc4b0a8f9f870d0e529dbf058780 Date: Sat, 31 Dec 2011 14:43:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 36e40e44-32fc-487e-bec7-542b43c4d4e3 X-Archives-Hash: e61720b9673f62471885dbb25dc29467 commit: b3e335668294bc4b0a8f9f870d0e529dbf058780 Author: Andreas K. Huettel (dilfridge) gentoo o= rg> AuthorDate: Sat Dec 31 14:39:25 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Sat Dec 31 14:39:25 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dilfridge.git;= a=3Dcommit;h=3Db3e33566 [media-gfx/digikam] Not needed here anymore --- media-gfx/digikam/ChangeLog | 369 --------------= ------ media-gfx/digikam/Manifest | 58 --- media-gfx/digikam/digikam-1.8.0.ebuild | 125 ------- media-gfx/digikam/digikam-1.9.0-r1.ebuild | 130 ------- media-gfx/digikam/digikam-1.9.0.ebuild | 125 ------- media-gfx/digikam/digikam-2.0.0.ebuild | 140 -------- media-gfx/digikam/digikam-2.0.0_rc.ebuild | 139 -------- media-gfx/digikam/files/digikam-1.1.0-libpgf.patch | 232 ------------ .../digikam/files/digikam-1.1.0-libpng14.patch | 42 --- .../digikam/files/digikam-1.2.0-docs-r3.patch | 56 --- media-gfx/digikam/files/digikam-1.2.0-lapack.patch | 126 ------- .../digikam/files/digikam-1.2.0-libpgf-r3.patch | 157 --------- media-gfx/digikam/files/digikam-1.2.0-libpgf.patch | 208 ----------- .../digikam/files/digikam-1.2.0-ratingwidget.patch | 11 - media-gfx/digikam/files/digikam-1.3.0-docs.patch | 54 --- media-gfx/digikam/files/digikam-1.3.0-pgf.patch | 153 -------- .../digikam/files/digikam-1.4.0-clapack.patch | 181 ---------- media-gfx/digikam/files/digikam-1.4.0-docs.patch | 58 --- .../digikam/files/digikam-1.5.0-unbundle.patch | 294 --------------= -- media-gfx/digikam/files/digikam-1.6.0-docs.patch | 49 --- media-gfx/digikam/files/digikam-1.7.0-docs.patch | 49 --- media-gfx/digikam/files/digikam-1.8.0-gcc46.patch | 15 - media-gfx/digikam/files/digikam-1.8.0-tests.patch | 15 - media-gfx/digikam/files/digikam-1.9.0-docs.patch | 50 --- media-gfx/digikam/files/digikam-1.9.0-newpgf.patch | 92 ----- .../digikam/files/digikam-1.9.0-nomysql.patch | 60 ---- media-gfx/digikam/files/digikam-1.9.0-turbo.patch | 56 --- .../digikam/files/digikam-2.0.0_beta1-docs.patch | 41 --- .../digikam/files/digikam-2.0.0_beta4-docs.patch | 41 --- .../digikam/files/digikam-2.0.0_beta5-docs.patch | 42 --- .../files/digikam-2.0.0_rc-officialpgf.patch | 56 --- .../files/digikam-2.0.0_rc-officialpgf2.patch | 23 -- .../digikam/files/digikam-2.0.0_rc-oldpgf.patch | 26 -- media-gfx/digikam/metadata.xml | 17 - 34 files changed, 0 insertions(+), 3290 deletions(-) diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog deleted file mode 100644 index b6a2ada..0000000 --- a/media-gfx/digikam/ChangeLog +++ /dev/null @@ -1,369 +0,0 @@ -# ChangeLog for media-gfx/digikam -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 29 Jul 2011; Andreas K. Huettel digikam-2.0.0.e= build, - metadata.xml: - Finished for testing - -*digikam-2.0.0 (28 Jul 2011) - - 28 Jul 2011; Andreas K. Huettel - -digikam-2.0.0_beta5.ebuild, -digikam-2.0.0_beta6.ebuild, - +digikam-2.0.0.ebuild: - Added work in progess, does not build yet - - 27 Jul 2011; Andreas K. Huettel digikam-1.9.0.e= build, - digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-newpgf.patch, - digikam-2.0.0_rc.ebuild: - Resync with main tree - - 27 Jul 2011; Andreas K. Huettel - digikam-2.0.0_rc.ebuild: - Cleanup, re-add accidentally dropped useflag mysql, depend on kde-4.7 - - 06 Jul 2011; Andreas K. Huettel - digikam-2.0.0_rc.ebuild: - Although not strictly required, it is probably safer to use libpgf-6.1= 1.24 - - 05 Jul 2011; Andreas K. Huettel - digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_rc-officialpgf2.patch: - Additional compile fix for libpgf-6.11.24 - - 05 Jul 2011; Andreas K. Huettel - -files/digikam-2.0.0_officialpgf.patch, - +files/digikam-2.0.0_rc-officialpgf.patch: - Include build fix for new but unbundled libpgf - - 04 Jul 2011; Andreas K. Huettel - digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_officialpgf.patch: - Add build fix for offical new libpgf - - 03 Jul 2011; Andreas K. Huettel - digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_rc-oldpgf.patch: - Add build fix for older libpgf - -*digikam-2.0.0_rc (02 Jul 2011) - - 02 Jul 2011; Andreas K. Huettel - +digikam-2.0.0_rc.ebuild, metadata.xml: - Version bump, does not build yet (kde bug 276969) - - 02 Jul 2011; Andreas K. Huettel - -digikam-1.2.0-r4.ebuild: - Drop old - -*digikam-2.0.0_beta6 (02 Jul 2011) - - 02 Jul 2011; Andreas K. Huettel - +digikam-2.0.0_beta6.ebuild: - Resync with kde overlay - - 20 May 2011; Andreas K. Huettel - digikam-2.0.0_beta5.ebuild: - Backport build fix for libjpeg-turbo - - 20 May 2011; Andreas K. Huettel - digikam-1.9.0-r1.ebuild: - Add upstream fix for libjpeg-turbo - - 11 May 2011; Andreas K. Huettel - digikam-2.0.0_beta5.ebuild: - QA cleanups - - 11 May 2011; Andreas K. Huettel - -digikam-2.0.0_beta2.ebuild, -digikam-2.0.0_beta3.ebuild, - -digikam-2.0.0_beta4.ebuild, digikam-2.0.0_beta5.ebuild: - Remove old; drop ppc keyword - -*digikam-1.9.0-r1 (11 May 2011) - - 11 May 2011; Andreas K. Huettel digikam-1.9.0.e= build, - +digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-nomysql.patch: - Resync with tree - -*digikam-2.0.0_beta5 (11 May 2011) - - 11 May 2011; Andreas K. Huettel - +digikam-2.0.0_beta5.ebuild, +files/digikam-2.0.0_beta5-docs.patch: - Version bump - - 11 Apr 2011; Andreas K. Huettel - digikam-2.0.0_beta4.ebuild: - Allow sci-libs/lapack-atlas as alternative to clapack - -*digikam-2.0.0_beta4 (01 Apr 2011) - - 01 Apr 2011; Andreas K. Huettel - +digikam-2.0.0_beta4.ebuild, +files/digikam-2.0.0_beta4-docs.patch: - Version bump - - 01 Mar 2011; Andreas K. Huettel - digikam-2.0.0_beta2.ebuild, digikam-2.0.0_beta3.ebuild: - Readd ~ppc in line with digikam-1.9.0 - - 01 Mar 2011; Andreas K. Huettel - digikam-1.2.0-r4.ebuild, digikam-1.8.0.ebuild, - +files/digikam-1.8.0-gcc46.patch, digikam-1.9.0.ebuild: - Resync with main tree - -*digikam-2.0.0_beta3 (28 Feb 2011) - - 28 Feb 2011; Andreas K. Huettel - +digikam-2.0.0_beta3.ebuild: - Version bump - -*digikam-1.9.0 (28 Feb 2011) - - 28 Feb 2011; Andreas K. Huettel - +digikam-1.9.0.ebuild, +files/digikam-1.9.0-docs.patch: - Version bump - - 03 Feb 2011; Andreas K. Huettel - digikam-2.0.0_beta2.ebuild: - New package locations - - 03 Feb 2011; Andreas K. Huettel - digikam-2.0.0_beta2.ebuild: - More precise dependencies - - 02 Feb 2011; Andreas K. Huettel - digikam-2.0.0_beta2.ebuild, metadata.xml: - Useflag geolocation makes no sense anymore (forced on) - - 02 Feb 2011; Andreas K. Huettel - -digikam-2.0.0_beta1.ebuild: - Cleanup - - 01 Feb 2011; Andreas K. Huettel - digikam-2.0.0_beta2.ebuild: - Fix typo - -*digikam-2.0.0_beta2 (01 Feb 2011) - - 01 Feb 2011; Andreas K. Huettel - -digikam-1.1.0-r1.ebuild, -digikam-1.2.0-r2.ebuild, - -digikam-1.2.0-r3.ebuild, digikam-1.2.0-r4.ebuild, -digikam-1.4.0.ebui= ld, - -digikam-1.4.0-r1.ebuild, -digikam-1.5.0.ebuild, -digikam-1.6.0.ebuild= , - -digikam-1.7.0.ebuild, +digikam-2.0.0_beta2.ebuild, -digikam-9999.ebui= ld: - Version bump; cleanup of EAPI=3D2 ebuilds - - 30 Jan 2011; Andreas K. Huettel - digikam-2.0.0_beta1.ebuild, files/digikam-2.0.0_beta1-docs.patch: - Got it to configure - - 28 Jan 2011; Andreas K. Huettel - digikam-1.8.0.ebuild, +files/digikam-1.8.0-tests.patch: - Fix building of the tests - -*digikam-1.8.0 (28 Jan 2011) - - 28 Jan 2011; Andreas K. Huettel - +digikam-1.8.0.ebuild: - Version bump - - 28 Jan 2011; Andreas K. Huettel - digikam-1.6.0.ebuild, digikam-1.7.0.ebuild: - Resync with tree - - 24 Jan 2011; Andreas K. Huettel - digikam-2.0.0_beta1.ebuild, +files/digikam-2.0.0_beta1-docs.patch: - Updated docs patch - - 09 Jan 2011; Andreas K. Huettel - digikam-2.0.0_beta1.ebuild, digikam-9999.ebuild: - Cleanups and unify with live ebuild - -*digikam-2.0.0_beta1 (09 Jan 2011) - - 09 Jan 2011; Andreas K. Huettel - +digikam-2.0.0_beta1.ebuild: - Blind version bump - - 28 Dec 2010; Andreas K. Huettel - digikam-1.7.0.ebuild, +files/digikam-1.7.0-docs.patch: - Updated docs patch - -*digikam-1.7.0 (25 Dec 2010) - - 25 Dec 2010; Andreas K. Huettel - +digikam-1.7.0.ebuild: - Blind version bump - -*digikam-1.2.0-r4 (25 Nov 2010) - - 25 Nov 2010; Andreas K. Huettel - digikam-1.2.0-r3.ebuild, +digikam-1.2.0-r4.ebuild, digikam-1.5.0.ebuil= d, - digikam-1.6.0.ebuild: - Resync with tree - -*digikam-1.6.0 (24 Nov 2010) - - 24 Nov 2010; Andreas K. Huettel - +digikam-1.6.0.ebuild, +files/digikam-1.6.0-docs.patch: - Version bump - - 16 Oct 2010; Andreas K. Huettel Manifest: - Remanifested after updating doc-showfoto distfile - -*digikam-1.5.0-r1 (16 Oct 2010) - - 16 Oct 2010; Andreas K. Huettel - +digikam-1.5.0-r1.ebuild: - Added the showfoto handbook - - 15 Oct 2010; Andreas K. Huettel - digikam-1.5.0.ebuild: - Resync with main tree; updated linguas - - 15 Oct 2010; Andreas K. Huettel - digikam-1.5.0.ebuild: - Correct qt-sql dependency - - 15 Oct 2010; Andreas K. Huettel - digikam-1.5.0.ebuild: - Force-enabled lensfun. - - 15 Oct 2010; Andreas K. Huettel - digikam-1.5.0.ebuild, -files/digikam-1.5.0-pgf.patch, - +files/digikam-1.5.0-unbundle.patch: - Apply unbundle logic also to lensfun. Problem is, lensfun is not yet - found! - -*digikam-1.5.0 (12 Oct 2010) - - 12 Oct 2010; Andreas K. Huettel - +digikam-1.5.0.ebuild, +files/digikam-1.5.0-pgf.patch: - Version bump. Builds and installs fine. The database dependencies and = the - liblensfun detection still need some checking. - - 25 Sep 2010; Andreas K. Huettel - -digikam-1.4.0-r51.ebuild: - Cleanup - - 25 Sep 2010; Andreas K. Huettel - digikam-1.2.0-r3.ebuild: - Seems like api doc building needs latex. - - 25 Sep 2010; Andreas K. Huettel - files/digikam-1.2.0-docs-r3.patch: - Fixed the docs patch. - - 25 Sep 2010; Andreas K. Huettel - digikam-1.2.0-r3.ebuild: - Really move all doc files. - - 25 Sep 2010; Andreas K. Huettel - digikam-1.2.0-r3.ebuild: - Fixed path of unpacked handbook files - -*digikam-1.2.0-r3 (25 Sep 2010) - - 25 Sep 2010; Andreas K. Huettel - +digikam-1.2.0-r3.ebuild, +files/digikam-1.2.0-docs-r3.patch, - +files/digikam-1.2.0-libpgf-r3.patch: - Backported documentation additions to 1.2.0 - - 25 Sep 2010; Andreas K. Huettel - digikam-1.4.0-r1.ebuild: - Added elog about api docs and installed readme-handbook.txt - - 24 Sep 2010; Andreas K. Huettel - digikam-1.4.0-r1.ebuild, files/digikam-1.4.0-docs.patch: - Finished - now doc controls the building of the api documentation and - handbook controls the installation of a current handbook snapshot. - - 22 Sep 2010; Andreas K. Huettel - digikam-1.4.0-r1.ebuild, +files/digikam-1.4.0-docs.patch: - Builds the docs now on request, but does not install them yet... - -*digikam-1.4.0-r51 (22 Sep 2010) - - 22 Sep 2010; Andreas K. Huettel - digikam-1.4.0-r1.ebuild, +digikam-1.4.0-r51.ebuild: - Renamed -r1 to -r51 and copied -r0 to -r1 - - 18 Sep 2010; Andreas K. Huettel - digikam-1.4.0.ebuild: - Even worse. We need both backends sqlite and mysql. - - 18 Sep 2010; Andreas K. Huettel - digikam-1.4.0.ebuild: - It seems that we need not sqlite but mysql in qt-sql... - -*digikam-1.2.0-r2 (18 Sep 2010) -*digikam-1.1.0-r1 (18 Sep 2010) - - 18 Sep 2010; Andreas K. Huettel - +digikam-1.1.0-r1.ebuild, +files/digikam-1.1.0-libpgf.patch, - +files/digikam-1.1.0-libpng14.patch, +digikam-1.2.0-r2.ebuild, - +files/digikam-1.2.0-lapack.patch, +files/digikam-1.2.0-libpgf.patch, - +files/digikam-1.2.0-ratingwidget.patch, +digikam-1.4.0.ebuild, - +files/digikam-1.4.0-clapack.patch, metadata.xml: - Synced files with main tree. - - 29 Aug 2010; Andreas K. Huettel (dilfridge) - digikam-1.4.0.ebuild: - Change clapack and f2c headers from local to global in ebuild. - -*digikam-1.4.0 (28 Aug 2010) - - 28 Aug 2010; Andreas K. Huettel (dilfridge) - +digikam-1.4.0.ebuild, digikam-9999.ebuild: - Version bump and update of live ebuild. - - 28 Aug 2010; Andreas K. Huettel (dilfridge) - digikam-1.3.0-r2.ebuild: - Actually remove the unneeded Fortran dependency... - - 28 Aug 2010; Andreas K. Huettel (dilfridge) - digikam-1.3.0-r2.ebuild, files/digikam-1.3.0-clapack.patch: - Introduce switch to completely disable the bundled libraries. - - 28 Aug 2010; Andreas K. Huettel (dilfridge) - files/digikam-1.3.0-clapack.patch: - Removed explicit linking to f2c. - - 28 Aug 2010; Andreas K. Huettel (dilfridge) - files/digikam-1.3.0-clapack.patch: - Removed explicit linking to blas. - - 28 Aug 2010; Andreas K. Huettel (dilfridge) - files/digikam-1.3.0-clapack.patch: - Cleanup of experiments in the CMakeLists... - - 28 Aug 2010; Andreas K. Huettel (dilfridge) - digikam-1.3.0-r2.ebuild, files/digikam-1.3.0-clapack.patch: - Works now with the new clapack ebuild. The f2c_ symbol prefix was the - problem. - - 28 Aug 2010; Andreas K. Huettel (dilfridge) - files/digikam-1.3.0-clapack.patch: - Still linking problems. - - 27 Aug 2010; Andreas K. Huettel (dilfridge) - digikam-1.3.0-r2.ebuild, files/digikam-1.3.0-clapack.patch: - Next try. Still missing a -lf2c somewhere. - -*digikam-1.3.0-r2 (27 Aug 2010) - - 27 Aug 2010; Andreas K. Huettel (dilfridge) - -digikam-1.3.0-r1.ebuild, +digikam-1.3.0-r2.ebuild, - +files/digikam-1.3.0-clapack.patch, +files/digikam-1.3.0-docs.patch, - -files/digikam-1.3.0-lapack-r1.patch, +files/digikam-1.3.0-pgf.patch: - First refactoring that might be complete. - -*digikam-1.3.0-r1 (25 Aug 2010) - - 25 Aug 2010; Andreas K. Huettel (dilfridge) - +digikam-1.3.0-r1.ebuild, +files/digikam-1.3.0-lapack-r1.patch: - First test of conditional lapack patch. - -*digikam-9999 (25 Aug 2010) -*digikam-1.3.0 (25 Aug 2010) - - 25 Aug 2010; Andreas K. Huettel (dilfridge) - +digikam-1.3.0.ebuild, +files/digikam-1.3.0-lapack.patch, - +files/digikam-1.3.0-libpgf.patch, +digikam-9999.ebuild, +metadata.xml= : - Copied from kde overlay. - diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest deleted file mode 100644 index 313f8ea..0000000 --- a/media-gfx/digikam/Manifest +++ /dev/null @@ -1,58 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -AUX digikam-1.1.0-libpgf.patch 8996 RMD160 4f1a7ad7b28c43b3fe2e454eb3351= f27a14bde6f SHA1 fd2b98e23c31d880a2a32f28161f279abef82c22 SHA256 f2001099= ee5538a31a9660c223e59a25a19eb7c36a191831b849e1b81c58856d -AUX digikam-1.1.0-libpng14.patch 1580 RMD160 769e9bf4030d795349cb260854e= 26c189471ccbc SHA1 9b3123dad7bd7530db6833296dc1de7ec240fd54 SHA256 0ae5e2= 79aedc80857cb27ace7d1609b6cf632853513445896b88a7365b763fb9 -AUX digikam-1.2.0-docs-r3.patch 1926 RMD160 963f134c1bdb2e6b1a59b82efb70= 09733294ce6a SHA1 7cf403d5fd8f20142b7c1c6f6de225b5e66c28b9 SHA256 0687cd3= 9780c1e40fec424f6ae5cce851e460681d02088eec763902c170ecb28 -AUX digikam-1.2.0-lapack.patch 6429 RMD160 e42b9600822fbd28b31c751fe6515= a691db4cb0b SHA1 a495d7734c355419e4cba629354e4e9077f15782 SHA256 02169ca5= 7f86f3f7d40dced07b7c54f612bd8fe3b03d2a5808184c47b5b360c0 -AUX digikam-1.2.0-libpgf-r3.patch 6824 RMD160 cf771745da65673a6783a3ed9d= 6d2a0e74c69923 SHA1 857589931a4c2acefcc822b664dd02ce324ea152 SHA256 04242= 34746611e2b75b74725e53705277308fc3596ac095013de985cc6a01622 -AUX digikam-1.2.0-libpgf.patch 8505 RMD160 524cfb182518f45e6d2a683642486= eb84a3471d3 SHA1 d86fec9b63442f472d0ce7dd0d20939fe389eadc SHA256 8c603858= 103f056d17d4e8d9a3cb1d6464de6d174d82ff50882611e27564f465 -AUX digikam-1.2.0-ratingwidget.patch 413 RMD160 b7e86997019fa16590a565b8= e18fb43c287c7e88 SHA1 aa90381903000f28c105677e12f4b6813363659a SHA256 48c= f828b847cd4346b9f5512fa1a010565680d31996bf2492c7bf256caf04231 -AUX digikam-1.3.0-docs.patch 1910 RMD160 c4d644e91a0b492c8c9a8e53ed0ae19= fa743dabc SHA1 6d3c6519e4d7351198f6275639afe448e09d92b7 SHA256 d8048791e9= 623fe99796d71bc835ac568786b4c5a643b3d02c6d80472e725b99 -AUX digikam-1.3.0-pgf.patch 6006 RMD160 bfda7c95a633f4967935545f66d850fd= 94db9566 SHA1 43295130d7a62dc27097ed9730b3b47e13f2ab3f SHA256 84c219c7238= 790288b90acdb255bce2e40e3c5f19476885a2d456698e2f57205 -AUX digikam-1.4.0-clapack.patch 7429 RMD160 a10cf8ff044e42cfbb3880ed543b= 3df0221655e6 SHA1 7cd6461ff474503124a3116b8dfd8bb264c5afb6 SHA256 1e2f1d1= 1a612f1cff63acc46db5e5818a438d35d5aaef5b40ea6633b1f4b079e -AUX digikam-1.4.0-docs.patch 1953 RMD160 c90ab96aea6e08bca963a22bee5f786= 8de22a708 SHA1 dbdb4ff0d4697006a12b18be1b5cf5f903b3cb70 SHA256 d4f439b2b6= d86833b82c0101ed1f34cd1fc8611a4917db8ca4611437757cdce6 -AUX digikam-1.5.0-unbundle.patch 11772 RMD160 a593a67bd5d1ea02f695dc51f6= 240917e4f7ccdc SHA1 b989dc93f5949b1d313234d28b24b4e024d82861 SHA256 28320= a7d1beb3ad8caf7fd011a93ab3f6835191183477c673c2f27662417d8ad -AUX digikam-1.6.0-docs.patch 1438 RMD160 d4507c7aabe6eceb700ae8e3b76ac90= c500c3326 SHA1 b6f477d6e6ceaef8947071a12cf07e188789fc81 SHA256 21286862bb= 1dc5893cec0b16cf563b75edb6fe952f6aad7add6f4f59a575d2b8 -AUX digikam-1.7.0-docs.patch 1457 RMD160 e41322e23bb47234047fbe78aaf9202= 996907055 SHA1 281f7ad8644aa3f6c284cef7db40f330c8cec5d7 SHA256 7c32e5193a= 2ce168d10cdb3ea0bfa3a06774220013e51f61e8ba02fe65958ac6 -AUX digikam-1.8.0-gcc46.patch 512 RMD160 950c4744a8d4bfe88f0f19233bfd5ae= fb87ccbba SHA1 e3682e8af28233609c12817ec13a120c95a169be SHA256 088709ad10= f71266957d237fabba9ee6f1de0f43ba2c5f63badbeb974d140241 -AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d= 36bb19b1d SHA1 1e80a74d91f593939a69a7f77870cbefbbb73235 SHA256 29a7e68abd= 804019b1ae533a62920e931d5057aaa10bf20cd81358cf8bfcee1c -AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da95476364115= 7a87f11bd SHA1 7496668276f5a54d6ffde0a71ff7dfc6252ff3e3 SHA256 f348ab1a93= 1af78e1aa752676a9515a50183dc07c32a99cdfd59a32dd2ece2af -AUX digikam-1.9.0-newpgf.patch 3463 RMD160 4e5c506e81436aaafe5b789d79adc= b1caee4407b SHA1 3bb97db282fbb0c50e03cd4ba6c5ac6821558620 SHA256 9ca068c8= 7868b9709d75441795bfff2790d13957354b675a9aa94d5f3d55eca8 -AUX digikam-1.9.0-nomysql.patch 3323 RMD160 9b03cc09f81188a9373212af0bfc= 079eeced3c37 SHA1 7fe8a51f5d8c5eddfc22f37f6741f0c96ca64f16 SHA256 c3e09ee= 35172c9e38d13fe20b5e65ae1d53e954e3c50be1fbddd0223990cac5c -AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41= c3ed7310a2 SHA1 e9383e730b81348656c3482700dec59a3ba5a499 SHA256 765338d84= 2b39622428c068d9e190cf0f97933cd66845fea2ff0b5f79ed7b2cc -AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec47= 23860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8b= f8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c -AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242= c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902= 322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac -AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41= e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113= cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964 -AUX digikam-2.0.0_rc-officialpgf.patch 2351 RMD160 a3be56a7377b013bfa2a3= 539a8bbe7cfc9d3a75d SHA1 883b79dca41f7c624de3a8dc85b02f2dcae363a9 SHA256 = bf40b21501bb944993017fcc0f05411e100b88708b1560ddd00e7ca203db3bda -AUX digikam-2.0.0_rc-officialpgf2.patch 824 RMD160 54715604f3ca772253fee= 111f311028bc6dc9643 SHA1 8d170abfebddbf1d4f146d6c0b568f2a6262466a SHA256 = 0f3f010da6f7230ef865169db58f8595796354726b5599e975fde42af4fecbd5 -AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca= 2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b= 36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c -DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa= 59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d9= 49265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa -DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0= bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18= 971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5 -DIST digikam-2.0.0-rc.tar.bz2 45397480 RMD160 20fa3790c8ca950960020cdf3a= 32410689005db3 SHA1 b0067f99de1244723c45650d9a684b1e8f743954 SHA256 56435= 4c34b41287e951005707b84b8a1f82c691189083c5943abed5e0aebe691 -DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7c= f8452226fc6 SHA1 5941681163d90a13d316bd606589354099fd4f8a SHA256 c7d19f05= 62a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234 -DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10= cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65= b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467 -EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b= 2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f9= 73e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4 -EBUILD digikam-1.9.0-r1.ebuild 3347 RMD160 3cdaf055dc0b801a3cd05ce5ebd91= a7db10ff819 SHA1 29390bef0da866f1f914ba05e046f15f78297d4e SHA256 2b83becd= cae58d502d977afe0551abf24b80365bb42be54144444b969d7342e2 -EBUILD digikam-1.9.0.ebuild 3178 RMD160 1f56c6f8cc4d7595dd751866f7a34297= 4c0b67ea SHA1 e4193070e15b3851ff8fa2b6bb18ec48d3bfb0ac SHA256 b75d893953c= 1f37396f4f4b6a0c59005b4bf09307cb85aef958bc3910f3e9c75 -EBUILD digikam-2.0.0.ebuild 3616 RMD160 10830e6642d54e9438a172f662b83cd6= f3e1dd97 SHA1 97d2aead3d64120088b86657c260806ac7c7e5da SHA256 574945446a4= 426360c4fe5e6598e03fe61feea0eea2ea76a4c7f8f20742e1f49 -EBUILD digikam-2.0.0_rc.ebuild 3500 RMD160 34a75d9a7b3aea4e5065cfc94d167= 4672a9a5ce3 SHA1 17abcd6e5996cc57a83fee9f9b0088aeaf1f4054 SHA256 2254955a= f12fb79aebdaec5dbaa6c3fe8e747ce47c42c22f2067ddddbf37f89a -MISC ChangeLog 12539 RMD160 4e62c096a9cfca3dba63c5b50bc7b3b7fc467994 SHA= 1 48e665e87f787aace2ba417c8e1e6290503a2064 SHA256 db71a82aa54bd1e9370fee3= da6f48e9fdc980117539d1ffbbefaac5017071e40 -MISC metadata.xml 751 RMD160 b65e7816a03a284f440d296c1853aa913105129a SH= A1 c6bf2cf0d471e4d4ffdbb5185889a0e9cd65af39 SHA256 4b8eced4b0649dc935acff= ac97119bb70862bebd51a686b32778745b407eb0cb ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iQIcBAEBCgAGBQJOMot4AAoJEEb+UGWnxTyHRoYP/1eAmo0/jXC8YVFVZos1bpU4 -8eM0oUArsHkR/v26T1mJB+a9D+CgkP9fLO0OvQsg2LUgc0JjCXxG+9t9LZb1wKA3 -C9OF9vt7XSYccVtyT63p1R9uslhvLWiKiJLLmZt19AxqtMLDiaZy6xF7czBO1Hi4 -yXCYzTfn74hW3qHsaj/26Fh29J/3eD7qq5f4Zli1tE6bcaTGAAAs5eJZ+t63ChxU -ieK/IWM6Nw7wA01U+kvqLIxVl7SdZVFu5IMVAKj/aIVTybIUHexCR+7NZKsV/8Kl -FuyvRKe7zqg4Txwprb1ay9xxzr04oj5h13S6yjKQZYuzQ7X8jCMLx/KRdrvhpomv -FihdYFmmDFpBlCscGoAvMjdLP2G9HyeXIe1ixzNxEV69b5xoXUOqg0cXkNjQUOdT -EAFb1Z0934Xe804lqBZy1enn+crz02/0IGvnbCSfGvr+PSjz8Y8X20BpfbtUqkQb -1CLnncbZNGy7IJAnVsocE4D4Gk8tBISSo3NmSYQsjAF+D2MqphC52U7SXmlkP1SQ -LP3HnJH62vHvsb13WyZnAlYmYf1jkyr3m0v5F1LkXbHwDI31z0xC/HPeBxqNWTnF -vm0TNAdDaHNhSthVugP8Mk6tGD5J09txMGI/NIROSjjJ6Cu+ysIKIvaROMfZcCgh -52aEbnSUVNe16zwIgArv -=3Dg+MZ ------END PGP SIGNATURE----- diff --git a/media-gfx/digikam/digikam-1.8.0.ebuild b/media-gfx/digikam/d= igikam-1.8.0.ebuild deleted file mode 100644 index 0f4eca1..0000000 --- a/media-gfx/digikam/digikam-1.8.0.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.8.0.ebuil= d,v 1.4 2011/02/11 20:33:40 xarthisius Exp $ - -EAPI=3D3 - -KDE_LINGUAS=3D"ar be bg ca ca@valencia cs da de el en_GB eo es et eu fa = fi fr ga gl he hi hne hr hu is it ja km -ko lt lv ms nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi= zh_CN zh_TW" -KMNAME=3D"extragear/graphics" - -# needed for sufficiently new libkdcraw -KDE_MINIMAL=3D"4.5" -inherit kde4-base - -MY_P=3D"${PN}-${PV/_/-}" - -DESCRIPTION=3D"A digital photo management application for KDE." -HOMEPAGE=3D"http://www.digikam.org/" -SRC_URI=3D"mirror://sourceforge/${PN}/${MY_P}.tar.bz2 - handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )" - -LICENSE=3D"GPL-2 - handbook? ( FDL-1.2 )" -KEYWORDS=3D"~amd64 ~ppc ~x86" -SLOT=3D"4" -IUSE=3D"addressbook debug doc geolocation gphoto2 handbook semantic-desk= top themedesigner +thumbnails video" - -CDEPEND=3D" - >=3Dkde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?] - >=3Dkde-base/libkdcraw-${KDE_MINIMAL} - >=3Dkde-base/libkexiv2-${KDE_MINIMAL} - >=3Dkde-base/libkipi-${KDE_MINIMAL} - >=3Dkde-base/solid-${KDE_MINIMAL} - media-libs/jasper - virtual/jpeg - media-libs/lcms:0 - >=3Dmedia-libs/lensfun-0.2.5 - media-libs/liblqr - media-libs/libpng - media-libs/tiff - media-libs/libpgf - >=3Dmedia-plugins/kipi-plugins-1.2.0-r1 - >=3Dsci-libs/clapack-3.2.1-r3 - virtual/mysql - x11-libs/qt-gui[qt3support] - || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] ) - addressbook? ( >=3Dkde-base/kdepimlibs-${KDE_MINIMAL} ) - geolocation? ( >=3Dkde-base/marble-${KDE_MINIMAL}[plasma] ) - gphoto2? ( media-libs/libgphoto2 ) -" -RDEPEND=3D"${CDEPEND} - >=3Dkde-base/kreadconfig-${KDE_MINIMAL} - video? ( - || ( - >=3Dkde-base/mplayerthumbs-${KDE_MINIMAL} - >=3Dkde-base/ffmpegthumbs-${KDE_MINIMAL} - ) - ) -" -DEPEND=3D"${CDEPEND} - sys-devel/gettext - doc? ( app-doc/doxygen ) -" - -S=3D"${WORKDIR}/${MY_P}" - -PATCHES=3D( "${FILESDIR}/${PN}"-1.7.0-docs.patch - "${FILESDIR}/${P}"-{tests,gcc46}.patch ) - -src_prepare() { - if use handbook; then - mv "${WORKDIR}/${PN}"-1.4.0/* "${S}/" || die - else - mkdir doc || die - echo > doc/CMakeLists.txt || die - fi - - kde4-base_src_prepare -} - -src_configure() { - local backend - - use semantic-desktop && backend=3D"Nepomuk" || backend=3D"None" - # LQR =3D only allows to choose between bundled/external - mycmakeargs=3D( - -DFORCED_UNBUNDLE=3DON - -DWITH_LQR=3DON - -DWITH_LENSFUN=3DON - -DGWENVIEW_SEMANTICINFO_BACKEND=3D${backend} - $(cmake-utils_use_with addressbook KdepimLibs) - $(cmake-utils_use_build doc) - $(cmake-utils_use_with geolocation MarbleWidget) - $(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) - ) - - kde4-base_src_configure -} - -src_install() { - kde4-base_src_install - - if use doc; then - # install the api documentation - dodir /usr/share/doc/${PF}/html || die - insinto /usr/share/doc/${PF}/html - doins -r ${CMAKE_BUILD_DIR}/api/html/* || die - fi - - if use handbook; then - dodoc readme-handbook.txt || die - fi -} - -pkg_postinst() { - kde4-base_pkg_postinst - - if use doc; then - elog The digikam api documentation has been installed at /usr/share/do= c/${PF}/html - fi -} diff --git a/media-gfx/digikam/digikam-1.9.0-r1.ebuild b/media-gfx/digika= m/digikam-1.9.0-r1.ebuild deleted file mode 100644 index 5ef1230..0000000 --- a/media-gfx/digikam/digikam-1.9.0-r1.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0-r1.eb= uild,v 1.5 2011/07/05 11:39:35 dilfridge Exp $ - -EAPI=3D4 - -KDE_LINGUAS=3D"ar be bg ca ca@valencia cs da de el en_GB eo es et eu fa = fi fr ga gl he hi hne hr hu is it ja km -ko lt lv ms nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi= zh_CN zh_TW" -KMNAME=3D"extragear/graphics" -KDE_HANDBOOK=3D"optional" -# needed for sufficiently new libkdcraw -KDE_MINIMAL=3D"4.5" -inherit kde4-base - -MY_P=3D"${PN}-${PV/_/-}" - -DESCRIPTION=3D"A digital photo management application for KDE." -HOMEPAGE=3D"http://www.digikam.org/" -SRC_URI=3D"mirror://sourceforge/${PN}/${MY_P}.tar.bz2 - handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )" - -LICENSE=3D"GPL-2 - handbook? ( FDL-1.2 )" -KEYWORDS=3D"~amd64 ~ppc ~x86" -SLOT=3D"4" -IUSE=3D"addressbook debug doc geolocation gphoto2 mysql semantic-desktop= themedesigner +thumbnails video" - -CDEPEND=3D" - $(add_kdebase_dep kdelibs 'semantic-desktop=3D') - $(add_kdebase_dep libkdcraw) - $(add_kdebase_dep libkexiv2) - $(add_kdebase_dep libkipi) - $(add_kdebase_dep solid) - media-libs/jasper - virtual/jpeg - media-libs/lcms:0 - >=3Dmedia-libs/lensfun-0.2.5 - media-libs/liblqr - media-libs/libpng - media-libs/tiff - media-libs/libpgf - >=3Dmedia-plugins/kipi-plugins-1.2.0-r1 - >=3Dsci-libs/clapack-3.2.1-r3 - x11-libs/qt-gui[qt3support] - || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] ) - addressbook? ( $(add_kdebase_dep kdepimlibs) ) - geolocation? ( $(add_kdebase_dep marble 'plasma') ) - gphoto2? ( media-libs/libgphoto2 ) - mysql? ( virtual/mysql ) -" -RDEPEND=3D"${CDEPEND} - $(add_kdebase_dep kreadconfig) - video? ( - || ( - ( $(add_kdebase_dep ffmpegthumbs) ) - ( $(add_kdebase_dep mplayerthumbs) ) - ) - ) -" -DEPEND=3D"${CDEPEND} - sys-devel/gettext - doc? ( app-doc/doxygen ) -" - -S=3D"${WORKDIR}/${MY_P}" - -PATCHES=3D( - "${FILESDIR}/${PN}"-1.9.0-docs.patch - "${FILESDIR}/${PN}"-1.8.0-tests.patch - "${FILESDIR}/${PN}"-1.9.0-nomysql.patch - "${FILESDIR}/${PN}"-1.9.0-turbo.patch - "${FILESDIR}/${PN}"-1.9.0-newpgf.patch -) - -src_prepare() { - if use handbook; then - mv "${WORKDIR}/${PN}"-1.4.0/* "${S}/" || die - else - mkdir doc || die - echo > doc/CMakeLists.txt || die - fi - - kde4-base_src_prepare -} - -src_configure() { - local backend - - use semantic-desktop && backend=3D"Nepomuk" || backend=3D"None" - # LQR =3D only allows to choose between bundled/external - local mycmakeargs=3D( - -DFORCED_UNBUNDLE=3DON - -DWITH_LQR=3DON - -DWITH_LENSFUN=3DON - -DGWENVIEW_SEMANTICINFO_BACKEND=3D${backend} - $(cmake-utils_use_with addressbook KdepimLibs) - $(cmake-utils_use_build doc) - $(cmake-utils_use_with geolocation MarbleWidget) - $(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 MYSQL) - ) - - kde4-base_src_configure -} - -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/* || die - fi - - if use handbook; then - dodoc readme-handbook.txt || die - fi -} - -pkg_postinst() { - kde4-base_pkg_postinst - - if use doc; then - elog "The digikam api documentation has been installed at /usr/share/d= oc/${PF}/html" - fi -} diff --git a/media-gfx/digikam/digikam-1.9.0.ebuild b/media-gfx/digikam/d= igikam-1.9.0.ebuild deleted file mode 100644 index 5d28d34..0000000 --- a/media-gfx/digikam/digikam-1.9.0.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0.ebuil= d,v 1.5 2011/06/07 02:51:21 abcd Exp $ - -EAPI=3D3 - -KDE_LINGUAS=3D"ar be bg ca ca@valencia cs da de el en_GB eo es et eu fa = fi fr ga gl he hi hne hr hu is it ja km -ko lt lv ms nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi= zh_CN zh_TW" -KMNAME=3D"extragear/graphics" - -# needed for sufficiently new libkdcraw -KDE_MINIMAL=3D"4.5" -inherit kde4-base - -MY_P=3D"${PN}-${PV/_/-}" - -DESCRIPTION=3D"A digital photo management application for KDE." -HOMEPAGE=3D"http://www.digikam.org/" -SRC_URI=3D"mirror://sourceforge/${PN}/${MY_P}.tar.bz2 - handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )" - -LICENSE=3D"GPL-2 - handbook? ( FDL-1.2 )" -KEYWORDS=3D"amd64 ~ppc x86" -SLOT=3D"4" -IUSE=3D"addressbook debug doc geolocation gphoto2 handbook semantic-desk= top themedesigner +thumbnails video" - -CDEPEND=3D" - $(add_kdebase_dep kdelibs 'semantic-desktop?') - $(add_kdebase_dep libkdcraw) - $(add_kdebase_dep libkexiv2) - $(add_kdebase_dep libkipi) - $(add_kdebase_dep solid) - media-libs/jasper - virtual/jpeg - media-libs/lcms:0 - >=3Dmedia-libs/lensfun-0.2.5 - media-libs/liblqr - media-libs/libpng - media-libs/tiff - media-libs/libpgf - >=3Dmedia-plugins/kipi-plugins-1.2.0-r1 - >=3Dsci-libs/clapack-3.2.1-r3 - virtual/mysql - x11-libs/qt-gui[qt3support] - || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] ) - addressbook? ( $(add_kdebase_dep kdepimlibs) ) - geolocation? ( $(add_kdebase_dep marble plasma) ) - gphoto2? ( media-libs/libgphoto2 ) -" -RDEPEND=3D"${CDEPEND} - $(add_kdebase_dep kreadconfig) - video? ( - || ( - ( $(add_kdebase_dep mplayerthumbs) ) - ( $(add_kdebase_dep ffmpegthumbs) ) - ) - ) -" -DEPEND=3D"${CDEPEND} - sys-devel/gettext - doc? ( app-doc/doxygen ) -" - -S=3D"${WORKDIR}/${MY_P}" - -PATCHES=3D( "${FILESDIR}/${PN}"-1.9.0-docs.patch - "${FILESDIR}/${PN}"-1.8.0-tests.patch ) - -src_prepare() { - if use handbook; then - mv "${WORKDIR}/${PN}"-1.4.0/* "${S}/" || die - else - mkdir doc || die - echo > doc/CMakeLists.txt || die - fi - - kde4-base_src_prepare -} - -src_configure() { - local backend - - use semantic-desktop && backend=3D"Nepomuk" || backend=3D"None" - # LQR =3D only allows to choose between bundled/external - mycmakeargs=3D( - -DFORCED_UNBUNDLE=3DON - -DWITH_LQR=3DON - -DWITH_LENSFUN=3DON - -DGWENVIEW_SEMANTICINFO_BACKEND=3D${backend} - $(cmake-utils_use_with addressbook KdepimLibs) - $(cmake-utils_use_build doc) - $(cmake-utils_use_with geolocation MarbleWidget) - $(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) - ) - - kde4-base_src_configure -} - -src_install() { - kde4-base_src_install - - if use doc; then - # install the api documentation - dodir /usr/share/doc/${PF}/html || die - insinto /usr/share/doc/${PF}/html - doins -r ${CMAKE_BUILD_DIR}/api/html/* || die - fi - - if use handbook; then - dodoc readme-handbook.txt || die - fi -} - -pkg_postinst() { - kde4-base_pkg_postinst - - if use doc; then - elog "The digikam api documentation has been installed at /usr/share/d= oc/${PF}/html" - fi -} diff --git a/media-gfx/digikam/digikam-2.0.0.ebuild b/media-gfx/digikam/d= igikam-2.0.0.ebuild deleted file mode 100644 index 321f140..0000000 --- a/media-gfx/digikam/digikam-2.0.0.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.0.0_rc.eb= uild,v 1.1 2011/07/27 20:51:56 dilfridge Exp $ - -EAPI=3D4 - -KDE_LINGUAS=3D"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 ss sv ta te tg th tr tt uk= uz ven vi wa xh -zh_CN zh_HK zh_TW zu" - -KDE_HANDBOOK=3D"optional" -CMAKE_MIN_VERSION=3D"2.8" -KDE_MINIMAL=3D"4.7" - -inherit kde4-base - -MY_P=3D"${PN}-${PV/_/-}" - -DESCRIPTION=3D"Digital photo management application for KDE" -HOMEPAGE=3D"http://www.digikam.org/" -[[ ${PV} !=3D *9999* ]] && SRC_URI=3D"mirror://sourceforge/${PN}/${MY_P}= .tar.bz2" - -LICENSE=3D"GPL-2 - handbook? ( FDL-1.2 )" -KEYWORDS=3D"~amd64 ~x86" -SLOT=3D"4" -IUSE=3D"addressbook debug doc gphoto2 mysql semantic-desktop themedesign= er +thumbnails video" - -CDEPEND=3D" - $(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 - >=3Dmedia-libs/lensfun-0.2.5 - >=3Dmedia-libs/libkface-${PV} - >=3Dmedia-libs/libkgeomap-${PV} - media-libs/liblqr - >=3Dmedia-libs/libpgf-6.11.28 - media-libs/libpng - media-libs/tiff - virtual/jpeg - x11-libs/qt-gui[qt3support] - || ( >=3Dsci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas ) - || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] ) - addressbook? ( $(add_kdebase_dep kdepimlibs) ) - gphoto2? ( media-libs/libgphoto2 ) - mysql? ( virtual/mysql ) -" -RDEPEND=3D"${CDEPEND} - $(add_kdebase_dep kreadconfig) - media-plugins/kipi-plugins - video? ( - || ( - $(add_kdebase_dep mplayerthumbs) - $(add_kdebase_dep ffmpegthumbs) - ) - ) -" -DEPEND=3D"${CDEPEND} - sys-devel/gettext - doc? ( app-doc/doxygen ) -" - -S=3D"${WORKDIR}/${MY_P}/core" - -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 "kipiplugin_*.po" -exec rm {} + - - echo "add_subdirectory( po )" >> 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=3D"Nepomuk" || backend=3D"None" - # LQR =3D only allows to choose between bundled/external - local mycmakeargs=3D( - -DFORCED_UNBUNDLE=3DON - -DWITH_LQR=3DON - -DWITH_LENSFUN=3DON - -DGWENVIEW_SEMANTICINFO_BACKEND=3D${backend} - $(cmake-utils_use_with addressbook KdepimLibs) - -DWITH_MarbleWidget=3DON - $(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=3D"all" - use doc && mytargets+=3D" 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/d= oc/${PF}/html" - fi -} diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digika= m/digikam-2.0.0_rc.ebuild deleted file mode 100644 index 706304c..0000000 --- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.0.0_rc.eb= uild,v 1.1 2011/07/27 20:51:56 dilfridge Exp $ - -EAPI=3D4 - -KDE_LINGUAS=3D"" -#KDE_LINGUAS=3D"be ca ca@valencia de el en_GB eo es et eu fi fr he hi hn= e 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" -#the release candidate has no internationalization - -KDE_HANDBOOK=3D"optional" -CMAKE_MIN_VERSION=3D"2.8" -KDE_MINIMAL=3D"4.7" - -inherit kde4-base - -MY_P=3D"${PN}-${PV/_/-}" - -DESCRIPTION=3D"Digital photo management application for KDE" -HOMEPAGE=3D"http://www.digikam.org/" -[[ ${PV} !=3D *9999* ]] && SRC_URI=3D"mirror://sourceforge/${PN}/${MY_P}= .tar.bz2" - -LICENSE=3D"GPL-2 - handbook? ( FDL-1.2 )" -KEYWORDS=3D"~amd64 ~x86" -SLOT=3D"4" -IUSE=3D"addressbook debug doc gphoto2 mysql semantic-desktop themedesign= er +thumbnails video" - -CDEPEND=3D" - $(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 - >=3Dmedia-libs/lensfun-0.2.5 - >=3Dmedia-libs/libkface-${PV} - >=3Dmedia-libs/libkmap-${PV} - media-libs/liblqr - >=3Dmedia-libs/libpgf-6.11.24 - media-libs/libpng - media-libs/tiff - media-plugins/kipi-plugins - virtual/jpeg - x11-libs/qt-gui[qt3support] - || ( >=3Dsci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas ) - || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] ) - addressbook? ( $(add_kdebase_dep kdepimlibs) ) - gphoto2? ( media-libs/libgphoto2 ) - mysql? ( virtual/mysql ) -" -RDEPEND=3D"${CDEPEND} - $(add_kdebase_dep kreadconfig) - video? ( - || ( - $(add_kdebase_dep mplayerthumbs) - $(add_kdebase_dep ffmpegthumbs) - ) - ) -" -DEPEND=3D"${CDEPEND} - sys-devel/gettext - doc? ( app-doc/doxygen ) -" - -PATCHES=3D( - "${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch" - "${FILESDIR}/${PN}-2.0.0_rc-officialpgf.patch" - "${FILESDIR}/${PN}-2.0.0_rc-officialpgf2.patch" -) - -S=3D"${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=3D"Nepomuk" || backend=3D"None" - # LQR =3D only allows to choose between bundled/external - local mycmakeargs=3D( - -DFORCED_UNBUNDLE=3DON - -DWITH_LQR=3DON - -DWITH_LENSFUN=3DON - -DGWENVIEW_SEMANTICINFO_BACKEND=3D${backend} - $(cmake-utils_use_with addressbook KdepimLibs) - -DWITH_MarbleWidget=3DON - $(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=3D"all" - use doc && mytargets+=3D" 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/d= oc/${PF}/html" - fi -} diff --git a/media-gfx/digikam/files/digikam-1.1.0-libpgf.patch b/media-g= fx/digikam/files/digikam-1.1.0-libpgf.patch deleted file mode 100644 index 47b2c72..0000000 --- a/media-gfx/digikam/files/digikam-1.1.0-libpgf.patch +++ /dev/null @@ -1,232 +0,0 @@ -From 0e5ebb56e3b0ca85b8ca74ae3577b06a4795cad6 Mon Sep 17 00:00:00 2001 -From: Ronan Arraes Jardim Chagas -Date: Thu, 4 Feb 2010 11:09:22 -0200 -Subject: [PATCH] Initial approach to unbundled libpgf from Digikam 1.1.0 - -Changes to be committed: - - modified: CMakeLists.txt - new file: cmake/modules/FindPGF.cmake - modified: digikam/CMakeLists.txt - modified: libs/CMakeLists.txt ---- - CMakeLists.txt | 70 ++++++++++++++++++++++++++++++------= ------ - cmake/modules/FindPGF.cmake | 15 +++++++++ - digikam/CMakeLists.txt | 8 ++--- - libs/CMakeLists.txt | 1 + - 4 files changed, 69 insertions(+), 25 deletions(-) - create mode 100644 cmake/modules/FindPGF.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3cf296a..329e410 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,6 +34,13 @@ SET(DIGIKAM_VERSION_STRING - "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}" - ) -=20 -+# Path to find FindPGF.cmake script. -+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/m= odules") -+ -+# =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -+# Project options -+OPTION(BUILD_DOC "Set ON to install documentation files" OFF) -+ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # Debug area codes - # These codes will be set for every project specific path automatically= , so -@@ -115,6 +122,11 @@ FIND_PACKAGE(LCMS) - FIND_PACKAGE(JPEG) - FIND_PACKAGE(PNG) - FIND_PACKAGE(TIFF) -+ -+# Included to unbundle libpgf that is on portage tree. -+# This function call the script cmake/modules/FindPGF.cmake -+FIND_PACKAGE(PGF) -+ - FIND_PACKAGE(Jasper) - FIND_PACKAGE(Kdcraw) - FIND_PACKAGE(Kexiv2) -@@ -197,6 +209,7 @@ MESSAGE(STATUS "") -=20 - PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND) - PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "= " TIFF_FOUND) -+PRINT_LIBRARY_STATUS("libpgf" "http://www.libpgf.org" "" PGF_FOUND) - PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.htm= l" " (version >=3D 1.2.7)" PNG_FOUND) - PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jaspe= r" "" JASPER_FOUND) - PRINT_LIBRARY_STATUS("liblcms" "http://www.littlecms.com" "" LCMS_FOUND= ) -@@ -298,13 +311,13 @@ ELSE(DOXYGEN_FOUND) - MESSAGE(STATUS "") - ENDIF(DOXYGEN_FOUND) -=20 --IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FO= UND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) -+IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND= AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) - MESSAGE(STATUS " digiKam will be compiled................. YES") - SET(DIGIKAM_CAN_BE_COMPILED true) --ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JAS= PER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) -+ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOU= ND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUN= D) - MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO = (Look README file for more details about dependencies)") - SET(DIGIKAM_CAN_BE_COMPILED false) --ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER= _FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) -+ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FO= UND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOU= ND) -=20 - MESSAGE(STATUS "-------------------------------------------------------= ---------------------------") - MESSAGE(STATUS "") -@@ -889,14 +902,7 @@ IF(DIGIKAM_CAN_BE_COMPILED) - ${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp - ) -=20 -- SET(libpgf_SRCS -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransfo= rm.cpp -- ) -+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) -=20 - SET(libsqlite2_SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c -@@ -1176,18 +1182,42 @@ ENDIF(DIGIKAM_CAN_BE_COMPILED) - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # API documentation generation -=20 --IF(DOXYGEN_FOUND) -=20 -- SET(API_DIR ${CMAKE_BINARY_DIR}/api) -- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) -- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) -- SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) -+# Checks if user ask to build documentation. -+IF(BUILD_DOC) -+ IF(DOXYGEN_FOUND) -=20 -- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will be installed") -+ MESSAGE(STATUS "") -=20 -- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -+ SET(API_DIR ${CMAKE_BINARY_DIR}/api) -+ SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) -+ SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) -+ SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) -+ -+ CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -+ -+ ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -+ -+ ELSE(DOXYGEN_FOUND) -+ -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will NOT be installed") -+ MESSAGE(STATUS "Doxygen wasn't found on the system") -+ MESSAGE(STATUS "") -+ -+ ENDIF(DOXYGEN_FOUND) -+ -+ELSE(BUILD_DOC) -+ -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will NOT be installed") -+ MESSAGE(STATUS "Because the option -DBUILD_DOC=3DON wasn't passed t= o cmake") -+ MESSAGE(STATUS "") -+ -+ENDIF(BUILD_DOC) -=20 --ENDIF(DOXYGEN_FOUND) - include(MacroOptionalAddSubdirectory) - macro_optional_add_subdirectory( po ) -diff --git a/cmake/modules/FindPGF.cmake b/cmake/modules/FindPGF.cmake -new file mode 100644 -index 0000000..60aeacc ---- /dev/null -+++ b/cmake/modules/FindPGF.cmake -@@ -0,0 +1,15 @@ -+# - Try to find libpgf -+# Once done this will define -+# -+# PGF_FOUND - system has libgf -+# PGF_INCLUDE_DIRS - the libpgf include directory -+# PGF_LIBRARIES - Link these to use libpgf -+ -+# PKG-CONFIG is required. -+INCLUDE(FindPkgConfig REQUIRED) -+ -+IF(PKG_CONFIG_FOUND) -+ INCLUDE(FindPkgConfig) -+ -+ PKG_CHECK_MODULES(PGF libpgf) -+ENDIF(PKG_CONFIG_FOUND) -diff --git a/digikam/CMakeLists.txt b/digikam/CMakeLists.txt -index 445e24f..e6839f7 100644 ---- a/digikam/CMakeLists.txt -+++ b/digikam/CMakeLists.txt -@@ -73,6 +73,7 @@ INCLUDE_DIRECTORIES( - ${JPEG_INCLUDE_DIR} - ${PNG_PNG_INCLUDE_DIR} - ${TIFF_INCLUDE_DIR} -+ ${PGF_INCLUDE_DIRS} - ) -=20 -=20 -@@ -81,9 +82,6 @@ INCLUDE_DIRECTORIES( - # Disable Clapack C code warnings. - SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS= "-w") -=20 --# Disable libpgf warnings. --SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w= ") -- - SET(digikamcore_LIB_SRCS - # basic libs - ${libdimg_SRCS} -@@ -100,7 +98,6 @@ SET(digikamcore_LIB_SRCS - ${libgreycstoration_SRCS} - ${libthreadimageio_SRCS} - ${libthemeengine_SRCS} -- ${libpgf_SRCS} - ${pgfutils_SRCS} - ${libdigikamhelpers_SRCS} -=20 -@@ -150,6 +147,7 @@ TARGET_LINK_LIBRARIES(digikamcore - ${JPEG_LIBRARIES} - ${TIFF_LIBRARIES} - ${PNG_LIBRARIES} -+ ${PGF_LIBRARIES} - ${LCMS_LIBRARIES} - ${JASPER_LIBRARIES} -=20 -@@ -193,7 +191,6 @@ SET(digikamdatabase_LIB_SRCS ${libdatabase_SRCS} - ${libhaar_SRCS} - ${libdatabasemodels_SRCS} - ${libsqlite2_SRCS} -- ${libpgf_SRCS} - ${pgfutils_SRCS} - ) -=20 -@@ -208,6 +205,7 @@ TARGET_LINK_LIBRARIES(digikamdatabase - ${QT_QTCORE_LIBRARY} - ${QT_QTGUI_LIBRARY} - ${QT_QTSQL_LIBRARY} -+ ${PGF_LIBRARIES} - ) -=20 - SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSIO= N 1 ) -diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt -index b66da1c..f0a6aab 100644 ---- a/libs/CMakeLists.txt -+++ b/libs/CMakeLists.txt -@@ -21,6 +21,7 @@ INCLUDE_DIRECTORIES( dimg - ${JPEG_INCLUDE_DIR} - ${TIFF_INCLUDE_DIR} - ${PNG_INCLUDE_DIR} -+ ${PGF_INCLUDE_DIRS} - ${JASPER_INCLUDE_DIR} - ) - ADD_SUBDIRECTORY( curves ) ---=20 -1.6.4.4 - diff --git a/media-gfx/digikam/files/digikam-1.1.0-libpng14.patch b/media= -gfx/digikam/files/digikam-1.1.0-libpng14.patch deleted file mode 100644 index e7a161d..0000000 --- a/media-gfx/digikam/files/digikam-1.1.0-libpng14.patch +++ /dev/null @@ -1,42 +0,0 @@ -http://repos.archlinux.org/wsvn/packages/digikam/trunk/libpng14.patch - ---- libs/dimg/loaders/pngloader.cpp -+++ libs/dimg/loaders/pngloader.cpp -@@ -105,7 +105,7 @@ - unsigned char buf[PNG_BYTES_TO_CHECK]; -=20 - size_t membersRead =3D fread(buf, 1, PNG_BYTES_TO_CHECK, f); -- if ((membersRead !=3D PNG_BYTES_TO_CHECK) || !png_check_sig(buf, PN= G_BYTES_TO_CHECK)) -+ if ((membersRead !=3D PNG_BYTES_TO_CHECK) || png_sig_cmp(buf, 0, PN= G_BYTES_TO_CHECK)) - { - kDebug() << "Not a PNG image file."; - fclose(f); -@@ -322,7 +322,7 @@ - #ifdef ENABLE_DEBUG_MESSAGES - kDebug() << "PNG in PNG_COLOR_TYPE_GRAY"; - #endif -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - png_set_gray_to_rgb(png_ptr); -=20 - if (QSysInfo::ByteOrder =3D=3D QSysInfo::LittleEndi= an) // Intel ---- libs/threadimageio/thumbnailbasic.cpp -+++ libs/threadimageio/thumbnailbasic.cpp -@@ -137,7 +137,7 @@ - unsigned char buf[PNG_BYTES_TO_CHECK]; -=20 - size_t itemsRead =3D fread(buf, 1, PNG_BYTES_TO_CHECK, f); -- if (itemsRead !=3D 1 || !png_check_sig(buf, PNG_BYTES_TO_CHECK)) -+ if (itemsRead !=3D 1 || png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK)) - { - fclose(f); - return qimage; -@@ -232,7 +232,7 @@ - { - png_set_gray_to_rgb(png_ptr); - if (png_get_bit_depth(png_ptr, info_ptr) < 8) -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - } -=20 - int sizeOfUint =3D sizeof(unsigned int); diff --git a/media-gfx/digikam/files/digikam-1.2.0-docs-r3.patch b/media-= gfx/digikam/files/digikam-1.2.0-docs-r3.patch deleted file mode 100644 index ff9f1a3..0000000 --- a/media-gfx/digikam/files/digikam-1.2.0-docs-r3.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -u -r -N digikam-1.2.0-2/CMakeLists.txt digikam-1.2.0/CMakeLists.tx= t ---- digikam-1.2.0-2/CMakeLists.txt 2010-09-25 18:01:53.000000000 +0200 -+++ digikam-1.2.0/CMakeLists.txt 2010-09-25 18:05:16.000000000 +0200 -@@ -1260,18 +1260,43 @@ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # API documentation generation -=20 --IF(DOXYGEN_FOUND) -+# Checks if user ask to build documentation. -+IF(BUILD_DOC) -+ IF(DOXYGEN_FOUND) -=20 -- SET(API_DIR ${CMAKE_BINARY_DIR}/api) -- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) -- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) -- SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will be installed") -+ MESSAGE(STATUS "") -=20 -- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -+ SET(API_DIR ${CMAKE_BINARY_DIR}/api) -+ SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) -+ SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) -+ SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) -=20 -- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -+ CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -+ -+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -+ -+ ELSE(DOXYGEN_FOUND) -+ =20 -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will NOT be installed") -+ MESSAGE(STATUS "Doxygen wasn't found on the system") -+ MESSAGE(STATUS "") -+ -+ ENDIF(DOXYGEN_FOUND) -+ -+ELSE(BUILD_DOC) -+ -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will NOT be installed") -+ MESSAGE(STATUS "Because the option -DBUILD_DOC=3DON wasn't passed t= o cmake") -+ MESSAGE(STATUS "") -+ -+ENDIF(BUILD_DOC) -=20 --ENDIF(DOXYGEN_FOUND) - include(MacroOptionalAddSubdirectory) - macro_optional_add_subdirectory( po ) -+ -+add_subdirectory( doc ) diff --git a/media-gfx/digikam/files/digikam-1.2.0-lapack.patch b/media-g= fx/digikam/files/digikam-1.2.0-lapack.patch deleted file mode 100644 index f731078..0000000 --- a/media-gfx/digikam/files/digikam-1.2.0-lapack.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -r -u digikam-1.2.0.orig/CMakeLists.txt digikam-1.2.0/CMakeLists.tx= t ---- digikam-1.2.0.orig/CMakeLists.txt 2010-05-30 21:38:14.189946492 +020= 0 -+++ digikam-1.2.0/CMakeLists.txt 2010-05-30 21:39:46.679946458 +0200 -@@ -3,6 +3,8 @@ - #OPTION(ENABLE_THEMEDESIGNER "Build digiKam theme designer (default=3DO= FF)" OFF) - OPTION(ENABLE_THUMBS_DB "Build digiKam with thumbnails database support= (default=3DON)" ON) -=20 -+ENABLE_LANGUAGE(Fortran) -+ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # Information to update before to release this package. -=20 -@@ -123,6 +125,9 @@ - # This function call the script cmake/modules/FindPGF.cmake - FIND_PACKAGE(PGF) -=20 -+# Included to unbundle lapack that is in portage tree. -+FIND_PACKAGE(LAPACK) -+ - FIND_PACKAGE(Jasper) - FIND_PACKAGE(Kdcraw) - FIND_PACKAGE(Kexiv2) -@@ -320,13 +325,13 @@ - MESSAGE(STATUS "") - ENDIF(DOXYGEN_FOUND) -=20 --IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND= AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) -+IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND= AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND = AND LAPACK_FOUND) - MESSAGE(STATUS " digiKam will be compiled................. YES") - SET(DIGIKAM_CAN_BE_COMPILED true) --ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOU= ND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUN= D) -+ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOU= ND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUN= D AND LAPACK_FOUND) - MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO = (Look README file for more details about dependencies)") - SET(DIGIKAM_CAN_BE_COMPILED false) --ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FO= UND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOU= ND) -+ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FO= UND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOU= ND AND LAPACK_FOUND) -=20 - MESSAGE(STATUS "-------------------------------------------------------= ---------------------------") - MESSAGE(STATUS "") -@@ -484,39 +489,7 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp - ) -=20 -- SET(libclapack_SRCS -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/abort_.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgesv.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dlaswp.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/endfile.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/idamax.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/open.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/sig_die.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wref.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/close.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetf2.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dscal.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/err.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/ieeeck.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_cmp.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_stop.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wrtfmt.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgemm.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetrf.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dswap.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/fmt.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/ilaenv.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_copy.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wsfe.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dger.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetrs.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dtrsm.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/fmtlib.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/lsame.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/sfe.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/util.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/xerbla.c -- ) -+ INCLUDE_DIRECTORIES(${LAPACK_INCLUDE_DIRS}) -=20 - SET(libdimgfilters_SRCS - ${libclapack_SRCS} -Nur in digikam-1.2.0: CMakeLists.txt.orig. -diff -r -u digikam-1.2.0.orig/digikam/CMakeLists.txt digikam-1.2.0/digik= am/CMakeLists.txt ---- digikam-1.2.0.orig/digikam/CMakeLists.txt 2010-05-30 21:38:14.191892= 532 +0200 -+++ digikam-1.2.0/digikam/CMakeLists.txt 2010-05-30 21:39:46.680979177 += 0200 -@@ -89,6 +89,7 @@ - ${PNG_PNG_INCLUDE_DIR} - ${TIFF_INCLUDE_DIR} - ${PGF_INCLUDE_DIRS} -+ ${LAPACK_INCLUDE_DIRS} - ) -=20 - IF(LENSFUN_LIBRARY) -@@ -172,6 +173,7 @@ - ${PGF_LIBRARIES} - ${LCMS_LIBRARIES} - ${JASPER_LIBRARIES} -+ ${LAPACK_LIBRARIES} -=20 - # Require by CImg library which use pthread inter= nally. - ${CMAKE_THREAD_LIBS_INIT} -@@ -237,6 +239,7 @@ - ${QT_QTGUI_LIBRARY} - ${QT_QTSQL_LIBRARY} - ${PGF_LIBRARIES} -+ ${LAPACK_LIBRARIES} - ) -=20 - SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSIO= N 1 ) -Nur in digikam-1.2.0/digikam: CMakeLists.txt.orig. -diff -r -u digikam-1.2.0.orig/libs/CMakeLists.txt digikam-1.2.0/libs/CMa= keLists.txt ---- digikam-1.2.0.orig/libs/CMakeLists.txt 2010-05-30 21:38:14.191892532= +0200 -+++ digikam-1.2.0/libs/CMakeLists.txt 2010-05-30 21:41:20.226778777 +020= 0 -@@ -14,12 +14,12 @@ - imageproperties - dialogs - 3rdparty/cimg -- 3rdparty/clapack - ${JPEG_INCLUDE_DIR} - ${TIFF_INCLUDE_DIR} - ${PNG_INCLUDE_DIR} - ${PGF_INCLUDE_DIRS} - ${JASPER_INCLUDE_DIR} -+ ${LAPACK_INCLUDE_DIRS} - ) - ADD_SUBDIRECTORY( histogram ) - ADD_SUBDIRECTORY( dmetadata ) diff --git a/media-gfx/digikam/files/digikam-1.2.0-libpgf-r3.patch b/medi= a-gfx/digikam/files/digikam-1.2.0-libpgf-r3.patch deleted file mode 100644 index ebfb85d..0000000 --- a/media-gfx/digikam/files/digikam-1.2.0-libpgf-r3.patch +++ /dev/null @@ -1,157 +0,0 @@ -diff -ruN old/cmake/modules/FindPGF.cmake new/cmake/modules/FindPGF.cmak= e ---- old/cmake/modules/FindPGF.cmake 1969-12-31 21:00:00.000000000 -0300 -+++ new/cmake/modules/FindPGF.cmake 2010-03-30 13:54:13.520854878 -0300 -@@ -0,0 +1,15 @@ -+# - Try to find libpgf -+# Once done this will define -+# -+# PGF_FOUND - system has libgf -+# PGF_INCLUDE_DIRS - the libpgf include directory -+# PGF_LIBRARIES - Link these to use libpgf -+ -+# PKG-CONFIG is required. -+INCLUDE(FindPkgConfig REQUIRED) -+ -+IF(PKG_CONFIG_FOUND) -+ INCLUDE(FindPkgConfig) -+ -+ PKG_CHECK_MODULES(PGF libpgf) -+ENDIF(PKG_CONFIG_FOUND) -diff -ruN old/CMakeLists.txt new/CMakeLists.txt ---- old/CMakeLists.txt 2010-03-28 19:26:06.000000000 -0300 -+++ new/CMakeLists.txt 2010-03-30 19:50:55.537108644 -0300 -@@ -34,6 +34,9 @@ - "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}" - ) -=20 -+# Path to find FindPGF.cmake script. -+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/m= odules") -+ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # Debug area codes - # These codes will be set for every project specific path automatically= , so -@@ -115,6 +118,11 @@ - FIND_PACKAGE(JPEG) - FIND_PACKAGE(PNG) - FIND_PACKAGE(TIFF) -+ -+# Included to unbundle libpgf that is on portage tree. -+# This function call the script cmake/modules/FindPGF.cmake -+FIND_PACKAGE(PGF) -+ - FIND_PACKAGE(Jasper) - FIND_PACKAGE(Kdcraw) - FIND_PACKAGE(Kexiv2) -@@ -210,6 +218,7 @@ -=20 - PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND) - PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "= " TIFF_FOUND) -+PRINT_LIBRARY_STATUS("libpgf" "http://www.libpgf.org" "" PGF_FOUND) - PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.htm= l" " (version >=3D 1.2.7)" PNG_FOUND) - PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jaspe= r" "" JASPER_FOUND) - PRINT_LIBRARY_STATUS("liblcms" "http://www.littlecms.com" "" LCMS_FOUND= ) -@@ -311,13 +320,13 @@ - MESSAGE(STATUS "") - ENDIF(DOXYGEN_FOUND) -=20 --IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FO= UND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) -+IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND= AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) - MESSAGE(STATUS " digiKam will be compiled................. YES") - SET(DIGIKAM_CAN_BE_COMPILED true) --ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JAS= PER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) -+ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOU= ND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUN= D) - MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO = (Look README file for more details about dependencies)") - SET(DIGIKAM_CAN_BE_COMPILED false) --ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER= _FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) -+ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FO= UND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOU= ND) -=20 - MESSAGE(STATUS "-------------------------------------------------------= ---------------------------") - MESSAGE(STATUS "") -@@ -952,14 +961,7 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp - ) -=20 -- SET(libpgf_SRCS -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransfo= rm.cpp -- ) -+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) -=20 - SET(libsqlite2_SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c -diff -ruN old/digikam/CMakeLists.txt new/digikam/CMakeLists.txt ---- old/digikam/CMakeLists.txt 2010-03-28 19:19:21.000000000 -0300 -+++ new/digikam/CMakeLists.txt 2010-03-30 19:44:00.296860646 -0300 -@@ -52,7 +52,6 @@ - # specific libs and utilities - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlit= e2 -- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpg= f - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapa= ck - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine -@@ -89,6 +88,7 @@ - ${JPEG_INCLUDE_DIR} - ${PNG_PNG_INCLUDE_DIR} - ${TIFF_INCLUDE_DIR} -+ ${PGF_INCLUDE_DIRS} - ) -=20 - IF(LENSFUN_LIBRARY) -@@ -100,9 +100,6 @@ - # Disable Clapack C code warnings. - SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS= "-w") -=20 --# Disable libpgf warnings. --SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w= ") -- - # Disable liblqr C code warnings. - SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w= ") -=20 -@@ -121,7 +118,6 @@ - ${libjpegutils_SRCS} - ${libthreadimageio_SRCS} - ${libthemeengine_SRCS} -- ${libpgf_SRCS} - ${pgfutils_SRCS} - ${libdigikamhelpers_SRCS} -=20 -@@ -173,6 +169,7 @@ - ${JPEG_LIBRARIES} - ${TIFF_LIBRARIES} - ${PNG_LIBRARIES} -+ ${PGF_LIBRARIES} - ${LCMS_LIBRARIES} - ${JASPER_LIBRARIES} -=20 -@@ -225,7 +222,6 @@ - ${libhaar_SRCS} - ${libdatabasemodels_SRCS} - ${libsqlite2_SRCS} -- ${libpgf_SRCS} - ${pgfutils_SRCS} - ) -=20 -@@ -240,6 +236,7 @@ - ${QT_QTCORE_LIBRARY} - ${QT_QTGUI_LIBRARY} - ${QT_QTSQL_LIBRARY} -+ ${PGF_LIBRARIES} - ) -=20 - SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSIO= N 1 ) -diff -ruN old/libs/CMakeLists.txt new/libs/CMakeLists.txt ---- old/libs/CMakeLists.txt 2010-03-28 19:19:02.000000000 -0300 -+++ new/libs/CMakeLists.txt 2010-03-30 14:03:07.365604017 -0300 -@@ -18,6 +18,7 @@ - ${JPEG_INCLUDE_DIR} - ${TIFF_INCLUDE_DIR} - ${PNG_INCLUDE_DIR} -+ ${PGF_INCLUDE_DIRS} - ${JASPER_INCLUDE_DIR} - ) - ADD_SUBDIRECTORY( histogram ) diff --git a/media-gfx/digikam/files/digikam-1.2.0-libpgf.patch b/media-g= fx/digikam/files/digikam-1.2.0-libpgf.patch deleted file mode 100644 index e788cf0..0000000 --- a/media-gfx/digikam/files/digikam-1.2.0-libpgf.patch +++ /dev/null @@ -1,208 +0,0 @@ -diff -ruN old/cmake/modules/FindPGF.cmake new/cmake/modules/FindPGF.cmak= e ---- old/cmake/modules/FindPGF.cmake 1969-12-31 21:00:00.000000000 -0300 -+++ new/cmake/modules/FindPGF.cmake 2010-03-30 13:54:13.520854878 -0300 -@@ -0,0 +1,15 @@ -+# - Try to find libpgf -+# Once done this will define -+# -+# PGF_FOUND - system has libgf -+# PGF_INCLUDE_DIRS - the libpgf include directory -+# PGF_LIBRARIES - Link these to use libpgf -+ -+# PKG-CONFIG is required. -+INCLUDE(FindPkgConfig REQUIRED) -+ -+IF(PKG_CONFIG_FOUND) -+ INCLUDE(FindPkgConfig) -+ -+ PKG_CHECK_MODULES(PGF libpgf) -+ENDIF(PKG_CONFIG_FOUND) -diff -ruN old/CMakeLists.txt new/CMakeLists.txt ---- old/CMakeLists.txt 2010-03-28 19:26:06.000000000 -0300 -+++ new/CMakeLists.txt 2010-03-30 19:50:55.537108644 -0300 -@@ -34,6 +34,9 @@ - "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}" - ) -=20 -+# Path to find FindPGF.cmake script. -+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/m= odules") -+ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # Debug area codes - # These codes will be set for every project specific path automatically= , so -@@ -115,6 +118,11 @@ - FIND_PACKAGE(JPEG) - FIND_PACKAGE(PNG) - FIND_PACKAGE(TIFF) -+ -+# Included to unbundle libpgf that is on portage tree. -+# This function call the script cmake/modules/FindPGF.cmake -+FIND_PACKAGE(PGF) -+ - FIND_PACKAGE(Jasper) - FIND_PACKAGE(Kdcraw) - FIND_PACKAGE(Kexiv2) -@@ -210,6 +218,7 @@ -=20 - PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND) - PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "= " TIFF_FOUND) -+PRINT_LIBRARY_STATUS("libpgf" "http://www.libpgf.org" "" PGF_FOUND) - PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.htm= l" " (version >=3D 1.2.7)" PNG_FOUND) - PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jaspe= r" "" JASPER_FOUND) - PRINT_LIBRARY_STATUS("liblcms" "http://www.littlecms.com" "" LCMS_FOUND= ) -@@ -311,13 +320,13 @@ - MESSAGE(STATUS "") - ENDIF(DOXYGEN_FOUND) -=20 --IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FO= UND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) -+IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND= AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) - MESSAGE(STATUS " digiKam will be compiled................. YES") - SET(DIGIKAM_CAN_BE_COMPILED true) --ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JAS= PER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) -+ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOU= ND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUN= D) - MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO = (Look README file for more details about dependencies)") - SET(DIGIKAM_CAN_BE_COMPILED false) --ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER= _FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) -+ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FO= UND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOU= ND) -=20 - MESSAGE(STATUS "-------------------------------------------------------= ---------------------------") - MESSAGE(STATUS "") -@@ -952,14 +961,7 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp - ) -=20 -- SET(libpgf_SRCS -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransfo= rm.cpp -- ) -+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) -=20 - SET(libsqlite2_SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c -@@ -1258,18 +1260,41 @@ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # API documentation generation -=20 --IF(DOXYGEN_FOUND) -+# Checks if user ask to build documentation. -+IF(BUILD_DOC) -+ IF(DOXYGEN_FOUND) -+ -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will be installed") -+ MESSAGE(STATUS "") -=20 -- SET(API_DIR ${CMAKE_BINARY_DIR}/api) -- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) -- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) -- SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) -+ SET(API_DIR ${CMAKE_BINARY_DIR}/api) -+ SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) -+ SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) -+ SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) -=20 -- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -+ CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -=20 -- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -+ ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -+ -+ ELSE(DOXYGEN_FOUND) -+ =20 -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will NOT be installed") -+ MESSAGE(STATUS "Doxygen wasn't found on the system") -+ MESSAGE(STATUS "") -+ -+ ENDIF(DOXYGEN_FOUND) -+ -+ELSE(BUILD_DOC) -+ -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will NOT be installed") -+ MESSAGE(STATUS "Because the option -DBUILD_DOC=3DON wasn't passed t= o cmake") -+ MESSAGE(STATUS "") -+ -+ENDIF(BUILD_DOC) -=20 --ENDIF(DOXYGEN_FOUND) - include(MacroOptionalAddSubdirectory) - macro_optional_add_subdirectory( po ) -diff -ruN old/digikam/CMakeLists.txt new/digikam/CMakeLists.txt ---- old/digikam/CMakeLists.txt 2010-03-28 19:19:21.000000000 -0300 -+++ new/digikam/CMakeLists.txt 2010-03-30 19:44:00.296860646 -0300 -@@ -52,7 +52,6 @@ - # specific libs and utilities - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlit= e2 -- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpg= f - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapa= ck - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine -@@ -89,6 +88,7 @@ - ${JPEG_INCLUDE_DIR} - ${PNG_PNG_INCLUDE_DIR} - ${TIFF_INCLUDE_DIR} -+ ${PGF_INCLUDE_DIRS} - ) -=20 - IF(LENSFUN_LIBRARY) -@@ -100,9 +100,6 @@ - # Disable Clapack C code warnings. - SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS= "-w") -=20 --# Disable libpgf warnings. --SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w= ") -- - # Disable liblqr C code warnings. - SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w= ") -=20 -@@ -121,7 +118,6 @@ - ${libjpegutils_SRCS} - ${libthreadimageio_SRCS} - ${libthemeengine_SRCS} -- ${libpgf_SRCS} - ${pgfutils_SRCS} - ${libdigikamhelpers_SRCS} -=20 -@@ -173,6 +169,7 @@ - ${JPEG_LIBRARIES} - ${TIFF_LIBRARIES} - ${PNG_LIBRARIES} -+ ${PGF_LIBRARIES} - ${LCMS_LIBRARIES} - ${JASPER_LIBRARIES} -=20 -@@ -225,7 +222,6 @@ - ${libhaar_SRCS} - ${libdatabasemodels_SRCS} - ${libsqlite2_SRCS} -- ${libpgf_SRCS} - ${pgfutils_SRCS} - ) -=20 -@@ -240,6 +236,7 @@ - ${QT_QTCORE_LIBRARY} - ${QT_QTGUI_LIBRARY} - ${QT_QTSQL_LIBRARY} -+ ${PGF_LIBRARIES} - ) -=20 - SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSIO= N 1 ) -diff -ruN old/libs/CMakeLists.txt new/libs/CMakeLists.txt ---- old/libs/CMakeLists.txt 2010-03-28 19:19:02.000000000 -0300 -+++ new/libs/CMakeLists.txt 2010-03-30 14:03:07.365604017 -0300 -@@ -18,6 +18,7 @@ - ${JPEG_INCLUDE_DIR} - ${TIFF_INCLUDE_DIR} - ${PNG_INCLUDE_DIR} -+ ${PGF_INCLUDE_DIRS} - ${JASPER_INCLUDE_DIR} - ) - ADD_SUBDIRECTORY( histogram ) diff --git a/media-gfx/digikam/files/digikam-1.2.0-ratingwidget.patch b/m= edia-gfx/digikam/files/digikam-1.2.0-ratingwidget.patch deleted file mode 100644 index 02d4cce..0000000 --- a/media-gfx/digikam/files/digikam-1.2.0-ratingwidget.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trunk/extragear/graphics/digikam/digikam/ratingwidget.cpp 2010/03/30= 18:15:12 1109176 -+++ trunk/extragear/graphics/digikam/digikam/ratingwidget.cpp 2010/03/30= 18:15:25 1109177 -@@ -165,7 +165,7 @@ - void RatingWidget::setFadingValue(int value) - { - d->fadingValue =3D value; -- if (d->fadingValue >=3D 255) -+ if (d->fadingValue >=3D 255 && d->fadingTimeLine) - { - d->fadingTimeLine->stop(); - } diff --git a/media-gfx/digikam/files/digikam-1.3.0-docs.patch b/media-gfx= /digikam/files/digikam-1.3.0-docs.patch deleted file mode 100644 index 63af639..0000000 --- a/media-gfx/digikam/files/digikam-1.3.0-docs.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -r -u -N digikam-1.3.0.orig/CMakeLists.txt digikam-1.3.0/CMakeLists= .txt ---- digikam-1.3.0.orig/CMakeLists.txt 2010-06-07 23:23:08.000000000 +0= 200 -+++ digikam-1.3.0/CMakeLists.txt 2010-07-06 21:26:53.163356449 +0= 200 -@@ -1334,18 +1336,41 @@ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # API documentation generation -=20 --IF(DOXYGEN_FOUND) -+# Checks if user ask to build documentation. -+IF(BUILD_DOC) -+ IF(DOXYGEN_FOUND) -+ -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will be installed") -+ MESSAGE(STATUS "") -=20 -- SET(API_DIR ${CMAKE_BINARY_DIR}/api) -- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) -- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) -- SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) -+ SET(API_DIR ${CMAKE_BINARY_DIR}/api) -+ SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) -+ SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) -+ SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) -=20 -- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -+ CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -=20 -- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -+ ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -+ -+ ELSE(DOXYGEN_FOUND) -+ =20 -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will NOT be installed") -+ MESSAGE(STATUS "Doxygen wasn't found on the system") -+ MESSAGE(STATUS "") -+ -+ ENDIF(DOXYGEN_FOUND) -+ -+ELSE(BUILD_DOC) -+ -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will NOT be installed") -+ MESSAGE(STATUS "Because the option -DBUILD_DOC=3DON wasn't passed t= o cmake") -+ MESSAGE(STATUS "") -+ -+ENDIF(BUILD_DOC) -=20 --ENDIF(DOXYGEN_FOUND) - include(MacroOptionalAddSubdirectory) - macro_optional_add_subdirectory( po ) diff --git a/media-gfx/digikam/files/digikam-1.3.0-pgf.patch b/media-gfx/= digikam/files/digikam-1.3.0-pgf.patch deleted file mode 100644 index c965a84..0000000 --- a/media-gfx/digikam/files/digikam-1.3.0-pgf.patch +++ /dev/null @@ -1,153 +0,0 @@ -diff -u -r -N digikam-1.3.0-1-docs/CMakeLists.txt digikam-1.3.0/CMakeLis= ts.txt ---- digikam-1.3.0-1-docs/CMakeLists.txt 2010-08-26 23:24:35.000000000 +0= 200 -+++ digikam-1.3.0/CMakeLists.txt 2010-08-26 23:44:46.000000000 +0200 -@@ -34,6 +34,9 @@ - "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}" - ) -=20 -+# Path to find FindPGF.cmake script. -+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/m= odules") -+ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # Debug area codes - # These codes will be set for every project specific path automatically= , so -@@ -133,6 +136,7 @@ - FIND_PACKAGE(JPEG) - FIND_PACKAGE(PNG) - FIND_PACKAGE(TIFF) -+FIND_PACKAGE(PGF) - FIND_PACKAGE(Jasper) - FIND_PACKAGE(Kdcraw) - FIND_PACKAGE(Kexiv2) -@@ -267,6 +271,13 @@ - PRINT_LIBRARY_STATUS("libkexiv2" "http://www.digikam.org/sharedlibs" " = (version >=3D 1.1.0)" KEXIV2_FOR_DIGIKAM) - PRINT_LIBRARY_STATUS("libkdcraw" "http://www.digikam.org/sharedlibs" " = (version >=3D 1.1.0)" KDCRAW_FOR_DIGIKAM) -=20 -+IF(PGF_FOUND) -+ MESSAGE(STATUS " libpgf library found..................... YES (opt= ional)") -+ELSE(PGF_FOUND) -+ MESSAGE(STATUS " libpgf library found..................... NO (opt= ional - internal version used instead)") -+ENDIF(GPHOTO2_FOUND) -+ -+ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -=20 - IF(GPHOTO2_FOUND) -@@ -1018,14 +1029,18 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp - ) -=20 -- SET(libpgf_SRCS -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransfo= rm.cpp -+ IF(PGF_FOUND) -+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) -+ ELSE(PGF_FOUND) -+ SET(libpgf_SRCS -+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp -+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp -+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp -+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp -+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp -+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTrans= form.cpp - ) -+ ENDIF(PGF_FOUND) -=20 - SET(libsqlite2_SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c -diff -u -r -N digikam-1.3.0-1-docs/cmake/modules/FindPGF.cmake digikam-1= .3.0/cmake/modules/FindPGF.cmake ---- digikam-1.3.0-1-docs/cmake/modules/FindPGF.cmake 1970-01-01 01:00:00= .000000000 +0100 -+++ digikam-1.3.0/cmake/modules/FindPGF.cmake 2010-08-26 23:25:18.000000= 000 +0200 -@@ -0,0 +1,15 @@ -+# - Try to find libpgf -+# Once done this will define -+# -+# PGF_FOUND - system has libgf -+# PGF_INCLUDE_DIRS - the libpgf include directory -+# PGF_LIBRARIES - Link these to use libpgf -+ -+# PKG-CONFIG is required. -+INCLUDE(FindPkgConfig REQUIRED) -+ -+IF(PKG_CONFIG_FOUND) -+ INCLUDE(FindPkgConfig) -+ -+ PKG_CHECK_MODULES(PGF libpgf) -+ENDIF(PKG_CONFIG_FOUND) -diff -u -r -N digikam-1.3.0-1-docs/digikam/CMakeLists.txt digikam-1.3.0/= digikam/CMakeLists.txt ---- digikam-1.3.0-1-docs/digikam/CMakeLists.txt 2010-06-07 23:16:45.0000= 00000 +0200 -+++ digikam-1.3.0/digikam/CMakeLists.txt 2010-08-26 23:39:47.000000000 += 0200 -@@ -53,7 +53,6 @@ - # specific libs and utilities - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlit= e2 -- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpg= f - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapa= ck - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine -@@ -94,6 +93,12 @@ - ${TIFF_INCLUDE_DIR} - ) -=20 -+IF(PGF_FOUND) -+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) -+ELSE(PGF_FOUND) -+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lib= pgf) -+ENDIF(PGF_FOUND) -+ - IF(LENSFUN_LIBRARY) - INCLUDE_DIRECTORIES(${LENSFUN_INCLUDE_DIR}) - ENDIF(LENSFUN_LIBRARY) -@@ -103,8 +108,10 @@ - # Disable Clapack C code warnings. - SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS= "-w") -=20 --# Disable libpgf warnings. --SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w= ") -+IF(NOT PGF_FOUND) -+ # Disable libpgf warnings. -+ SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS = "-w") -+ENDIF(NOT PGF_FOUND) -=20 - # Disable liblqr C code warnings. - SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w= ") -@@ -188,6 +195,10 @@ - ${KIPI_LIBRARIES} - ) -=20 -+IF(PGF_FOUND) -+ TARGET_LINK_LIBRARIES(digikamcore ${PGF_LIBRARIES}) -+ENDIF(PGF_FOUND) -+ - IF(MARBLEWIDGET_FOUND) - TARGET_LINK_LIBRARIES(digikamcore ${LIBMARBLEWIDGET_LIBRARY}) - ENDIF(MARBLEWIDGET_FOUND) -@@ -246,6 +257,10 @@ - ${QT_QTSQL_LIBRARY} - ) -=20 -+IF(PGF_FOUND) -+ TARGET_LINK_LIBRARIES(digikamdatabase ${PGF_LIBRARIES}) -+ENDIF(PGF_FOUND) -+ - SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSIO= N 1 ) - INSTALL(TARGETS digikamdatabase ${INSTALL_TARGETS_DEFAULT_ARGS} ) -=20 -diff -u -r -N digikam-1.3.0-1-docs/libs/CMakeLists.txt digikam-1.3.0/lib= s/CMakeLists.txt ---- digikam-1.3.0-1-docs/libs/CMakeLists.txt 2010-06-07 23:16:40.0000000= 00 +0200 -+++ digikam-1.3.0/libs/CMakeLists.txt 2010-08-26 23:43:35.000000000 +020= 0 -@@ -21,6 +21,10 @@ - ${JASPER_INCLUDE_DIR} - ) -=20 -+IF(PGF_FOUND) -+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) -+ENDIF(PGF_FOUND) -+ - ADD_SUBDIRECTORY( histogram ) - ADD_SUBDIRECTORY( dmetadata ) - ADD_SUBDIRECTORY( dimg ) diff --git a/media-gfx/digikam/files/digikam-1.4.0-clapack.patch b/media-= gfx/digikam/files/digikam-1.4.0-clapack.patch deleted file mode 100644 index 2fb1f5e..0000000 --- a/media-gfx/digikam/files/digikam-1.4.0-clapack.patch +++ /dev/null @@ -1,181 +0,0 @@ -diff -r -u -N digikam-1.4.0.1pgf/CMakeLists.txt digikam-1.4.0/CMakeLists= .txt ---- digikam-1.4.0.1pgf/CMakeLists.txt 2010-08-31 23:39:20.000000000 +020= 0 -+++ digikam-1.4.0/CMakeLists.txt 2010-08-31 23:39:47.000000000 +0200 -@@ -141,6 +141,7 @@ - FIND_PACKAGE(Kdcraw) - FIND_PACKAGE(Kexiv2) - FIND_PACKAGE(Kipi) -+FIND_PACKAGE(CLAPACK) -=20 - # Extract version of libjpeg so that we can use the appropriate dir - # See bug #227313, #228483 -@@ -278,7 +279,13 @@ - MESSAGE(STATUS " libpgf library found..................... YES (opt= ional)") - ELSE(PGF_FOUND) - MESSAGE(STATUS " libpgf library found..................... NO (opt= ional - internal version used instead)") --ENDIF(GPHOTO2_FOUND) -+ENDIF(PGF_FOUND) -+ -+IF(CLAPACK_FOUND) -+ MESSAGE(STATUS " libclapack library found................. YES (opt= ional)") -+ELSE(CLAPACK_FOUND) -+ MESSAGE(STATUS " libclapack library found................. NO (opt= ional - internal version used instead)") -+ENDIF(CLAPACK_FOUND) -=20 -=20 - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -@@ -377,13 +384,19 @@ - ENDIF(DOXYGEN_FOUND) -=20 - IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FO= UND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND) -- MESSAGE(STATUS " digiKam will be compiled................. YES") -+ MESSAGE(STATUS " digiKam can be compiled.................. YES") - SET(DIGIKAM_CAN_BE_COMPILED true) - ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JAS= PER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND) - MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO = (Look README file for more details about dependencies)") - SET(DIGIKAM_CAN_BE_COMPILED false) - ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER= _FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND) -=20 -+IF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) OR = (NOT CLAPACK_FOUND))) -+ MESSAGE(STATUS "") -+ MESSAGE(FATAL_ERROR " BUNDLED LIBRARIES HAVE BEEN FORCE-DISABLED IN= THIS BUILD. Aborting.") -+ SET(DIGIKAM_CAN_BE_COMPILED false) -+ENDIF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) = OR (NOT CLAPACK_FOUND))) -+ - MESSAGE(STATUS "-------------------------------------------------------= ---------------------------") - MESSAGE(STATUS "") -=20 -@@ -541,7 +554,8 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp - ) -=20 -- SET(libclapack_SRCS -+ if(NOT CLAPACK_FOUND) -+ SET(libclapack_SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/abort_.c - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgesv.c - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dlaswp.c -@@ -574,6 +588,7 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/util.c - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/xerbla.c - ) -+ endif(NOT CLAPACK_FOUND) -=20 - SET(libdimgfilters_SRCS - ${libclapack_SRCS} -diff -r -u -N digikam-1.4.0.1pgf/cmake/modules/FindCLAPACK.cmake digikam= -1.4.0/cmake/modules/FindCLAPACK.cmake ---- digikam-1.4.0.1pgf/cmake/modules/FindCLAPACK.cmake 1970-01-01 01:00:= 00.000000000 +0100 -+++ digikam-1.4.0/cmake/modules/FindCLAPACK.cmake 2010-08-31 23:43:20.00= 0000000 +0200 -@@ -0,0 +1,44 @@ -+# - Try to find clapack library -+# Once done this will define -+# -+# CLAPACK_FOUND - system has CLAPACK library -+# CLAPACK_INCLUDE_DIR - the CLAPACK include directory -+# CLAPACK_LIBRARY - the marblewidget library -+# -+# copyright 2008 by Patrick Spendrin -+# copyright 2010 by Andreas K. Huettel -+# use this file as you like -+# -+ -+if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) -+ -+ # Already in cache -+ set(CLAPACK_FOUND TRUE) -+ -+else(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) -+ -+ find_path(CLAPACK_INCLUDE_DIR clapack.h PATHS /usr/include/clapack NO= _DEFAULT_PATH) -+ if(CLAPACK_INCLUDE_DIR) -+ message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}") -+ else(CLAPACK_INCLUDE_DIR) -+ find_path(CLAPACK_INCLUDE_DIR clapack.h PATHS /usr/include/clapack= ) -+ if(CLAPACK_INCLUDE_DIR) -+ message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}"= ) -+ endif(CLAPACK_INCLUDE_DIR) -+ endif(CLAPACK_INCLUDE_DIR) -+ -+ find_library(CLAPACK_LIBRARY clapack) -+ if(CLAPACK_LIBRARY) -+ message(STATUS "Found clapack library: ${CLAPACK_LIBRARY}") -+ endif(CLAPACK_LIBRARY) -+ -+ if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) -+ set(CLAPACK_FOUND TRUE) -+ endif(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) -+ -+ if(NOT CLAPACK_FOUND) -+ message(STATUS "Could NOT find any working clapack installation") -+ endif(NOT CLAPACK_FOUND) -+ -+ mark_as_advanced(CLAPACK_INCLUDE_DIR CLAPACK_LIBRARY) -+endif(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) -diff -r -u -N digikam-1.4.0.1pgf/digikam/CMakeLists.txt digikam-1.4.0/di= gikam/CMakeLists.txt ---- digikam-1.4.0.1pgf/digikam/CMakeLists.txt 2010-08-31 23:39:20.000000= 000 +0200 -+++ digikam-1.4.0/digikam/CMakeLists.txt 2010-08-31 23:39:47.000000000 += 0200 -@@ -53,7 +53,6 @@ - # specific libs and utilities - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlit= e2 -- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapa= ck - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine - ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/kipiiface -@@ -103,10 +102,18 @@ - INCLUDE_DIRECTORIES(${LENSFUN_INCLUDE_DIR}) - ENDIF(LENSFUN_LIBRARY) -=20 -+IF(CLAPACK_FOUND) -+ INCLUDE_DIRECTORIES(${CLAPACK_INCLUDE_DIR}) -+ELSE(CLAPACK_FOUND) -+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cla= pack) -+ENDIF(CLAPACK_FOUND) -+ - # Shared libdigikamcore ###############################################= ################# -=20 --# Disable Clapack C code warnings. --SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS= "-w") -+IF(NOT CLAPACK_FOUND) -+ # Disable Clapack C code warnings. -+ SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FL= AGS "-w") -+ENDIF(NOT CLAPACK_FOUND) -=20 - IF(NOT PGF_FOUND) - # Disable libpgf warnings. -@@ -203,6 +210,10 @@ - TARGET_LINK_LIBRARIES(digikamcore ${LIBMARBLEWIDGET_LIBRARY}) - ENDIF(MARBLEWIDGET_FOUND) -=20 -+IF(CLAPACK_FOUND) -+ TARGET_LINK_LIBRARIES(digikamcore ${CLAPACK_LIBRARY}) -+ENDIF(CLAPACK_FOUND) -+ - IF(Q_WS_X11) - TARGET_LINK_LIBRARIES(digikamcore ${X11_LIBRARIES}) - ENDIF(Q_WS_X11) -@@ -359,6 +370,10 @@ - TARGET_LINK_LIBRARIES(digikam ${LIBMARBLEWIDGET_LIBRARY}) - ENDIF(MARBLEWIDGET_FOUND) -=20 -+IF(CLAPACK_FOUND) -+ TARGET_LINK_LIBRARIES(digikam ${CLAPACK_LIBRARY}) -+ENDIF(CLAPACK_FOUND) -+ - INSTALL(TARGETS digikam ${INSTALL_TARGETS_DEFAULT_ARGS}) -=20 - # Others Files to install #############################################= ########## -diff -r -u -N digikam-1.4.0.1pgf/showfoto/CMakeLists.txt digikam-1.4.0/s= howfoto/CMakeLists.txt ---- digikam-1.4.0.1pgf/showfoto/CMakeLists.txt 2010-08-22 10:53:39.00000= 0000 +0200 -+++ digikam-1.4.0/showfoto/CMakeLists.txt 2010-08-31 23:39:47.000000000 = +0200 -@@ -65,6 +65,10 @@ -=20 - KDE4_ADD_EXECUTABLE(showfoto ${showfoto_SRCS}) -=20 -+IF(CLAPACK_FOUND) -+ TARGET_LINK_LIBRARIES(showfoto ${CLAPACK_LIBRARY}) -+ENDIF(CLAPACK_FOUND) -+ - TARGET_LINK_LIBRARIES(showfoto - digikamcore - ${KEXIV2_LIBRARIES} diff --git a/media-gfx/digikam/files/digikam-1.4.0-docs.patch b/media-gfx= /digikam/files/digikam-1.4.0-docs.patch deleted file mode 100644 index 2cc2791..0000000 --- a/media-gfx/digikam/files/digikam-1.4.0-docs.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -r -u digikam-1.4.0.orig/CMakeLists.txt digikam-1.4.0/CMakeLists.tx= t ---- digikam-1.4.0.orig/CMakeLists.txt 2010-08-22 10:59:50.000000000 +020= 0 -+++ digikam-1.4.0/CMakeLists.txt 2010-09-24 23:48:11.557561663 +0200 -@@ -1340,18 +1340,45 @@ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # API documentation generation -=20 --IF(DOXYGEN_FOUND) -+# Checks if user ask to build documentation. -+IF(BUILD_DOC) -+ IF(DOXYGEN_FOUND) -=20 -- SET(API_DIR ${CMAKE_BINARY_DIR}/api) -- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) -- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) -- SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will be installed") -+ MESSAGE(STATUS "") -=20 -- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -+ SET(API_DIR ${CMAKE_BINARY_DIR}/api) -+ SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) -+ SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) -+ SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) -=20 -- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -+ CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -+ -+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -+ -+ ELSE(DOXYGEN_FOUND) -+ =20 -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will NOT be installed") -+ MESSAGE(STATUS "Doxygen wasn't found on the system") -+ MESSAGE(STATUS "") -+ -+ ENDIF(DOXYGEN_FOUND) -+ -+ELSE(BUILD_DOC) -+ -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will NOT be installed") -+ MESSAGE(STATUS "Because the option -DBUILD_DOC=3DON wasn't passed t= o cmake") -+ MESSAGE(STATUS "") -+ -+ENDIF(BUILD_DOC) -=20 --ENDIF(DOXYGEN_FOUND) - include(MacroOptionalAddSubdirectory) - macro_optional_add_subdirectory( po ) -+ -+# Build the handbook -+add_subdirectory( doc ) -+ diff --git a/media-gfx/digikam/files/digikam-1.5.0-unbundle.patch b/media= -gfx/digikam/files/digikam-1.5.0-unbundle.patch deleted file mode 100644 index 6d1470b..0000000 --- a/media-gfx/digikam/files/digikam-1.5.0-unbundle.patch +++ /dev/null @@ -1,294 +0,0 @@ -diff -r -u -N digikam-1.5.0-1-docs/CMakeLists.txt digikam-1.5.0/CMakeLis= ts.txt ---- digikam-1.5.0-1-docs/CMakeLists.txt 2010-10-12 21:14:36.000000000 +0= 200 -+++ digikam-1.5.0/CMakeLists.txt 2010-10-15 23:07:49.000000000 +0200 -@@ -34,6 +34,9 @@ - "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}" - ) -=20 -+# Path to find FindPGF.cmake script. -+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/m= odules") -+ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # Debug area codes - # These codes will be set for every project specific path automatically= , so -@@ -133,10 +136,12 @@ - FIND_PACKAGE(JPEG) - FIND_PACKAGE(PNG) - FIND_PACKAGE(TIFF) -+FIND_PACKAGE(PGF) - FIND_PACKAGE(Jasper) - FIND_PACKAGE(Kdcraw) - FIND_PACKAGE(Kexiv2) - FIND_PACKAGE(Kipi) -+FIND_PACKAGE(CLAPACK) -=20 - # Extract version of libjpeg so that we can use the appropriate dir - # See bug #227313, #228483 -@@ -273,6 +278,19 @@ - PRINT_LIBRARY_STATUS("libkexiv2" "http://www.digikam.org/sharedlibs" " = (version >=3D 1.1.0)" KEXIV2_FOR_DIGIKAM) - PRINT_LIBRARY_STATUS("libkdcraw" "http://www.digikam.org/sharedlibs" " = (version >=3D 1.1.0)" KDCRAW_FOR_DIGIKAM) -=20 -+IF(PGF_FOUND) -+ MESSAGE(STATUS " libpgf library found..................... YES (opt= ional)") -+ELSE(PGF_FOUND) -+ MESSAGE(STATUS " libpgf library found..................... NO (opt= ional - internal version used instead)") -+ENDIF(PGF_FOUND) -+ -+IF(CLAPACK_FOUND) -+ MESSAGE(STATUS " libclapack library found................. YES (opt= ional)") -+ELSE(CLAPACK_FOUND) -+ MESSAGE(STATUS " libclapack library found................. NO (opt= ional - internal version used instead)") -+ENDIF(CLAPACK_FOUND) -+ -+ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -=20 - IF(GPHOTO2_FOUND) -@@ -367,13 +385,19 @@ - ENDIF(DOXYGEN_FOUND) -=20 - IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FO= UND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND) -- MESSAGE(STATUS " digiKam will be compiled................. YES") -+ MESSAGE(STATUS " digiKam can be compiled.................. YES") - SET(DIGIKAM_CAN_BE_COMPILED true) - ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JAS= PER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND) - MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO = (Look README file for more details about dependencies)") - SET(DIGIKAM_CAN_BE_COMPILED false) - ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER= _FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND) -=20 -+IF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) OR = (NOT CLAPACK_FOUND) OR (NOT LENSFUN_FOUND))) -+ MESSAGE(STATUS "") -+ MESSAGE(FATAL_ERROR " BUNDLED LIBRARIES HAVE BEEN FORCE-DISABLED IN= THIS BUILD. Aborting.") -+ SET(DIGIKAM_CAN_BE_COMPILED false) -+ENDIF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) = OR (NOT CLAPACK_FOUND) OR (NOT LENSFUN_FOUND))) -+ - MESSAGE(STATUS "-------------------------------------------------------= ---------------------------") - MESSAGE(STATUS "") -=20 -@@ -585,7 +609,8 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp - ) -=20 -- SET(libclapack_SRCS -+ if(NOT CLAPACK_FOUND) -+ SET(libclapack_SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/abort_.c - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgesv.c - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dlaswp.c -@@ -618,6 +643,7 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/util.c - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/xerbla.c - ) -+ endif(NOT CLAPACK_FOUND) -=20 - SET(libdimgfilters_SRCS - ${libclapack_SRCS} -@@ -1076,14 +1102,18 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp - ) -=20 -- SET(libpgf_SRCS -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransfo= rm.cpp -+ IF(PGF_FOUND) -+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) -+ ELSE(PGF_FOUND) -+ SET(libpgf_SRCS -+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp -+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp -+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp -+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp -+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp -+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTrans= form.cpp - ) -+ ENDIF(PGF_FOUND) -=20 - SET(libsqlite2_SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c -diff -r -u -N digikam-1.5.0-1-docs/cmake/modules/FindCLAPACK.cmake digik= am-1.5.0/cmake/modules/FindCLAPACK.cmake ---- digikam-1.5.0-1-docs/cmake/modules/FindCLAPACK.cmake 1970-01-01 01:0= 0:00.000000000 +0100 -+++ digikam-1.5.0/cmake/modules/FindCLAPACK.cmake 2010-10-15 23:06:08.00= 0000000 +0200 -@@ -0,0 +1,44 @@ -+# - Try to find clapack library -+# Once done this will define -+# -+# CLAPACK_FOUND - system has CLAPACK library -+# CLAPACK_INCLUDE_DIR - the CLAPACK include directory -+# CLAPACK_LIBRARY - the marblewidget library -+# -+# copyright 2008 by Patrick Spendrin -+# copyright 2010 by Andreas K. Huettel -+# use this file as you like -+# -+ -+if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) -+ -+ # Already in cache -+ set(CLAPACK_FOUND TRUE) -+ -+else(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) -+ -+ find_path(CLAPACK_INCLUDE_DIR clapack.h PATHS /usr/include/clapack NO= _DEFAULT_PATH) -+ if(CLAPACK_INCLUDE_DIR) -+ message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}") -+ else(CLAPACK_INCLUDE_DIR) -+ find_path(CLAPACK_INCLUDE_DIR clapack.h PATHS /usr/include/clapack= ) -+ if(CLAPACK_INCLUDE_DIR) -+ message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}"= ) -+ endif(CLAPACK_INCLUDE_DIR) -+ endif(CLAPACK_INCLUDE_DIR) -+ -+ find_library(CLAPACK_LIBRARY clapack) -+ if(CLAPACK_LIBRARY) -+ message(STATUS "Found clapack library: ${CLAPACK_LIBRARY}") -+ endif(CLAPACK_LIBRARY) -+ -+ if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) -+ set(CLAPACK_FOUND TRUE) -+ endif(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) -+ -+ if(NOT CLAPACK_FOUND) -+ message(STATUS "Could NOT find any working clapack installation") -+ endif(NOT CLAPACK_FOUND) -+ -+ mark_as_advanced(CLAPACK_INCLUDE_DIR CLAPACK_LIBRARY) -+endif(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) -diff -r -u -N digikam-1.5.0-1-docs/cmake/modules/FindPGF.cmake digikam-1= .5.0/cmake/modules/FindPGF.cmake ---- digikam-1.5.0-1-docs/cmake/modules/FindPGF.cmake 1970-01-01 01:00:00= .000000000 +0100 -+++ digikam-1.5.0/cmake/modules/FindPGF.cmake 2010-10-15 23:05:52.000000= 000 +0200 -@@ -0,0 +1,15 @@ -+# - Try to find libpgf -+# Once done this will define -+# -+# PGF_FOUND - system has libgf -+# PGF_INCLUDE_DIRS - the libpgf include directory -+# PGF_LIBRARIES - Link these to use libpgf -+ -+# PKG-CONFIG is required. -+INCLUDE(FindPkgConfig REQUIRED) -+ -+IF(PKG_CONFIG_FOUND) -+ INCLUDE(FindPkgConfig) -+ -+ PKG_CHECK_MODULES(PGF libpgf) -+ENDIF(PKG_CONFIG_FOUND) -diff -r -u -N digikam-1.5.0-1-docs/digikam/CMakeLists.txt digikam-1.5.0/= digikam/CMakeLists.txt ---- digikam-1.5.0-1-docs/digikam/CMakeLists.txt 2010-10-10 21:37:09.0000= 00000 +0200 -+++ digikam-1.5.0/digikam/CMakeLists.txt 2010-10-15 23:06:08.000000000 += 0200 -@@ -53,8 +53,6 @@ - # specific libs and utilities - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlit= e2 -- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpg= f -- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapa= ck - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine - ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/kipiiface -@@ -94,13 +92,29 @@ - ${TIFF_INCLUDE_DIR} - ) -=20 --# Shared libdigikamcore ###############################################= ################# -+IF(PGF_FOUND) -+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) -+ELSE(PGF_FOUND) -+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lib= pgf) -+ENDIF(PGF_FOUND) -+ -+IF(CLAPACK_FOUND) -+ INCLUDE_DIRECTORIES(${CLAPACK_INCLUDE_DIR}) -+ELSE(CLAPACK_FOUND) -+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cla= pack) -+ENDIF(CLAPACK_FOUND) -=20 --# Disable Clapack C code warnings. --SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS= "-w") -+# Shared libdigikamcore ###############################################= ################# -=20 --# Disable libpgf warnings. --SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w= ") -+IF(NOT CLAPACK_FOUND) -+ # Disable Clapack C code warnings. -+ SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FL= AGS "-w") -+ENDIF(NOT CLAPACK_FOUND) -+ -+IF(NOT PGF_FOUND) -+ # Disable libpgf warnings. -+ SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS = "-w") -+ENDIF(NOT PGF_FOUND) -=20 - # Disable liblqr C code warnings. - SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w= ") -@@ -187,10 +201,18 @@ - ${KIPI_LIBRARIES} - ) -=20 -+IF(PGF_FOUND) -+ TARGET_LINK_LIBRARIES(digikamcore ${PGF_LIBRARIES}) -+ENDIF(PGF_FOUND) -+ - IF(MARBLEWIDGET_FOUND) - TARGET_LINK_LIBRARIES(digikamcore ${LIBMARBLEWIDGET_LIBRARY}) - ENDIF(MARBLEWIDGET_FOUND) -=20 -+IF(CLAPACK_FOUND) -+ TARGET_LINK_LIBRARIES(digikamcore ${CLAPACK_LIBRARY}) -+ENDIF(CLAPACK_FOUND) -+ - IF(Q_WS_X11) - TARGET_LINK_LIBRARIES(digikamcore ${X11_LIBRARIES}) - ENDIF(Q_WS_X11) -@@ -241,6 +263,10 @@ - ${QT_QTSQL_LIBRARY} - ) -=20 -+IF(PGF_FOUND) -+ TARGET_LINK_LIBRARIES(digikamdatabase ${PGF_LIBRARIES}) -+ENDIF(PGF_FOUND) -+ - SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSIO= N 1 ) - INSTALL(TARGETS digikamdatabase ${INSTALL_TARGETS_DEFAULT_ARGS} ) -=20 -@@ -339,6 +365,10 @@ - TARGET_LINK_LIBRARIES(digikam ${LIBMARBLEWIDGET_LIBRARY}) - ENDIF(MARBLEWIDGET_FOUND) -=20 -+IF(CLAPACK_FOUND) -+ TARGET_LINK_LIBRARIES(digikam ${CLAPACK_LIBRARY}) -+ENDIF(CLAPACK_FOUND) -+ - INSTALL(TARGETS digikam ${INSTALL_TARGETS_DEFAULT_ARGS}) -=20 - # Others Files to install #############################################= ########## -diff -r -u -N digikam-1.5.0-1-docs/libs/CMakeLists.txt digikam-1.5.0/lib= s/CMakeLists.txt ---- digikam-1.5.0-1-docs/libs/CMakeLists.txt 2010-10-10 21:36:54.0000000= 00 +0200 -+++ digikam-1.5.0/libs/CMakeLists.txt 2010-10-15 23:05:52.000000000 +020= 0 -@@ -21,6 +21,10 @@ - ${JASPER_INCLUDE_DIR} - ) -=20 -+IF(PGF_FOUND) -+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) -+ENDIF(PGF_FOUND) -+ - ADD_SUBDIRECTORY( histogram ) - ADD_SUBDIRECTORY( dmetadata ) - ADD_SUBDIRECTORY( dimg ) -diff -r -u -N digikam-1.5.0-1-docs/showfoto/CMakeLists.txt digikam-1.5.0= /showfoto/CMakeLists.txt ---- digikam-1.5.0-1-docs/showfoto/CMakeLists.txt 2010-10-10 21:37:10.000= 000000 +0200 -+++ digikam-1.5.0/showfoto/CMakeLists.txt 2010-10-15 23:06:09.000000000 = +0200 -@@ -65,6 +65,10 @@ -=20 - KDE4_ADD_EXECUTABLE(showfoto ${showfoto_SRCS}) -=20 -+IF(CLAPACK_FOUND) -+ TARGET_LINK_LIBRARIES(showfoto ${CLAPACK_LIBRARY}) -+ENDIF(CLAPACK_FOUND) -+ - TARGET_LINK_LIBRARIES(showfoto - digikamcore - ${KEXIV2_LIBRARIES} diff --git a/media-gfx/digikam/files/digikam-1.6.0-docs.patch b/media-gfx= /digikam/files/digikam-1.6.0-docs.patch deleted file mode 100644 index 66376b0..0000000 --- a/media-gfx/digikam/files/digikam-1.6.0-docs.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -ru digikam-1.6.0.orig/CMakeLists.txt digikam-1.6.0/CMakeLists.txt ---- digikam-1.6.0.orig/CMakeLists.txt 2010-11-22 18:50:48.000000000 +010= 0 -+++ digikam-1.6.0/CMakeLists.txt 2010-11-25 00:16:54.000000000 +0100 -@@ -1423,7 +1423,14 @@ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # API documentation generation -=20 --IF(DOXYGEN_FOUND) -+# Checks if user ask to build documentation. -+IF(BUILD_DOC) -+ -+ IF(DOXYGEN_FOUND) -+ -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "API documentation will be installed") -+ MESSAGE(STATUS "") -=20 - SET(API_DIR ${CMAKE_BINARY_DIR}/api) - SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) -@@ -1432,8 +1439,27 @@ -=20 - CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -=20 -- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) --ENDIF(DOXYGEN_FOUND) -+ -+ ELSE(DOXYGEN_FOUND) -+ -+ MESSAGE(FATAL_ERROR "API documentation requested but doxygen not fo= und") -+ -+ ENDIF(DOXYGEN_FOUND) -+ -+ELSE(BUILD_DOC) -+ -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will NOT be installed") -+ MESSAGE(STATUS "Because the option -DBUILD_DOC=3DON wasn't passed to = cmake") -+ MESSAGE(STATUS "") -+ -+ENDIF(BUILD_DOC) -+ -+ - include(MacroOptionalAddSubdirectory) - macro_optional_add_subdirectory( po ) -+ -+# Build the handbook -+add_subdirectory( doc ) diff --git a/media-gfx/digikam/files/digikam-1.7.0-docs.patch b/media-gfx= /digikam/files/digikam-1.7.0-docs.patch deleted file mode 100644 index 4d4edea..0000000 --- a/media-gfx/digikam/files/digikam-1.7.0-docs.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -ruN digikam-1.7.0.orig/CMakeLists.txt digikam-1.7.0/CMakeLists.txt ---- digikam-1.7.0.orig/CMakeLists.txt 2010-12-19 11:31:26.000000000 +010= 0 -+++ digikam-1.7.0/CMakeLists.txt 2010-12-26 18:57:13.000000000 +0100 -@@ -1423,8 +1423,15 @@ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # API documentation generation -=20 -+# Checks if user ask to build documentation. -+IF(BUILD_DOC) -+ - IF(DOXYGEN_FOUND) -=20 -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "API documentation will be installed") -+ MESSAGE(STATUS "") -+ - SET(API_DIR ${CMAKE_BINARY_DIR}/api) - SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) - SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) -@@ -1432,9 +1439,28 @@ -=20 - CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -=20 -- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -+ -+ELSE(DOXYGEN_FOUND) -+ -+ MESSAGE(FATAL_ERROR "API documentation requested but doxygen not fo= und") -+ - ENDIF(DOXYGEN_FOUND) -+ -+ELSE(BUILD_DOC) -+ -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will NOT be installed") -+ MESSAGE(STATUS "Because the option -DBUILD_DOC=3DON wasn't passed t= o cmake") -+ MESSAGE(STATUS "") -+ -+ENDIF(BUILD_DOC) -+ - find_package(Msgfmt REQUIRED) - find_package(Gettext REQUIRED) - add_subdirectory( po ) -+ -+# Build the handbook -+add_subdirectory( doc ) -+ diff --git a/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch b/media-gf= x/digikam/files/digikam-1.8.0-gcc46.patch deleted file mode 100644 index d958102..0000000 --- a/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- trunk/extragear/graphics/digikam/libs/threads/dynamicthread.cpp 2011= /02/06 10:48:24 1219102 -+++ trunk/extragear/graphics/digikam/libs/threads/dynamicthread.cpp 2011= /02/06 11:02:50 1219103 -@@ -257,6 +257,12 @@ - kDebug() << "Transition to Running: Invalid Inactive state"= << q; - return false; - } -+ default: -+ { -+ kDebug() << "libs/threads/dynanamicthread.cpp : Should neve= r reach here: assert?" << q; -+ return false; -+ } -+ - } - } -=20 diff --git a/media-gfx/digikam/files/digikam-1.8.0-tests.patch b/media-gf= x/digikam/files/digikam-1.8.0-tests.patch deleted file mode 100644 index ce03d2e..0000000 --- a/media-gfx/digikam/files/digikam-1.8.0-tests.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ruN digikam-1.8.0.orig/tests/CMakeLists.txt digikam-1.8.0/tests/CM= akeLists.txt ---- digikam-1.8.0.orig/tests/CMakeLists.txt 2011-01-23 20:24:49.00000000= 0 +0100 -+++ digikam-1.8.0/tests/CMakeLists.txt 2011-01-28 19:56:04.000000000 +01= 00 -@@ -176,9 +176,9 @@ -=20 - SET(qtpgftest_SRCS qtpgftest.cpp ${libpgf_SRCS} ${pgfutils_SRCS}) - KDE4_ADD_EXECUTABLE(qtpgftest NOGUI ${qtpgftest_SRCS}) --TARGET_LINK_LIBRARIES(qtpgftest ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} $= {QT_QTGUI_LIBRARY}) -+TARGET_LINK_LIBRARIES(qtpgftest ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} $= {QT_QTGUI_LIBRARY} ${PGF_LIBRARIES}) -=20 - SET(pgfscaled_SRCS pgfscaled.cpp ${libpgf_SRCS} ${pgfutils_SRCS}) - KDE4_ADD_EXECUTABLE(pgfscaled NOGUI ${pgfscaled_SRCS}) --TARGET_LINK_LIBRARIES(pgfscaled ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} $= {QT_QTGUI_LIBRARY}) -+TARGET_LINK_LIBRARIES(pgfscaled ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} $= {QT_QTGUI_LIBRARY} ${PGF_LIBRARIES}) -=20 diff --git a/media-gfx/digikam/files/digikam-1.9.0-docs.patch b/media-gfx= /digikam/files/digikam-1.9.0-docs.patch deleted file mode 100644 index 588cfb9..0000000 --- a/media-gfx/digikam/files/digikam-1.9.0-docs.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -ruN digikam-1.9.0-vanilla/CMakeLists.txt digikam-1.9.0/CMakeLists.= txt ---- digikam-1.9.0-vanilla/CMakeLists.txt 2011-02-27 21:16:18.000000000 += 0100 -+++ digikam-1.9.0/CMakeLists.txt 2011-02-28 18:56:39.000000000 +0100 -@@ -1421,8 +1421,15 @@ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # API documentation generation -=20 -+# Checks if user ask to build documentation. -+IF(BUILD_DOC) -+ - IF(DOXYGEN_FOUND) -=20 -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "API documentation will be installed") -+ MESSAGE(STATUS "") -+ - SET(API_DIR ${CMAKE_BINARY_DIR}/api) - SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) - SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) -@@ -1430,10 +1437,29 @@ -=20 - CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -=20 -- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -+ -+ELSE(DOXYGEN_FOUND) -+ -+ MESSAGE(FATAL_ERROR "API documentation requested but doxygen not fo= und") -+ - ENDIF(DOXYGEN_FOUND) -+ -+ELSE(BUILD_DOC) -+ -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will NOT be installed") -+ MESSAGE(STATUS "Because the option -DBUILD_DOC=3DON wasn't passed t= o cmake") -+ MESSAGE(STATUS "") -+ -+ENDIF(BUILD_DOC) -+ - find_package(Msgfmt REQUIRED) - find_package(Gettext REQUIRED) - add_subdirectory( po ) -=20 -+# Build the handbook -+add_subdirectory( doc ) -+ -+ diff --git a/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch b/media-g= fx/digikam/files/digikam-1.9.0-newpgf.patch deleted file mode 100644 index ed5c1bd..0000000 --- a/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -ruN digikam-1.9.0.prepared/cmake/modules/FindPGF.cmake digikam-1.9= .0/cmake/modules/FindPGF.cmake ---- digikam-1.9.0.prepared/cmake/modules/FindPGF.cmake 2011-02-27 19:58:= 23.000000000 +0100 -+++ digikam-1.9.0/cmake/modules/FindPGF.cmake 2011-07-05 12:03:41.000000= 000 +0200 -@@ -1,9 +1,10 @@ - # - Try to find libpgf - # Once done this will define - # --# PGF_FOUND - system has libgf --# PGF_INCLUDE_DIRS - the libpgf include directory --# PGF_LIBRARIES - Link these to use libpgf -+# PGF_FOUND - system has libgf -+# PGF_INCLUDE_DIRS - the libpgf include directory -+# PGF_LIBRARIES - Link these to use libpgf -+# PGF_CODEC_VERSION_ID - PGF codec version ID. -=20 - # PKG-CONFIG is required. - INCLUDE(FindPkgConfig REQUIRED) -@@ -12,4 +13,15 @@ - INCLUDE(FindPkgConfig) -=20 - PKG_CHECK_MODULES(PGF libpgf) -+ -+ MESSAGE(STATUS "PGF_INCLUDE_DIRS =3D ${PGF_INCLUDE_DIRS}") -+ MESSAGE(STATUS "PGF_INCLUDEDIR =3D ${PGF_INCLUDEDIR}") -+ MESSAGE(STATUS "PGF_LIBRARIES =3D ${PGF_LIBRARIES}") -+ MESSAGE(STATUS "PGF_LDFLAGS =3D ${PGF_LDFLAGS}") -+ MESSAGE(STATUS "PGF_CFLAGS =3D ${PGF_CFLAGS}") -+ MESSAGE(STATUS "PGF_VERSION =3D ${PGF_VERSION}") -+ -+ STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}") -+ MESSAGE(STATUS "PGF_CODEC_VERSION_ID =3D ${PGF_CODEC_VERSION_ID}") -+ - ENDIF(PKG_CONFIG_FOUND) -diff -ruN digikam-1.9.0.prepared/config-digikam.h.cmake digikam-1.9.0/co= nfig-digikam.h.cmake ---- digikam-1.9.0.prepared/config-digikam.h.cmake 2011-02-27 19:58:07.00= 0000000 +0100 -+++ digikam-1.9.0/config-digikam.h.cmake 2011-07-05 12:05:59.000000000 += 0200 -@@ -54,6 +54,8 @@ - /* Define to 1 if you have Nepomuk shared libraries installed */ - #cmakedefine HAVE_NEPOMUK 1 -=20 -+#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID} -+ - #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}" -=20 - #endif /* CONFIG_DIGIKAM_H */ -diff -ruN digikam-1.9.0.prepared/libs/dimg/loaders/pgfloader.cpp digikam= -1.9.0/libs/dimg/loaders/pgfloader.cpp ---- digikam-1.9.0.prepared/libs/dimg/loaders/pgfloader.cpp 2011-02-27 19= :58:08.000000000 +0100 -+++ digikam-1.9.0/libs/dimg/loaders/pgfloader.cpp 2011-07-05 12:22:56.00= 0000000 +0200 -@@ -29,6 +29,7 @@ - //#define ENABLE_DEBUG_MESSAGES -=20 - #include "pgfloader.h" -+#include "config-digikam.h" -=20 - // C Ansi includes -=20 -@@ -435,7 +436,11 @@ - CallbackForLibPGF, this); -=20 - UINT32 nWrittenBytes =3D 0; -+#if PGFCodecVersionID >=3D 0x061124 -+ pgf.Write(&stream, &nWrittenBytes, CallbackForLibPGF, this); -+#else - pgf.Write(&stream, 0, CallbackForLibPGF, &nWrittenBytes, this); -+#endif -=20 - #ifdef ENABLE_DEBUG_MESSAGES - kDebug() << "PGF width =3D " << header.width; -diff -ruN digikam-1.9.0.prepared/libs/threadimageio/pgfutils.cpp digikam= -1.9.0/libs/threadimageio/pgfutils.cpp ---- digikam-1.9.0.prepared/libs/threadimageio/pgfutils.cpp 2011-02-27 19= :58:07.000000000 +0100 -+++ digikam-1.9.0/libs/threadimageio/pgfutils.cpp 2011-07-05 12:19:15.00= 0000000 +0200 -@@ -46,6 +46,7 @@ - // LibPGF includes -=20 - #include "PGFimage.h" -+#include "config-digikam.h" -=20 - namespace Digikam - { -@@ -136,7 +137,12 @@ - // TODO : optimize memory allocation... - CPGFMemoryStream stream(256000); - UINT32 nWrittenBytes =3D 0; -+ -+#if PGFCodecVersionID >=3D 0x061124 -+ pgfImg.Write(&stream, &nWrittenBytes); -+#else - pgfImg.Write(&stream, 0, NULL, &nWrittenBytes); -+#endif -=20 - data =3D QByteArray((const char*)stream.GetBuffer(), nWrittenBy= tes); - } diff --git a/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch b/media-= gfx/digikam/files/digikam-1.9.0-nomysql.patch deleted file mode 100644 index 50dec54..0000000 --- a/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- digikam-1.9.0-vanilla/CMakeLists.txt 2011-02-28 02:16:18.000000000 += 0600 -+++ digikam-1.9.0-vanilla/CMakeLists.txt 2011-05-09 19:45:02.000000000 += 0700 -@@ -2,6 +2,7 @@=20 -=20 - OPTION(ENABLE_THEMEDESIGNER "Build digiKam theme designer (default=3DOF= F)" OFF) - OPTION(ENABLE_THUMBS_DB "Build digiKam with thumbnails database support= (default=3DON)" ON) -+OPTION(ENABLE_MYSQL "Build digiKam with MySQL database support (default= =3DON)" ON) -=20 - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # Information to update before to release this package. -@@ -189,20 +190,22 @@=20 - SET(KEXIV2_FOR_DIGIKAM TRUE) - ENDIF(NOT WIN32) -=20 -+IF (ENABLE_MYSQL) - # Check MySQL executables --FIND_PROGRAM( SERVERCMD_MYSQL mysqld -- PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/l= ibexec /opt/local/libexec -- /opt/mysql/libexec /usr/mysql/bin /opt/mysql/sbin $= {MYSQLD_PATH} -- ENV MYSQLD_PATH ) --MESSAGE(STATUS "Found MySQL server executable at: ${SERVERCMD_MYSQL}") -+ FIND_PROGRAM( SERVERCMD_MYSQL mysqld -+ PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/= libexec /opt/local/libexec -+ /opt/mysql/libexec /usr/mysql/bin /opt/mysql/sbin = ${MYSQLD_PATH} -+ ENV MYSQLD_PATH ) -+ MESSAGE(STATUS "Found MySQL server executable at: ${SERVERCMD_MYSQL}") -=20 - # NOTE: under windows, mysql_install_db PERL script is named "mysql_ins= tall_db.pl" - # under MACOS-X, through macports project, mysql_install_db PERL = script is named "mysql_install_db5" --FIND_PROGRAM( INITCMD_MYSQL mysql_install_db mysql_install_db5 mysql_in= stall_db.pl -- PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/l= ibexec -- /opt/mysql/libexec /usr/mysql/bin /opt/mysql/bin ${= MYSQL_TOOLS_PATH} -- ENV MYSQL_TOOLS_PATH ) --MESSAGE(STATUS "Found MySQL install_db executable at: ${INITCMD_MYSQL}"= ) -+ FIND_PROGRAM( INITCMD_MYSQL mysql_install_db mysql_install_db5 mysql_i= nstall_db.pl -+ PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/= libexec -+ /opt/mysql/libexec /usr/mysql/bin /opt/mysql/bin $= {MYSQL_TOOLS_PATH} -+ ENV MYSQL_TOOLS_PATH ) -+ MESSAGE(STATUS "Found MySQL install_db executable at: ${INITCMD_MYSQL}= ") -+ENDIF (ENABLE_MYSQL) -=20 - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # Optional dependencies -@@ -274,10 +277,12 @@=20 - MESSAGE(STATUS "") -=20 - PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND) --PRINT_EXECUTABLE_STATUS("MySQL Server" mysqld MYSQLD_PATH SERVERCMD_MYS= QL) --IF (NOT WIN32) -- PRINT_EXECUTABLE_STATUS("MySQL install_db tool" mysql_install_db MY= SQL_TOOLS_PATH INITCMD_MYSQL) --ENDIF (NOT WIN32) -+IF (ENABLE_MYSQL) -+ PRINT_EXECUTABLE_STATUS("MySQL Server" mysqld MYSQLD_PATH SERVERCMD_MY= SQL) -+ IF (NOT WIN32) -+ PRINT_EXECUTABLE_STATUS("MySQL install_db tool" mysql_install_db M= YSQL_TOOLS_PATH INITCMD_MYSQL) -+ ENDIF (NOT WIN32) -+ENDIF (ENABLE_MYSQL) - PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "= " TIFF_FOUND) - PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.htm= l" " (version >=3D 1.2.7)" PNG_FOUND) - PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jaspe= r" "" JASPER_FOUND) diff --git a/media-gfx/digikam/files/digikam-1.9.0-turbo.patch b/media-gf= x/digikam/files/digikam-1.9.0-turbo.patch deleted file mode 100644 index bd10552..0000000 --- a/media-gfx/digikam/files/digikam-1.9.0-turbo.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 1ad9ae102ea1a82a72e31401fe840954a791219f Mon Sep 17 00:00:00 2001 -From: Riccardo Iaconelli -Date: Sun, 15 May 2011 16:18:44 +0200 -Subject: [PATCH] Don't fail CMake check: compile with libjpeg-turbo - -Patch by Rex Dieter - -BUG: 265431 - -Signed-off-by: Riccardo Iaconelli ---- - CMakeLists.txt | 28 +++++++++++++++++----------- - 1 files changed, 17 insertions(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 43293ef..63402e9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -166,17 +166,23 @@ ELSE(NOT APPLE) - SET(CLAPACK_FOUND FALSE) - ENDIF(NOT APPLE) -=20 --# Extract version of libjpeg so that we can use the appropriate dir --# See bug #227313, #228483 --FILE(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content) --STRING(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jp= eglib_version "${jpeglib_h_content}") --MESSAGE(STATUS "Identified libjpeg version: ${jpeglib_version}") -- --IF ("${jpeglib_version}" LESS 80) -- SET(DIGIKAM_LIBJPEG_DIR libjpeg-62) --ELSE ("${jpeglib_version}" LESS 80) -- SET(DIGIKAM_LIBJPEG_DIR libjpeg-80) --ENDIF ("${jpeglib_version}" LESS 80) -+# check version of libjpeg so that we can use the appropriate dir -+# See bug #227313 -+set(_jpeglib_version_source "#include \n#include\n#i= nclude \n int main()\n {\n #if (JPEG_LIB_VERSION >=3D 80) \n #= error JPEG_LIB_VERSION >=3D 80 found \n #endif \n }\n") -+set(_jpeglib_version_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/cmake_jpe= glib_version_check.cpp) -+file(WRITE "${_jpeglib_version_source_file}" "${_jpeglib_version_source= }") -+set(_jpeglib_version_include_dirs "-DINCLUDE_DIRECTORIES:STRING=3D${JPE= G_INCLUDE_DIR}") -+ -+try_compile(_jpeglib_version_compile_result ${CMAKE_BINARY_DIR} ${_jpeg= lib_version_source_file} CMAKE_FLAGS "${_jpeglib_version_include_dirs}" C= OMPILE_OUTPUT_VARIABLE _jpeglib_version_compile_output_var) -+ -+if(_jpeglib_version_compile_result) -+MESSAGE(STATUS "Identified libjpeg version: 62") -+set(DIGIKAM_LIBJPEG_DIR libjpeg-62) -+else(_jpeglib_version_compile_result) -+MESSAGE(STATUS "Identified libjpeg version: 80+") -+set(DIGIKAM_LIBJPEG_DIR libjpeg-80) -+endif(_jpeglib_version_compile_result) -+ -=20 - IF (ENABLE_INTERNALMYSQL) - # Check MySQL executables ---=20 -1.7.3.4 - diff --git a/media-gfx/digikam/files/digikam-2.0.0_beta1-docs.patch b/med= ia-gfx/digikam/files/digikam-2.0.0_beta1-docs.patch deleted file mode 100644 index 991f35f..0000000 --- a/media-gfx/digikam/files/digikam-2.0.0_beta1-docs.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ruN digikam-2.0.0-beta1.orig/core/CMakeLists.txt digikam-2.0.0-bet= a1/core/CMakeLists.txt ---- digikam-2.0.0-beta1.orig/core/CMakeLists.txt 2011-01-03 15:05:12.000= 000000 +0100 -+++ digikam-2.0.0-beta1/core/CMakeLists.txt 2011-01-30 17:39:44.00000000= 0 +0100 -@@ -1488,8 +1488,15 @@ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # API documentation generation -=20 -+# Checks if user ask to build documentation. -+IF(BUILD_DOC) -+ - IF(DOXYGEN_FOUND) -=20 -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "API documentation will be installed") -+ MESSAGE(STATUS "") -+ - SET(API_DIR ${CMAKE_BINARY_DIR}/api) - SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) - SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) -@@ -1497,6 +1504,20 @@ -=20 - CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -=20 -- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -+ -+ELSE(DOXYGEN_FOUND) -+ -+ MESSAGE(FATAL_ERROR "API documentation requested but doxygen not fo= und") -+ - ENDIF(DOXYGEN_FOUND) -+ -+ELSE(BUILD_DOC) -+ -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will NOT be installed") -+ MESSAGE(STATUS "Because the option -DBUILD_DOC=3DON wasn't passed t= o cmake") -+ MESSAGE(STATUS "") -+ -+ENDIF(BUILD_DOC) diff --git a/media-gfx/digikam/files/digikam-2.0.0_beta4-docs.patch b/med= ia-gfx/digikam/files/digikam-2.0.0_beta4-docs.patch deleted file mode 100644 index 4abadd6..0000000 --- a/media-gfx/digikam/files/digikam-2.0.0_beta4-docs.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ruN digikam-2.0.0-beta4.orig/core/CMakeLists.txt digikam-2.0.0-bet= a4/core/CMakeLists.txt ---- digikam-2.0.0-beta4.orig/core/CMakeLists.txt 2011-03-28 10:54:32.000= 000000 +0200 -+++ digikam-2.0.0-beta4/core/CMakeLists.txt 2011-04-02 00:51:08.00000000= 0 +0200 -@@ -1558,8 +1558,15 @@ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # API documentation generation -=20 -+# Checks if user ask to build documentation. -+IF(BUILD_DOC) -+ - IF(DOXYGEN_FOUND) -=20 -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "API documentation will be installed") -+ MESSAGE(STATUS "") -+ - SET(API_DIR ${CMAKE_BINARY_DIR}/api) - SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) - SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) -@@ -1567,6 +1574,20 @@ -=20 - CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -=20 -- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -+ -+ELSE(DOXYGEN_FOUND) -+ -+ MESSAGE(FATAL_ERROR "API documentation requested but doxygen not fo= und") -+ - ENDIF(DOXYGEN_FOUND) -+ -+ELSE(BUILD_DOC) -+ -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will NOT be installed") -+ MESSAGE(STATUS "Because the option -DBUILD_DOC=3DON wasn't passed t= o cmake") -+ MESSAGE(STATUS "") -+ -+ENDIF(BUILD_DOC) diff --git a/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch b/med= ia-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch deleted file mode 100644 index a5bc184..0000000 --- a/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ruN digikam-2.0.0-beta5.orig/core/CMakeLists.txt digikam-2.0.0-bet= a5/core/CMakeLists.txt ---- digikam-2.0.0-beta5.orig/core/CMakeLists.txt 2011-05-04 10:52:35.000= 000000 +0200 -+++ digikam-2.0.0-beta5/core/CMakeLists.txt 2011-05-11 22:40:30.00000000= 0 +0200 -@@ -1560,8 +1560,15 @@ - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # API documentation generation -=20 -+# Checks if user ask to build documentation. -+IF(BUILD_DOC) -+ - IF(DOXYGEN_FOUND) -=20 -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "API documentation will be installed") -+ MESSAGE(STATUS "") -+ - SET(API_DIR ${CMAKE_BINARY_DIR}/api) - SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) - SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) -@@ -1569,7 +1576,21 @@ -=20 - CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -=20 -- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -+ -+ELSE(DOXYGEN_FOUND) -+ -+ MESSAGE(FATAL_ERROR "API documentation requested but doxygen not fo= und") -+ - ENDIF(DOXYGEN_FOUND) -=20 -+ELSE(BUILD_DOC) -+ -+ -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will NOT be installed, because") -+ MESSAGE(STATUS "the option -DBUILD_DOC=3DON wasn't passed to cmake"= ) -+ MESSAGE(STATUS "") -+ -+ENDIF(BUILD_DOC) diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch b= /media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch deleted file mode 100644 index 78f7770..0000000 --- a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -ruN digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake digikam= -2.0.0-rc/core/cmake/modules/FindPGF.cmake ---- digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake 2011-06-28 16= :38:50.000000000 +0200 -+++ digikam-2.0.0-rc/core/cmake/modules/FindPGF.cmake 2011-07-04 15:32:5= 0.000000000 +0200 -@@ -1,9 +1,10 @@ - # - Try to find libpgf - # Once done this will define - # --# PGF_FOUND - system has libgf --# PGF_INCLUDE_DIRS - the libpgf include directory --# PGF_LIBRARIES - Link these to use libpgf -+# PGF_FOUND - system has libgf -+# PGF_INCLUDE_DIRS - the libpgf include directory -+# PGF_LIBRARIES - Link these to use libpgf -+# PGF_CODEC_VERSION_ID - PGF codec version ID. -=20 - # PKG-CONFIG is required. - INCLUDE(FindPkgConfig REQUIRED) -@@ -12,4 +13,15 @@ - INCLUDE(FindPkgConfig) -=20 - PKG_CHECK_MODULES(PGF libpgf) -+ -+ MESSAGE(STATUS "PGF_INCLUDE_DIRS =3D ${PGF_INCLUDE_DIRS}") -+ MESSAGE(STATUS "PGF_INCLUDEDIR =3D ${PGF_INCLUDEDIR}") -+ MESSAGE(STATUS "PGF_LIBRARIES =3D ${PGF_LIBRARIES}") -+ MESSAGE(STATUS "PGF_LDFLAGS =3D ${PGF_LDFLAGS}") -+ MESSAGE(STATUS "PGF_CFLAGS =3D ${PGF_CFLAGS}") -+ MESSAGE(STATUS "PGF_VERSION =3D ${PGF_VERSION}") -+ -+ STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}") -+ MESSAGE(STATUS "PGF_CODEC_VERSION_ID =3D ${PGF_CODEC_VERSION_ID}") -+ - ENDIF(PKG_CONFIG_FOUND) -diff -ruN digikam-2.0.0-rc.orig/core/digikam/utils/config-digikam.h.cmak= e digikam-2.0.0-rc/core/digikam/utils/config-digikam.h.cmake ---- digikam-2.0.0-rc.orig/core/digikam/utils/config-digikam.h.cmake 2011= -06-28 16:38:50.000000000 +0200 -+++ digikam-2.0.0-rc/core/digikam/utils/config-digikam.h.cmake 2011-07-0= 4 15:29:24.000000000 +0200 -@@ -57,6 +57,8 @@ - /* Define to 1 if we know how to start mysqld */ - #cmakedefine HAVE_INTERNALMYSQL 1 -=20 -+#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID} -+ - #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}" -=20 - /* -diff -ruN digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp dig= ikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp ---- digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp 2011-06-2= 8 16:38:44.000000000 +0200 -+++ digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp 2011-07-04 15:= 29:24.000000000 +0200 -@@ -46,6 +46,7 @@ - // LibPGF includes -=20 - #include "PGFimage.h" -+#include "config-digikam.h" -=20 - namespace Digikam - { diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch = b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch deleted file mode 100644 index 184360d..0000000 --- a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ruN digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp dig= ikam-2.0.0-rc/core/libs/dimg/loaders/pgfloader.cpp ---- digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp 2011-06-2= 8 16:38:45.000000000 +0200 -+++ digikam-2.0.0-rc/core/libs/dimg/loaders/pgfloader.cpp 2011-07-05 13:= 50:20.036746353 +0200 -@@ -29,6 +29,7 @@ - //#define ENABLE_DEBUG_MESSAGES -=20 - #include "pgfloader.h" -+#include "config-digikam.h" -=20 - // C Ansi includes -=20 -@@ -435,10 +436,8 @@ - CallbackForLibPGF, this); -=20 - UINT32 nWrittenBytes =3D 0; --#ifdef PGFCodecVersionID --# if PGFCodecVersionID >=3D 0x061124 -+#if PGFCodecVersionID >=3D 0x061124 - pgf.Write(&stream, &nWrittenBytes, CallbackForLibPGF, this); --# endif - #else - pgf.Write(&stream, 0, CallbackForLibPGF, &nWrittenBytes, this); - #endif diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch b/medi= a-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch deleted file mode 100644 index c60a7e3..0000000 --- a/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 1f80f35b68702136ebd3d315fe4baf7d75b3c142 -Author: Gilles Caulier -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/pgfuti= ls.cpp -index 2b5829f..758f12c 100644 ---- a/libs/threadimageio/pgfutils.cpp -+++ b/libs/threadimageio/pgfutils.cpp -@@ -151,7 +151,14 @@ bool writePGFImageData(const QImage& img, QByteArra= y& data, int quality) - // TODO : optimize memory allocation... - CPGFMemoryStream stream(256000); - UINT32 nWrittenBytes =3D 0; -+ -+#ifdef PGFCodecVersionID -+# if PGFCodecVersionID >=3D 0x061124 - pgfImg.Write(&stream, &nWrittenBytes); -+# endif -+#else -+ pgfImg.Write(&stream, 0, 0, &nWrittenBytes); -+#endif -=20 - data =3D QByteArray((const char*)stream.GetBuffer(), nWrittenBy= tes); -=20 diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.= xml deleted file mode 100644 index 032404f..0000000 --- a/media-gfx/digikam/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - -kde -dilfridge@gentoo.org - - Add support for kdepim - Add support for marble - Build the digikam theme designer - Enable thumbnails database support - Pull in mplayerthumbs to enable video thumbnails - Hausa translation - Maori translation - ?? translation - Venda translation - -