From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4F770138335 for ; Thu, 22 Aug 2019 14:16:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3CEEFE09A5; Thu, 22 Aug 2019 14:16:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 20940E09A5 for ; Thu, 22 Aug 2019 14:16:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DFBA334A11E for ; Thu, 22 Aug 2019 14:16:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F72E76F for ; Thu, 22 Aug 2019 14:16:31 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1566483337.95c14433ba569fcc4dba0279e7a1e71b8eff676c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/digikam/digikam-6.2.0.ebuild media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch X-VCS-Directories: media-gfx/digikam/files/ media-gfx/digikam/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 95c14433ba569fcc4dba0279e7a1e71b8eff676c X-VCS-Branch: master Date: Thu, 22 Aug 2019 14:16:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 770ec7b3-ac7d-497e-ad98-84ab22bc9a87 X-Archives-Hash: 0f3bbc9cb7f85978217debb62a51a0e5 commit: 95c14433ba569fcc4dba0279e7a1e71b8eff676c Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Aug 22 12:46:04 2019 +0000 Commit: Andreas Sturmlechner gentoo 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 dhaller.de> Closes: https://bugs.gentoo.org/692326 Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner 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