digikam: use upstream fixes for -Werror=undef problem

[Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Mar 20 13:13:56 2025 +0100
Changeset:	14663d4162f36947b4ec084ab2845c98f571f73d

Modified Files:
	digikam/Makefile
	digikam/distinfo
Added Files:
	digikam/patches/patch-core_CMakeLists.txt
	digikam/patches/patch-core_dplugins_dimg_jpeg2000_dimgjpeg2000loader__p.h

Log Message:
digikam: use upstream fixes for -Werror=undef problem

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=14663d4162f36947b4ec084ab2845c98f571f73d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 digikam/Makefile                                         |  5 -----
 digikam/distinfo                                         |  2 ++
 digikam/patches/patch-core_CMakeLists.txt                | 16 ++++++++++++++++
 ...h-core_dplugins_dimg_jpeg2000_dimgjpeg2000loader__p.h | 14 ++++++++++++++
 4 files changed, 32 insertions(+), 5 deletions(-)

diffs:
diff --git a/digikam/Makefile b/digikam/Makefile
index a44b291cf1..817c233f8e 100644
--- a/digikam/Makefile
+++ b/digikam/Makefile
@@ -15,11 +15,6 @@ DEPENDS+=	p5-Image-ExifTool-[0-9]*:../../graphics/p5-Image-ExifTool
 WRKSRC=		${WRKDIR}/${DISTNAME:tl}
 
 CONFLICTS+=		digikam-[0-9]*
-# work/.buildlink/include/jasper/jas_config.h:116:6: error: "__STDC_VERSION__" is not defined, evaluates to 0 [-Werror=undef]
-# and more from x265.h
-# Reported upstream at
-# https://bugs.kde.org/show_bug.cgi?id=501769
-BUILDLINK_TRANSFORM+=	rm:-Werror=undef
 
 .include "../../meta-pkgs/kde/applications.mk"
 
diff --git a/digikam/distinfo b/digikam/distinfo
index 06ace20c5a..88382e5f6f 100644
--- a/digikam/distinfo
+++ b/digikam/distinfo
@@ -3,4 +3,6 @@ $NetBSD: distinfo,v 1.64 2025/02/07 21:58:54 wiz Exp $
 BLAKE2s (digiKam-8.6.0.tar.xz) = 66b1a67dca002e9ebcda778052a39b2484e11ce4b994160a51c5eab77fdc28d2
 SHA512 (digiKam-8.6.0.tar.xz) = fc9899eb9a291c2d88b5104c3b6fa86f8db67b26fdbb1328c714eb30407c9dbf13267433c5070f18451e4fb99d3530dba83bf404b26095ed336b348737d7cae2
 Size (digiKam-8.6.0.tar.xz) = 58958608 bytes
+SHA1 (patch-core_CMakeLists.txt) = b2f41549b336f1da6715b9db0da92177a6037405
+SHA1 (patch-core_dplugins_dimg_jpeg2000_dimgjpeg2000loader__p.h) = 65b7632b966c741817fd47e471287d6e13e00dc8
 SHA1 (patch-core_libs_video_QtAVPlayer_qavstream.cpp) = 529af7d24da3667fc50febdc604ac9e1935cf9ec
diff --git a/digikam/patches/patch-core_CMakeLists.txt b/digikam/patches/patch-core_CMakeLists.txt
new file mode 100644
index 0000000000..00996670d6
--- /dev/null
+++ b/digikam/patches/patch-core_CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD$
+
+https://invent.kde.org/graphics/digikam/-/commit/a9017f1e2b8fd52eaa73fda38c90119bd357e81f
+
+--- core/CMakeLists.txt.orig	2025-03-15 14:01:44.000000000 +0000
++++ core/CMakeLists.txt
+@@ -406,6 +406,9 @@ if(DIGIKAM_CAN_BE_COMPILED)
+     REMOVE_GCC_COMPILER_WARNINGS("-Wzero-as-null-pointer-constant")
+     REMOVE_GCC_COMPILER_WARNINGS("-pedantic")
+ 
++    # See bug for NETBSD #501769
++    REMOVE_GCC_COMPILER_WARNINGS("-Werror=undef")
++
+     # Remove deprecated-copy GCC warnings which generate a lots of compilation warnings
+     DISABLE_GCC_COMPILER_WARNINGS("8.99.99" "-Wno-deprecated-copy")
+ 
diff --git a/digikam/patches/patch-core_dplugins_dimg_jpeg2000_dimgjpeg2000loader__p.h b/digikam/patches/patch-core_dplugins_dimg_jpeg2000_dimgjpeg2000loader__p.h
new file mode 100644
index 0000000000..039815483d
--- /dev/null
+++ b/digikam/patches/patch-core_dplugins_dimg_jpeg2000_dimgjpeg2000loader__p.h
@@ -0,0 +1,14 @@
+$NetBSD$
+
+https://invent.kde.org/graphics/digikam/-/commit/82eb6e5fe3f1d2c0e4c70887877b52aab757116f
+
+--- core/dplugins/dimg/jpeg2000/dimgjpeg2000loader_p.h.orig	2025-03-20 07:34:05.983941091 +0000
++++ core/dplugins/dimg/jpeg2000/dimgjpeg2000loader_p.h
+@@ -42,6 +42,7 @@ extern "C"
+ #if !defined(Q_OS_DARWIN) && defined(Q_CC_GNU)
+ #   pragma GCC diagnostic push
+ #   pragma GCC diagnostic ignored "-Wcpp"
++#   pragma GCC diagnostic ignored "-Wundef"
+ #endif
+ 
+ #if defined(Q_OS_DARWIN) && defined(Q_CC_CLANG)