cope with API change done in ImageMagick due to "module" becoming a reserved

word in C++20; build failure reported by naddy
This commit is contained in:
sthen 2019-08-20 15:27:15 +00:00
parent 30531592e4
commit a45134b251
2 changed files with 16 additions and 1 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.58 2019/08/07 10:44:49 rsadowski Exp $
# $OpenBSD: Makefile,v 1.59 2019/08/20 15:27:15 sthen Exp $
COMMENT = KDE digital photo and video management utility
V = 6.2.0
DISTNAME = digikam-${V}
REVISION = 0
CATEGORIES = graphics

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-core_tests_dimg_magickloader_cpp,v 1.1 2019/08/20 15:27:16 sthen Exp $
Index: core/tests/dimg/magickloader.cpp
--- core/tests/dimg/magickloader.cpp.orig
+++ core/tests/dimg/magickloader.cpp
@@ -139,7 +139,7 @@ int main(int argc, char** argv)
if (inf->encoder) mode.append(QLatin1Char('W'));
else mode.append(QLatin1Char('-'));
- QString module = QLatin1String(inf->module);
+ QString module = QLatin1String(inf->magick_module);
QString mime = QMimeDatabase().mimeTypeForFile(QFileInfo(QString::fromLatin1("foo.%1").arg(module))).name();
if (module != QLatin1String("DNG") &&