From: "Andreas Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
Date: Tue, 5 Jul 2011 12:03:31 +0000 (UTC) [thread overview]
Message-ID: <8293a0ecdb5bb914757cb151662e7052c57aeefc.dilfridge@gentoo> (raw)
commit: 8293a0ecdb5bb914757cb151662e7052c57aeefc
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 5 12:03:41 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jul 5 12:03:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8293a0ec
[media-gfx/digikam] Additional compile fix for libpgf-6.11.24
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit)
---
media-gfx/digikam/digikam-2.0.0_rc.ebuild | 1 +
.../files/digikam-2.0.0_rc-officialpgf2.patch | 23 ++++++++++++++++++++
2 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
index 378d391..61faba4 100644
--- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
@@ -71,6 +71,7 @@ DEPEND="${CDEPEND}
PATCHES=(
"${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="${WORKDIR}/${MY_P}/core"
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
new file mode 100644
index 0000000..184360d
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch
@@ -0,0 +1,23 @@
+diff -ruN digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp digikam-2.0.0-rc/core/libs/dimg/loaders/pgfloader.cpp
+--- digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp 2011-06-28 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
+
+ #include "pgfloader.h"
++#include "config-digikam.h"
+
+ // C Ansi includes
+
+@@ -435,10 +436,8 @@
+ CallbackForLibPGF, this);
+
+ UINT32 nWrittenBytes = 0;
+-#ifdef PGFCodecVersionID
+-# if PGFCodecVersionID >= 0x061124
++#if PGFCodecVersionID >= 0x061124
+ pgf.Write(&stream, &nWrittenBytes, CallbackForLibPGF, this);
+-# endif
+ #else
+ pgf.Write(&stream, 0, CallbackForLibPGF, &nWrittenBytes, this);
+ #endif
next reply other threads:[~2011-07-05 12:03 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-05 12:03 Andreas Hüttel [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-07-13 21:57 [gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/ Andreas Sturmlechner
2024-03-25 14:43 Andreas Sturmlechner
2023-12-25 21:53 Andreas Sturmlechner
2023-07-08 14:54 Andreas Sturmlechner
2022-01-18 16:01 Andreas Sturmlechner
2020-05-26 15:12 Andreas Sturmlechner
2020-04-19 7:59 Andreas Sturmlechner
2012-11-10 23:33 Andreas Hüttel
2012-09-19 19:13 Andreas Hüttel
2012-09-19 19:07 Andreas Hüttel
2012-08-11 15:08 Andreas Hüttel
2012-08-10 18:27 Chris Reffett
2011-07-27 20:52 Andreas Hüttel
2011-07-05 7:11 Andreas Hüttel
2011-07-03 9:27 Andreas Hüttel
2011-06-03 21:18 Andreas Hüttel
2011-05-20 22:55 Andreas K. Huettel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8293a0ecdb5bb914757cb151662e7052c57aeefc.dilfridge@gentoo \
--to=dilfridge@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox