diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index 7a7e1e3a9e10..6309bb4fce25 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -1,107 +1,107 @@ PORTNAME= digikam DISTVERSION= 7.10.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= KDE/${PORTNAME}/${PORTVERSION} # One bit changed in the naming convention .. DISTFILES= digiKam-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX} MAINTAINER= kde@FreeBSD.org COMMENT= KDE digital photo management application WWW= https://www.digikam.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libKF5Sane.so:graphics/libksane \ libboost_graph.so:devel/boost-libs \ libexiv2.so:graphics/exiv2 \ libexpat.so:textproc/expat2 \ libgphoto2.so:graphics/libgphoto2 \ libicalss.so:devel/libical \ libjasper.so:graphics/jasper \ liblcms2.so:graphics/lcms2 \ liblensfun.so:graphics/lensfun \ liblqr-1.so:graphics/liblqr-1 \ libopencv_core.so:graphics/opencv \ libheif.so:graphics/libheif \ libpgf.so:graphics/libpgf \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libx265.so:multimedia/x265 USES= bison cmake compiler:c++11-lib desktop-file-utils eigen:3 gl \ gnome jpeg kde:5 magick pkgconfig qt:5 shebangfix tar:xz xorg USE_GL= gl glu USE_GNOME= glib20 libxml2 libxslt USE_KDE= archive auth bookmarks calendarcore codecs completion config \ configwidgets coreaddons crash doctools ecm filemetadata \ guiaddons i18n iconthemes itemmodels itemviews jobwidgets kdelibs4support \ kio marble libkipi notifications notifyconfig parts service \ solid sonnet textwidgets threadweaver unitconversion \ widgetsaddons windowsystem xmlgui USE_QT= concurrent core dbus declarative gui location network opengl \ printsupport sql webchannel widgets x11extras xml xmlpatterns \ sql-sqlite3:run \ buildtools:build qmake:build USE_XORG= ice sm x11 xext USE_LDCONFIG= yes SHEBANG_FILES= core/data/scripts/digitaglinktree/digitaglinktree WITH_CCACHE_BUILD= yes # Disable kipiplugins, as they are built in their own port: graphics/kipiplugins. # Remember to keep that port in sync with this one. CMAKE_ON= BUILD_WITH_CCACHE DIGIKAMSC_COMPILE_DIGIKAM ENABLE_KFILEMETADATASUPPORT OPTIONS_DEFINE= DOCS DOXYGEN KDEPIM KVKONTAKTE MEDIAPLAYER MYSQL NLS WEBENGINE OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NWEBENGINE:NMEDIAPLAYER} OPTIONS_SUB= yes DOCS_DESC= Digikam documentation DOCS_CMAKE_BOOL= DIGIKAMSC_COMPILE_DOC DOCS_USES= gettext DOCS_USE= KDE=doctools DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_IMPLIES= DOCS KDEPIM_DESC= KDEPim Addressbook support KDEPIM_USE= KDE=akonadi,akonadicontacts,contacts,grantleetheme KDEPIM_USES= grantlee:5 KDEPIM_CMAKE_BOOL= ENABLE_AKONADICONTACTSUPPORT KDEPIM_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_KF5AkonadiContact MEDIAPLAYER_DESC= Enable mediaplayer MEDIAPLAYER_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libQtAV.so:multimedia/QtAV MEDIAPLAYER_CMAKE_BOOL= ENABLE_MEDIAPLAYER MEDIAPLAYER_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_FFmpeg \ CMAKE_DISABLE_FIND_PACKAGE_QtAV MYSQL_USES= mysql:server MYSQL_USE= QT=sql-mysql:run MYSQL_CMAKE_BOOL= ENABLE_INTERNALMYSQL \ ENABLE_MYSQLSUPPORT MYSQL_CMAKE_ON= -DMYSQLD_PATH:PATH=${LOCALBASE}/libexec \ -DMYSQL_TOOLS_PATH:PATH=${LOCALBASE}/bin KVKONTAKTE_DESC= vk.com Plugin KVKONTAKTE_LIB_DEPENDS= libKF5Vkontakte.so:net/libkvkontakte KVKONTAKTE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_KF5Vkontakte NLS_DESC= Digikam i18n translations NLS_CMAKE_BOOL= DIGIKAMSC_COMPILE_PO NLS_USES= gettext NLS_USE= KDE=i18n WEBENGINE_DESC= Use Qt WebEngine instead of WebKit WEBENGINE_USE= QT=webengine WEBENGINE_USE_OFF= QT=webkit WEBENGINE_CMAKE_BOOL= ENABLE_QWEBENGINE PLIST_SUB= SHLIB_VER=${DISTVERSION} .include diff --git a/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__comments.cpp b/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__comments.cpp new file mode 100644 index 000000000000..ea033e9b1ef8 --- /dev/null +++ b/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__comments.cpp @@ -0,0 +1,11 @@ +--- core/libs/metadataengine/engine/metaengine_comments.cpp.orig 2023-03-12 13:19:02 UTC ++++ core/libs/metadataengine/engine/metaengine_comments.cpp +@@ -64,7 +64,7 @@ bool MetaEngine::canWriteComment(const QString& filePa + catch (Exiv2::AnyError& e) + { + qCCritical(DIGIKAM_METAENGINE_LOG) << "Cannot check Comment access mode with Exiv2 (Error #" +- << e.code() << ": " << QString::fromStdString(e.what()) << ")"; ++ << static_cast(e.code()) << ": " << QString::fromStdString(e.what()) << ")"; + } + catch (...) + { diff --git a/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__data__p.cpp b/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__data__p.cpp new file mode 100644 index 000000000000..0131c92db68c --- /dev/null +++ b/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__data__p.cpp @@ -0,0 +1,11 @@ +--- core/libs/metadataengine/engine/metaengine_data_p.cpp.orig 2023-03-12 13:19:02 UTC ++++ core/libs/metadataengine/engine/metaengine_data_p.cpp +@@ -52,7 +52,7 @@ void MetaEngineData::Private::clear() + catch (Exiv2::AnyError& e) + { + qCCritical(DIGIKAM_METAENGINE_LOG) << "Cannot clear data container with Exiv2 " +- << "(Error #" << e.code() << ": " ++ << "(Error #" << static_cast(e.code()) << ": " + << QString::fromStdString(e.what()) + << ")"; + } diff --git a/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__exif.cpp b/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__exif.cpp new file mode 100644 index 000000000000..4bf3eb5d4c7f --- /dev/null +++ b/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__exif.cpp @@ -0,0 +1,98 @@ +--- core/libs/metadataengine/engine/metaengine_exif.cpp.orig 2023-03-12 13:19:02 UTC ++++ core/libs/metadataengine/engine/metaengine_exif.cpp +@@ -80,7 +80,7 @@ bool MetaEngine::canWriteExif(const QString& filePath) + catch (Exiv2::AnyError& e) + { + qCCritical(DIGIKAM_METAENGINE_LOG) << "Cannot check Exif access mode with Exiv2:(Error #" +- << e.code() << ": " << QString::fromStdString(e.what()) << ")"; ++ << static_cast(e.code()) << ": " << QString::fromStdString(e.what()) << ")"; + } + catch (...) + { +@@ -739,7 +739,7 @@ bool MetaEngine::getExifTagLong(const char* exifTagNam + + if ((it != exifData.end()) && (it->count() > 0)) + { +- val = it->toLong(component); ++ val = it->toInt64(component); + + return true; + } +@@ -812,7 +812,7 @@ QVariant MetaEngine::getExifTagVariant(const char* exi + { + if ((int)it->count() > component) + { +- return QVariant((int)it->toLong(component)); ++ return QVariant((int)it->toInt64(component)); + } + else + { +@@ -915,7 +915,7 @@ QString MetaEngine::getExifTagString(const char* exifT + QString tagValue; + QString key = QLatin1String(it->key().c_str()); + +- if ((key == QLatin1String("Exif.CanonCs.LensType")) && (it->toLong() == 65535)) ++ if ((key == QLatin1String("Exif.CanonCs.LensType")) && (it->toInt64() == 65535)) + { + // FIXME: workaround for a possible crash in Exiv2 pretty-print function for the Exif.CanonCs.LensType. + +@@ -987,12 +987,12 @@ QImage MetaEngine::getExifThumbnail(bool fixOrientatio + Exiv2::ExifThumbC thumb(d->exifMetadata()); + Exiv2::DataBuf const c1 = thumb.copy(); + +- if (c1.size_ == 0) ++ if (c1.size() == 0) + { + return thumbnail; + } + +- thumbnail.loadFromData(c1.pData_, c1.size_); ++ thumbnail.loadFromData(c1.c_data(), c1.size()); + + if (!thumbnail.isNull()) + { +@@ -1010,7 +1010,7 @@ QImage MetaEngine::getExifThumbnail(bool fixOrientatio + + if (it != exifData.end() && it->count()) + { +- long orientation = it->toLong(); ++ long orientation = it->toInt64(); + + //qCDebug(DIGIKAM_METAENGINE_LOG) << "Exif Thumbnail Orientation: " << (int)orientation; + +@@ -1092,12 +1092,12 @@ bool MetaEngine::setTiffThumbnail(const QImage& thumbI + + Exiv2::ExifData::const_iterator pos = d->exifMetadata().findKey(Exiv2::ExifKey("Exif.Image.NewSubfileType")); + +- if ((pos == d->exifMetadata().end()) || (pos->count() != 1) || (pos->toLong() != 0)) ++ if ((pos == d->exifMetadata().end()) || (pos->count() != 1) || (pos->toInt64() != 0)) + { + + #if EXIV2_TEST_VERSION(0,27,0) + +- throw Exiv2::Error(Exiv2::kerErrorMessage, "Exif.Image.NewSubfileType missing or not set as main image"); ++ throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, "Exif.Image.NewSubfileType missing or not set as main image"); + + #else + +@@ -1136,9 +1136,9 @@ bool MetaEngine::setTiffThumbnail(const QImage& thumbI + Exiv2::DataBuf buf((Exiv2::byte*)data.data(), data.size()); + Exiv2::ULongValue val; + val.read("0"); +- val.setDataArea(buf.pData_, buf.size_); ++ val.setDataArea(buf.c_data(), buf.size()); + d->exifMetadata()["Exif.SubImage1.JPEGInterchangeFormat"] = val; +- d->exifMetadata()["Exif.SubImage1.JPEGInterchangeFormatLength"] = uint32_t(buf.size_); ++ d->exifMetadata()["Exif.SubImage1.JPEGInterchangeFormatLength"] = uint32_t(buf.size()); + d->exifMetadata()["Exif.SubImage1.Compression"] = uint16_t(6); // JPEG (old-style) + d->exifMetadata()["Exif.SubImage1.NewSubfileType"] = uint32_t(1); // Thumbnail image + +@@ -1261,7 +1261,7 @@ MetaEngine::MetaDataMap MetaEngine::getExifTagsDataLis + { + tagValue = QString::number(md->value().size()); + } +- else if (key == QLatin1String("Exif.CanonCs.LensType") && md->toLong() == 65535) ++ else if (key == QLatin1String("Exif.CanonCs.LensType") && md->toInt64() == 65535) + { + // FIXME: workaround for a possible crash in Exiv2 pretty-print function for the Exif.CanonCs.LensType. + diff --git a/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__iptc.cpp b/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__iptc.cpp new file mode 100644 index 000000000000..2d3ccae32866 --- /dev/null +++ b/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__iptc.cpp @@ -0,0 +1,29 @@ +--- core/libs/metadataengine/engine/metaengine_iptc.cpp.orig 2023-03-12 13:19:02 UTC ++++ core/libs/metadataengine/engine/metaengine_iptc.cpp +@@ -29,6 +29,8 @@ + #include "digikam_debug.h" + #include "digikam_config.h" + ++#include ++ + #if defined(Q_CC_CLANG) + # pragma clang diagnostic push + # pragma clang diagnostic ignored "-Wdeprecated-declarations" +@@ -65,7 +67,7 @@ bool MetaEngine::canWriteIptc(const QString& filePath) + catch (Exiv2::AnyError& e) + { + qCCritical(DIGIKAM_METAENGINE_LOG) << "Cannot check Iptc access mode with Exiv2:(Error #" +- << e.code() << ": " << QString::fromStdString(e.what()) << ")"; ++ << static_cast(e.code()) << ": " << QString::fromStdString(e.what()) << ")"; + } + catch (...) + { +@@ -121,7 +123,7 @@ QByteArray MetaEngine::getIptc(bool addIrbHeader) cons + c2 = Exiv2::IptcParser::encode(d->iptcMetadata()); + } + +- QByteArray data((const char*)c2.pData_, c2.size_); ++ QByteArray data(reinterpret_cast(c2.c_data()), c2.size()); + + return data; + } diff --git a/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__item.cpp b/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__item.cpp new file mode 100644 index 000000000000..b28099023389 --- /dev/null +++ b/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__item.cpp @@ -0,0 +1,65 @@ +--- core/libs/metadataengine/engine/metaengine_item.cpp.orig 2023-03-12 13:19:02 UTC ++++ core/libs/metadataengine/engine/metaengine_item.cpp +@@ -127,7 +127,7 @@ QSize MetaEngine::getItemDimensions() const + + if ((it != exifData.end()) && it->count()) + { +- width = it->toLong(); ++ width = it->toInt64(); + } + + Exiv2::ExifKey key2("Exif.Photo.PixelYDimension"); +@@ -135,7 +135,7 @@ QSize MetaEngine::getItemDimensions() const + + if ((it2 != exifData.end()) && it2->count()) + { +- height = it2->toLong(); ++ height = it2->toInt64(); + } + + if ((width != -1) && (height != -1)) +@@ -153,7 +153,7 @@ QSize MetaEngine::getItemDimensions() const + + if ((it3 != exifData.end()) && it3->count()) + { +- width = it3->toLong(); ++ width = it3->toInt64(); + } + + Exiv2::ExifKey key4("Exif.Image.ImageLength"); +@@ -161,7 +161,7 @@ QSize MetaEngine::getItemDimensions() const + + if ((it4 != exifData.end()) && it4->count()) + { +- height = it4->toLong(); ++ height = it4->toInt64(); + } + + if ((width != -1) && (height != -1)) +@@ -320,7 +320,7 @@ MetaEngine::ImageOrientation MetaEngine::getItemOrient + + if ((it != exifData.end()) && it->count()) + { +- orientation = it->toLong(); ++ orientation = it->toInt64(); + + //qCDebug(DIGIKAM_METAENGINE_LOG) << "Orientation => Exif.MinoltaCs7D.Rotation =>" << (int)orientation; + +@@ -347,7 +347,7 @@ MetaEngine::ImageOrientation MetaEngine::getItemOrient + + if ((it != exifData.end()) && it->count()) + { +- orientation = it->toLong(); ++ orientation = it->toInt64(); + + //qCDebug(DIGIKAM_METAENGINE_LOG) << "Orientation => Exif.MinoltaCs5D.Rotation =>" << (int)orientation; + +@@ -376,7 +376,7 @@ MetaEngine::ImageOrientation MetaEngine::getItemOrient + + if ((it != exifData.end()) && it->count()) + { +- orientation = it->toLong(); ++ orientation = it->toInt64(); + + //qCDebug(DIGIKAM_METAENGINE_LOG) << "Orientation => Exif.Image.Orientation =>" << (int)orientation; + diff --git a/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__p.cpp b/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__p.cpp new file mode 100644 index 000000000000..722990b80fc4 --- /dev/null +++ b/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__p.cpp @@ -0,0 +1,11 @@ +--- core/libs/metadataengine/engine/metaengine_p.cpp.orig 2023-03-12 13:19:02 UTC ++++ core/libs/metadataengine/engine/metaengine_p.cpp +@@ -542,7 +542,7 @@ bool MetaEngine::Private::saveOperations(const QFileIn + void MetaEngine::Private::printExiv2ExceptionError(const QString& msg, Exiv2::AnyError& e) + { + qCCritical(DIGIKAM_METAENGINE_LOG) << msg.toLatin1().constData() +- << " (Error #" << e.code() << ": " << QString::fromStdString(e.what()); ++ << " (Error #" << static_cast(e.code()) << ": " << QString::fromStdString(e.what()); + } + + void MetaEngine::Private::printExiv2MessageHandler(int lvl, const char* msg) diff --git a/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__p.h b/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__p.h new file mode 100644 index 000000000000..a32ff29c2b30 --- /dev/null +++ b/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__p.h @@ -0,0 +1,22 @@ +--- core/libs/metadataengine/engine/metaengine_p.h.orig 2023-03-12 13:19:02 UTC ++++ core/libs/metadataengine/engine/metaengine_p.h +@@ -90,6 +90,10 @@ + ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) ) + #endif + ++#if EXIV2_TEST_VERSION(0,28,0) ++# define AnyError Error ++#endif ++ + #if EXIV2_TEST_VERSION(0,27,99) + # define AutoPtr UniquePtr + #endif +@@ -182,7 +186,7 @@ class Q_DECL_HIDDEN MetaEngine::Private (public) + * Generic method to print the Exiv2 C++ Exception error message from 'e'. + * 'msg' string is printed using qDebug rules. + */ +- static void printExiv2ExceptionError(const QString& msg, Exiv2::AnyError& e); ++ static void printExiv2ExceptionError(const QString& msg, Exiv2::Error& e); + + /** + * Generic method to print debug message from Exiv2. diff --git a/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__xmp.cpp b/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__xmp.cpp new file mode 100644 index 000000000000..285ef0ed2e5a --- /dev/null +++ b/graphics/digikam/files/patch-core_libs_metadataengine_engine_metaengine__xmp.cpp @@ -0,0 +1,20 @@ +--- core/libs/metadataengine/engine/metaengine_xmp.cpp.orig 2023-03-12 13:19:02 UTC ++++ core/libs/metadataengine/engine/metaengine_xmp.cpp +@@ -67,7 +67,7 @@ bool MetaEngine::canWriteXmp(const QString& filePath) + catch (Exiv2::AnyError& e) + { + qCCritical(DIGIKAM_METAENGINE_LOG) << "Cannot check Xmp access mode with Exiv2:(Error #" +- << e.code() << ": " << QString::fromStdString(e.what()) << ")"; ++ << static_cast(e.code()) << ": " << QString::fromStdString(e.what()) << ")"; + } + catch (...) + { +@@ -1014,7 +1014,7 @@ QVariant MetaEngine::getXmpTagVariant(const char* xmpT + case Exiv2::signedShort: + case Exiv2::signedLong: + { +- return QVariant((int)it->toLong()); ++ return QVariant((int)it->toInt64()); + } + + case Exiv2::unsignedRational: