| 1 |
commit: ab242d177e0dabeb3c6bed45f40eafd9956f0c7e |
| 2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 5 07:09:36 2011 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 5 07:09:36 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=ab242d17 |
| 7 |
|
| 8 |
Include build fix for new but unbundled libpgf |
| 9 |
|
| 10 |
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
media-gfx/digikam/ChangeLog | 5 ++ |
| 14 |
media-gfx/digikam/Manifest | 4 +- |
| 15 |
.../digikam/files/digikam-2.0.0_officialpgf.patch | 71 -------------------- |
| 16 |
.../files/digikam-2.0.0_rc-officialpgf.patch | 56 +++++++++++++++ |
| 17 |
4 files changed, 63 insertions(+), 73 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog |
| 20 |
index e8f4e7a..0d509d7 100644 |
| 21 |
--- a/media-gfx/digikam/ChangeLog |
| 22 |
+++ b/media-gfx/digikam/ChangeLog |
| 23 |
@@ -2,6 +2,11 @@ |
| 24 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
# $Header: $ |
| 26 |
|
| 27 |
+ 05 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
| 28 |
+ -files/digikam-2.0.0_officialpgf.patch, |
| 29 |
+ +files/digikam-2.0.0_rc-officialpgf.patch: |
| 30 |
+ Include build fix for new but unbundled libpgf |
| 31 |
+ |
| 32 |
04 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
| 33 |
digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_officialpgf.patch: |
| 34 |
Add build fix for offical new libpgf |
| 35 |
|
| 36 |
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest |
| 37 |
index 460cf2a..207a69c 100644 |
| 38 |
--- a/media-gfx/digikam/Manifest |
| 39 |
+++ b/media-gfx/digikam/Manifest |
| 40 |
@@ -20,7 +20,7 @@ AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310 |
| 41 |
AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c |
| 42 |
AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac |
| 43 |
AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964 |
| 44 |
-AUX digikam-2.0.0_officialpgf.patch 2538 RMD160 5939068015c2923dd0bbbe033ed1eda96d7972ee SHA1 4bcf25368d63bdf06bfa3a8d140832404e874755 SHA256 40f01b857e1bb68545f554ea01e0685fab390bbb3912cb3d233fd70ddef3c60e |
| 45 |
+AUX digikam-2.0.0_rc-officialpgf.patch 2351 RMD160 a3be56a7377b013bfa2a3539a8bbe7cfc9d3a75d SHA1 883b79dca41f7c624de3a8dc85b02f2dcae363a9 SHA256 bf40b21501bb944993017fcc0f05411e100b88708b1560ddd00e7ca203db3bda |
| 46 |
AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c |
| 47 |
DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa |
| 48 |
DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5 |
| 49 |
@@ -34,5 +34,5 @@ EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 |
| 50 |
EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf |
| 51 |
EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75 |
| 52 |
EBUILD digikam-2.0.0_rc.ebuild 3311 RMD160 970164e604eb863f38851cfbf815c429a74b11ea SHA1 b36d9e465f17b5f30f5826fc6f4614ad3a22e188 SHA256 9194485f3a2c0b984d89b8580d8f3c45f372be0f300f898bf0d95517b5bcaaf5 |
| 53 |
-MISC ChangeLog 11324 RMD160 c854d1088c5dfa2af0484ec190d3b5149b40dcf2 SHA1 1174b45878aa769762599d9c56f2a8c1a282236a SHA256 23e512e42afa379426421c3c88ff7004e13b98c61722017ba06add358dba50fe |
| 54 |
+MISC ChangeLog 11518 RMD160 a1d900415947305f12f6d271fade081333b3209e SHA1 98fee384b20327b609851aed47182d47da654373 SHA256 b40c02f0b2e954aaecaca0aff57853ec2429d9d8fbeda3634258aa6067bc67ed |
| 55 |
MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80 |
| 56 |
|
| 57 |
diff --git a/media-gfx/digikam/files/digikam-2.0.0_officialpgf.patch b/media-gfx/digikam/files/digikam-2.0.0_officialpgf.patch |
| 58 |
deleted file mode 100644 |
| 59 |
index 80d46b7..0000000 |
| 60 |
--- a/media-gfx/digikam/files/digikam-2.0.0_officialpgf.patch |
| 61 |
+++ /dev/null |
| 62 |
@@ -1,71 +0,0 @@ |
| 63 |
-commit abd03787b7b1e3a392803edc5b40dfb25a69423c |
| 64 |
-Author: Gilles Caulier <caulier.gilles@×××××.com> |
| 65 |
-Date: Mon Jul 4 13:54:40 2011 +0200 |
| 66 |
- |
| 67 |
- compile with last offcial libpgf |
| 68 |
- CCBUGS: 276969 |
| 69 |
- |
| 70 |
-diff --git a/cmake/modules/FindPGF.cmake b/cmake/modules/FindPGF.cmake |
| 71 |
-index b6622c4..0c82a4e 100644 |
| 72 |
---- a/cmake/modules/FindPGF.cmake |
| 73 |
-+++ b/cmake/modules/FindPGF.cmake |
| 74 |
-@@ -1,9 +1,10 @@ |
| 75 |
- # - Try to find libpgf |
| 76 |
- # Once done this will define |
| 77 |
- # |
| 78 |
--# PGF_FOUND - system has libgf |
| 79 |
--# PGF_INCLUDE_DIRS - the libpgf include directory |
| 80 |
--# PGF_LIBRARIES - Link these to use libpgf |
| 81 |
-+# PGF_FOUND - system has libgf |
| 82 |
-+# PGF_INCLUDE_DIRS - the libpgf include directory |
| 83 |
-+# PGF_LIBRARIES - Link these to use libpgf |
| 84 |
-+# PGF_CODEC_VERSION_ID - PGF codec version ID. |
| 85 |
- |
| 86 |
- # PKG-CONFIG is required. |
| 87 |
- INCLUDE(FindPkgConfig REQUIRED) |
| 88 |
-@@ -14,11 +15,14 @@ IF(PKG_CONFIG_FOUND) |
| 89 |
- |
| 90 |
- PKG_CHECK_MODULES(PGF libpgf) |
| 91 |
- |
| 92 |
-- MESSAGE(STATUS "PGF_INCLUDE_DIRS = ${PGF_INCLUDE_DIRS}") |
| 93 |
-- MESSAGE(STATUS "PGF_INCLUDEDIR = ${PGF_INCLUDEDIR}") |
| 94 |
-- MESSAGE(STATUS "PGF_LIBRARIES = ${PGF_LIBRARIES}") |
| 95 |
-- MESSAGE(STATUS "PGF_LDFLAGS = ${PGF_LDFLAGS}") |
| 96 |
-- MESSAGE(STATUS "PGF_CFLAGS = ${PGF_CFLAGS}") |
| 97 |
-- MESSAGE(STATUS "PGF_VERSION = ${PGF_VERSION}") |
| 98 |
-+ MESSAGE(STATUS "PGF_INCLUDE_DIRS = ${PGF_INCLUDE_DIRS}") |
| 99 |
-+ MESSAGE(STATUS "PGF_INCLUDEDIR = ${PGF_INCLUDEDIR}") |
| 100 |
-+ MESSAGE(STATUS "PGF_LIBRARIES = ${PGF_LIBRARIES}") |
| 101 |
-+ MESSAGE(STATUS "PGF_LDFLAGS = ${PGF_LDFLAGS}") |
| 102 |
-+ MESSAGE(STATUS "PGF_CFLAGS = ${PGF_CFLAGS}") |
| 103 |
-+ MESSAGE(STATUS "PGF_VERSION = ${PGF_VERSION}") |
| 104 |
-+ |
| 105 |
-+ STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}") |
| 106 |
-+ MESSAGE(STATUS "PGF_CODEC_VERSION_ID = ${PGF_CODEC_VERSION_ID}") |
| 107 |
- |
| 108 |
- ENDIF(PKG_CONFIG_FOUND) |
| 109 |
-diff --git a/digikam/utils/config-digikam.h.cmake b/digikam/utils/config-digikam.h.cmake |
| 110 |
-index 4ba293b..f881036 100644 |
| 111 |
---- a/digikam/utils/config-digikam.h.cmake |
| 112 |
-+++ b/digikam/utils/config-digikam.h.cmake |
| 113 |
-@@ -60,6 +60,8 @@ |
| 114 |
- /* Define to 1 if we know how to start mysqld */ |
| 115 |
- #cmakedefine HAVE_INTERNALMYSQL 1 |
| 116 |
- |
| 117 |
-+#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID} |
| 118 |
-+ |
| 119 |
- #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}" |
| 120 |
- |
| 121 |
- /* |
| 122 |
-diff --git a/libs/threadimageio/pgfutils.cpp b/libs/threadimageio/pgfutils.cpp |
| 123 |
-index 758f12c..426a531 100644 |
| 124 |
---- a/libs/threadimageio/pgfutils.cpp |
| 125 |
-+++ b/libs/threadimageio/pgfutils.cpp |
| 126 |
-@@ -46,6 +46,7 @@ extern "C" |
| 127 |
- // LibPGF includes |
| 128 |
- |
| 129 |
- #include "PGFimage.h" |
| 130 |
-+#include "config-digikam.h" |
| 131 |
- |
| 132 |
- namespace Digikam |
| 133 |
- { |
| 134 |
|
| 135 |
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 |
| 136 |
new file mode 100644 |
| 137 |
index 0000000..78f7770 |
| 138 |
--- /dev/null |
| 139 |
+++ b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch |
| 140 |
@@ -0,0 +1,56 @@ |
| 141 |
+diff -ruN digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake digikam-2.0.0-rc/core/cmake/modules/FindPGF.cmake |
| 142 |
+--- digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake 2011-06-28 16:38:50.000000000 +0200 |
| 143 |
++++ digikam-2.0.0-rc/core/cmake/modules/FindPGF.cmake 2011-07-04 15:32:50.000000000 +0200 |
| 144 |
+@@ -1,9 +1,10 @@ |
| 145 |
+ # - Try to find libpgf |
| 146 |
+ # Once done this will define |
| 147 |
+ # |
| 148 |
+-# PGF_FOUND - system has libgf |
| 149 |
+-# PGF_INCLUDE_DIRS - the libpgf include directory |
| 150 |
+-# PGF_LIBRARIES - Link these to use libpgf |
| 151 |
++# PGF_FOUND - system has libgf |
| 152 |
++# PGF_INCLUDE_DIRS - the libpgf include directory |
| 153 |
++# PGF_LIBRARIES - Link these to use libpgf |
| 154 |
++# PGF_CODEC_VERSION_ID - PGF codec version ID. |
| 155 |
+ |
| 156 |
+ # PKG-CONFIG is required. |
| 157 |
+ INCLUDE(FindPkgConfig REQUIRED) |
| 158 |
+@@ -12,4 +13,15 @@ |
| 159 |
+ INCLUDE(FindPkgConfig) |
| 160 |
+ |
| 161 |
+ PKG_CHECK_MODULES(PGF libpgf) |
| 162 |
++ |
| 163 |
++ MESSAGE(STATUS "PGF_INCLUDE_DIRS = ${PGF_INCLUDE_DIRS}") |
| 164 |
++ MESSAGE(STATUS "PGF_INCLUDEDIR = ${PGF_INCLUDEDIR}") |
| 165 |
++ MESSAGE(STATUS "PGF_LIBRARIES = ${PGF_LIBRARIES}") |
| 166 |
++ MESSAGE(STATUS "PGF_LDFLAGS = ${PGF_LDFLAGS}") |
| 167 |
++ MESSAGE(STATUS "PGF_CFLAGS = ${PGF_CFLAGS}") |
| 168 |
++ MESSAGE(STATUS "PGF_VERSION = ${PGF_VERSION}") |
| 169 |
++ |
| 170 |
++ STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}") |
| 171 |
++ MESSAGE(STATUS "PGF_CODEC_VERSION_ID = ${PGF_CODEC_VERSION_ID}") |
| 172 |
++ |
| 173 |
+ ENDIF(PKG_CONFIG_FOUND) |
| 174 |
+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 |
| 175 |
+--- digikam-2.0.0-rc.orig/core/digikam/utils/config-digikam.h.cmake 2011-06-28 16:38:50.000000000 +0200 |
| 176 |
++++ digikam-2.0.0-rc/core/digikam/utils/config-digikam.h.cmake 2011-07-04 15:29:24.000000000 +0200 |
| 177 |
+@@ -57,6 +57,8 @@ |
| 178 |
+ /* Define to 1 if we know how to start mysqld */ |
| 179 |
+ #cmakedefine HAVE_INTERNALMYSQL 1 |
| 180 |
+ |
| 181 |
++#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID} |
| 182 |
++ |
| 183 |
+ #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}" |
| 184 |
+ |
| 185 |
+ /* |
| 186 |
+diff -ruN digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp |
| 187 |
+--- digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp 2011-06-28 16:38:44.000000000 +0200 |
| 188 |
++++ digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp 2011-07-04 15:29:24.000000000 +0200 |
| 189 |
+@@ -46,6 +46,7 @@ |
| 190 |
+ // LibPGF includes |
| 191 |
+ |
| 192 |
+ #include "PGFimage.h" |
| 193 |
++#include "config-digikam.h" |
| 194 |
+ |
| 195 |
+ namespace Digikam |
| 196 |
+ { |
Archives