| 1 |
commit: 7b71f3ce2196268a296f263c7cb9d6a0ad5f257b |
| 2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 5 07:11:29 2011 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 5 07:11:50 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7b71f3ce |
| 7 |
|
| 8 |
[media-gfx/digikam] Include build fix for new but unbundled libpng |
| 9 |
|
| 10 |
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
media-gfx/digikam/digikam-2.0.0_rc.ebuild | 5 ++- |
| 14 |
.../files/digikam-2.0.0_rc-officialpgf.patch | 56 ++++++++++++++++++++ |
| 15 |
2 files changed, 60 insertions(+), 1 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild |
| 18 |
index 2eaba0e..378d391 100644 |
| 19 |
--- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild |
| 20 |
+++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild |
| 21 |
@@ -68,7 +68,10 @@ DEPEND="${CDEPEND} |
| 22 |
doc? ( app-doc/doxygen ) |
| 23 |
" |
| 24 |
|
| 25 |
-PATCHES=( "${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch" ) |
| 26 |
+PATCHES=( |
| 27 |
+ "${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch" |
| 28 |
+ "${FILESDIR}/${PN}-2.0.0_rc-officialpgf.patch" |
| 29 |
+) |
| 30 |
|
| 31 |
S="${WORKDIR}/${MY_P}/core" |
| 32 |
|
| 33 |
|
| 34 |
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 |
| 35 |
new file mode 100644 |
| 36 |
index 0000000..78f7770 |
| 37 |
--- /dev/null |
| 38 |
+++ b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch |
| 39 |
@@ -0,0 +1,56 @@ |
| 40 |
+diff -ruN digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake digikam-2.0.0-rc/core/cmake/modules/FindPGF.cmake |
| 41 |
+--- digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake 2011-06-28 16:38:50.000000000 +0200 |
| 42 |
++++ digikam-2.0.0-rc/core/cmake/modules/FindPGF.cmake 2011-07-04 15:32:50.000000000 +0200 |
| 43 |
+@@ -1,9 +1,10 @@ |
| 44 |
+ # - Try to find libpgf |
| 45 |
+ # Once done this will define |
| 46 |
+ # |
| 47 |
+-# PGF_FOUND - system has libgf |
| 48 |
+-# PGF_INCLUDE_DIRS - the libpgf include directory |
| 49 |
+-# PGF_LIBRARIES - Link these to use libpgf |
| 50 |
++# PGF_FOUND - system has libgf |
| 51 |
++# PGF_INCLUDE_DIRS - the libpgf include directory |
| 52 |
++# PGF_LIBRARIES - Link these to use libpgf |
| 53 |
++# PGF_CODEC_VERSION_ID - PGF codec version ID. |
| 54 |
+ |
| 55 |
+ # PKG-CONFIG is required. |
| 56 |
+ INCLUDE(FindPkgConfig REQUIRED) |
| 57 |
+@@ -12,4 +13,15 @@ |
| 58 |
+ INCLUDE(FindPkgConfig) |
| 59 |
+ |
| 60 |
+ PKG_CHECK_MODULES(PGF libpgf) |
| 61 |
++ |
| 62 |
++ MESSAGE(STATUS "PGF_INCLUDE_DIRS = ${PGF_INCLUDE_DIRS}") |
| 63 |
++ MESSAGE(STATUS "PGF_INCLUDEDIR = ${PGF_INCLUDEDIR}") |
| 64 |
++ MESSAGE(STATUS "PGF_LIBRARIES = ${PGF_LIBRARIES}") |
| 65 |
++ MESSAGE(STATUS "PGF_LDFLAGS = ${PGF_LDFLAGS}") |
| 66 |
++ MESSAGE(STATUS "PGF_CFLAGS = ${PGF_CFLAGS}") |
| 67 |
++ MESSAGE(STATUS "PGF_VERSION = ${PGF_VERSION}") |
| 68 |
++ |
| 69 |
++ STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}") |
| 70 |
++ MESSAGE(STATUS "PGF_CODEC_VERSION_ID = ${PGF_CODEC_VERSION_ID}") |
| 71 |
++ |
| 72 |
+ ENDIF(PKG_CONFIG_FOUND) |
| 73 |
+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 |
| 74 |
+--- digikam-2.0.0-rc.orig/core/digikam/utils/config-digikam.h.cmake 2011-06-28 16:38:50.000000000 +0200 |
| 75 |
++++ digikam-2.0.0-rc/core/digikam/utils/config-digikam.h.cmake 2011-07-04 15:29:24.000000000 +0200 |
| 76 |
+@@ -57,6 +57,8 @@ |
| 77 |
+ /* Define to 1 if we know how to start mysqld */ |
| 78 |
+ #cmakedefine HAVE_INTERNALMYSQL 1 |
| 79 |
+ |
| 80 |
++#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID} |
| 81 |
++ |
| 82 |
+ #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}" |
| 83 |
+ |
| 84 |
+ /* |
| 85 |
+diff -ruN digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp |
| 86 |
+--- digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp 2011-06-28 16:38:44.000000000 +0200 |
| 87 |
++++ digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp 2011-07-04 15:29:24.000000000 +0200 |
| 88 |
+@@ -46,6 +46,7 @@ |
| 89 |
+ // LibPGF includes |
| 90 |
+ |
| 91 |
+ #include "PGFimage.h" |
| 92 |
++#include "config-digikam.h" |
| 93 |
+ |
| 94 |
+ namespace Digikam |
| 95 |
+ { |
Archives