diff options
| author |   Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2011-07-05 09:11:29 +0200 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2011-07-05 09:11:50 +0200 |
| commit | 7b71f3ce2196268a296f263c7cb9d6a0ad5f257b (patch) | |
| tree | df25bc0163d2ae7ad0d49415124a3edb1a9083fb /media-gfx | |
| parent | [kde-misc/kdiff3] Filemanager integration is now handled by kfileitemactionpl... (diff) | |
| download | kde-7b71f3ce2196268a296f263c7cb9d6a0ad5f257b.tar.gz kde-7b71f3ce2196268a296f263c7cb9d6a0ad5f257b.tar.bz2 kde-7b71f3ce2196268a296f263c7cb9d6a0ad5f257b.zip | |
[media-gfx/digikam] Include build fix for new but unbundled libpng
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/digikam/Manifest | 3 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-2.0.0_rc.ebuild | 5 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch | 56 |
3 files changed, 62 insertions, 2 deletions
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 02a97a909c..383af65816 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,6 +1,7 @@ +AUX digikam-2.0.0_rc-officialpgf.patch 2351 RMD160 a3be56a7377b013bfa2a3539a8bbe7cfc9d3a75d SHA1 883b79dca41f7c624de3a8dc85b02f2dcae363a9 SHA256 bf40b21501bb944993017fcc0f05411e100b88708b1560ddd00e7ca203db3bda AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c DIST digikam-2.0.0-beta6.tar.bz2 43533320 RMD160 eb50febc2ade359f8d92e6673e4f73a6b57b6fa5 SHA1 3ca5356da07d6484ce2299627e9d54acf14e06a2 SHA256 5f81ce581ff8e1148c023b71365928509d497f0bd248f27c925ea3038cea2cea DIST digikam-2.0.0-rc.tar.bz2 45397480 RMD160 20fa3790c8ca950960020cdf3a32410689005db3 SHA1 b0067f99de1244723c45650d9a684b1e8f743954 SHA256 564354c34b41287e951005707b84b8a1f82c691189083c5943abed5e0aebe691 EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75 -EBUILD digikam-2.0.0_rc.ebuild 3262 RMD160 3322eaaab51467d8040ea0defb30054272813f0f SHA1 58ffd139cb2bdfbd8e9ee93b56b68647690148a7 SHA256 e0c4ce7b8b1b6cfb95d9dd87524dd0cf8b5d2a0f702a19809f552ba30c1fe48f +EBUILD digikam-2.0.0_rc.ebuild 3311 RMD160 970164e604eb863f38851cfbf815c429a74b11ea SHA1 b36d9e465f17b5f30f5826fc6f4614ad3a22e188 SHA256 9194485f3a2c0b984d89b8580d8f3c45f372be0f300f898bf0d95517b5bcaaf5 MISC metadata.xml 497 RMD160 73141e1fd45de59b199e7c4a2a1622f6c9dac130 SHA1 664d9d8b9b1953e0f6aa3130f61138cbc207a2bf SHA256 1ec09a52e4d5c3a6bd12993b7903663c10f57c8549686189a6a7b5d297bc7d24 diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild index 2eaba0eb5a..378d39166c 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="${CDEPEND} doc? ( app-doc/doxygen ) " -PATCHES=( "${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch" + "${FILESDIR}/${PN}-2.0.0_rc-officialpgf.patch" +) S="${WORKDIR}/${MY_P}/core" 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 0000000000..78f7770533 --- /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:50.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. + + # PKG-CONFIG is required. + INCLUDE(FindPkgConfig REQUIRED) +@@ -12,4 +13,15 @@ + INCLUDE(FindPkgConfig) + + PKG_CHECK_MODULES(PGF libpgf) ++ ++ MESSAGE(STATUS "PGF_INCLUDE_DIRS = ${PGF_INCLUDE_DIRS}") ++ MESSAGE(STATUS "PGF_INCLUDEDIR = ${PGF_INCLUDEDIR}") ++ MESSAGE(STATUS "PGF_LIBRARIES = ${PGF_LIBRARIES}") ++ MESSAGE(STATUS "PGF_LDFLAGS = ${PGF_LDFLAGS}") ++ MESSAGE(STATUS "PGF_CFLAGS = ${PGF_CFLAGS}") ++ MESSAGE(STATUS "PGF_VERSION = ${PGF_VERSION}") ++ ++ STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}") ++ MESSAGE(STATUS "PGF_CODEC_VERSION_ID = ${PGF_CODEC_VERSION_ID}") ++ + ENDIF(PKG_CONFIG_FOUND) +diff -ruN digikam-2.0.0-rc.orig/core/digikam/utils/config-digikam.h.cmake 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-04 15:29:24.000000000 +0200 +@@ -57,6 +57,8 @@ + /* Define to 1 if we know how to start mysqld */ + #cmakedefine HAVE_INTERNALMYSQL 1 + ++#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID} ++ + #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}" + + /* +diff -ruN digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp +--- digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp 2011-06-28 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 + + #include "PGFimage.h" ++#include "config-digikam.h" + + namespace Digikam + { |