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 1QdznU-0005Dx-Ny for garchives@archives.gentoo.org; Tue, 05 Jul 2011 07:11:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A95121C034; Tue, 5 Jul 2011 07:11:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4950221C034 for ; Tue, 5 Jul 2011 07:11:44 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2F391B4007 for ; Tue, 5 Jul 2011 07:11:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CE1208003D for ; Tue, 5 Jul 2011 07:11:42 +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: <7b71f3ce2196268a296f263c7cb9d6a0ad5f257b.dilfridge@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/ X-VCS-Repository: proj/kde X-VCS-Files: media-gfx/digikam/digikam-2.0.0_rc.ebuild media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch X-VCS-Directories: media-gfx/digikam/ media-gfx/digikam/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 7b71f3ce2196268a296f263c7cb9d6a0ad5f257b Date: Tue, 5 Jul 2011 07:11:42 +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: X-Archives-Hash: 9e2a6e16fa0b6b1a54e4387db82f7242 commit: 7b71f3ce2196268a296f263c7cb9d6a0ad5f257b Author: Andreas K. Huettel (dilfridge) gentoo o= rg> AuthorDate: Tue Jul 5 07:11:29 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Tue Jul 5 07:11:50 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D7b71f3ce [media-gfx/digikam] Include build fix for new but unbundled libpng (Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit) --- media-gfx/digikam/digikam-2.0.0_rc.ebuild | 5 ++- .../files/digikam-2.0.0_rc-officialpgf.patch | 56 ++++++++++++++= ++++++ 2 files changed, 60 insertions(+), 1 deletions(-) diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digika= m/digikam-2.0.0_rc.ebuild index 2eaba0e..378d391 100644 --- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild +++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild @@ -68,7 +68,10 @@ DEPEND=3D"${CDEPEND} doc? ( app-doc/doxygen ) " =20 -PATCHES=3D( "${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch" ) +PATCHES=3D( + "${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch" + "${FILESDIR}/${PN}-2.0.0_rc-officialpgf.patch" +) =20 S=3D"${WORKDIR}/${MY_P}/core" =20 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 new file mode 100644 index 0000000..78f7770 --- /dev/null +++ b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch @@ -0,0 +1,56 @@ +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 + {