commit: 95c14433ba569fcc4dba0279e7a1e71b8eff676c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Aug 22 12:46:04 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Aug 22 14:15:37 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c14433
media-gfx/digikam: Fix build with ImageMagick-7.0.8.60 Thanks-to: David Haller <gentoo <AT> dhaller.de> Closes: https://bugs.gentoo.org/692326 Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-gfx/digikam/digikam-6.2.0.ebuild | 1 + .../digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/media-gfx/digikam/digikam-6.2.0.ebuild b/media-gfx/digikam/digikam-6.2.0.ebuild index 4478b85ae23..d28773546dc 100644 --- a/media-gfx/digikam/digikam-6.2.0.ebuild +++ b/media-gfx/digikam/digikam-6.2.0.ebuild @@ -109,6 +109,7 @@ RESTRICT+=" test" PATCHES=( "${FILESDIR}/${P}-googlephoto-upload.patch" "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-imagemagick-7.0.8.60.patch" ) pkg_pretend() { diff --git a/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch b/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch new file mode 100644 index 00000000000..264da2c34f2 --- /dev/null +++ b/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch @@ -0,0 +1,14 @@ +--- a/core/tests/dimg/magickloader.cpp ++++ a/core/tests/dimg/magickloader.cpp +@@ -139,7 +139,11 @@ int main(int argc, char** argv) + if (inf->encoder) mode.append(QLatin1Char('W')); + else mode.append(QLatin1Char('-')); + ++#if( (MagickLibVersion >= 0x708) && defined(magick_module) ) /* defined since 7.0.8.60 */ ++ QString module = QLatin1String(inf->magick_module); ++#else + QString module = QLatin1String(inf->module); ++#endif + QString mime = QMimeDatabase().mimeTypeForFile(QFileInfo(QString::fromLatin1("foo.%1").arg(module))).name(); + + if (module != QLatin1String("DNG") && \ No newline at end of file
