Created attachment 587086 [details, diff] Patch for the trivial rename module to magick_module Due to conflicts with the C++20 keyword, IM renamed the "module" member of "MagickInfo" (aka "struct _MagickInfo" to "magick_module", thus stuff needs to be adjusted...
The patch works and digikam builds, however to use it in /etc/portage/patches it is necessary to change the file name lines to work with patch -p1: --- a/core/tests/dimg/magickloader.cpp +++ b/core/tests/dimg/magickloader.cpp
I created a pull request on github with the corrected patch: https://github.com/gentoo/gentoo/pull/12740
Is that patch upstream?
Created attachment 587382 [details, diff] Enhanced patch for the trivial rename module to magick_module I've changed the patch to work with stable IM-7.0.8.56 as well... And no, it's not upstreamed (and not fixed in git either).
Created attachment 587384 [details, diff] Enhanced patch for the trivial rename module to magick_module (supersede) *argh* left some testing stuff in .. ;( Time for bed ...
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c14433ba569fcc4dba0279e7a1e71b8eff676c commit 95c14433ba569fcc4dba0279e7a1e71b8eff676c Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2019-08-22 12:46:04 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2019-08-22 14:15:37 +0000 media-gfx/digikam: Fix build with ImageMagick-7.0.8.60 Thanks-to: David Haller <gentoo@dhaller.de> Closes: https://bugs.gentoo.org/692326 Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm@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(+)
*** Bug 693082 has been marked as a duplicate of this bug. ***
