graphics/kphotoalbum: update to 5.11.0, latest upstream

The most notable change for this release is build-compatibility
with exiv2 0.28 -- thanks though to mandree@ for pre-emptively
fixing that in the previous kphotoalbum ports version.

6 files changed, 4 insertions, 67 deletions

diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile
index 4202db82595b..afa8a36b913c 100644
--- a/graphics/kphotoalbum/Makefile
+++ b/graphics/kphotoalbum/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	kphotoalbum
-DISTVERSION=	5.10.0
-PORTREVISION=	2
+DISTVERSION=	5.11.0
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/
 DIST_SUBDIR=	KDE
diff --git a/graphics/kphotoalbum/distinfo b/graphics/kphotoalbum/distinfo
index c6fb2b2131c4..d974e4375b64 100644
--- a/graphics/kphotoalbum/distinfo
+++ b/graphics/kphotoalbum/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680380654
-SHA256 (KDE/kphotoalbum-5.10.0.tar.xz) = add117820e61c2ee765c98add3b01bad2c3b90b0cd2be2296c8c0a095fcb869f
-SIZE (KDE/kphotoalbum-5.10.0.tar.xz) = 12002788
+TIMESTAMP = 1689340586
+SHA256 (KDE/kphotoalbum-5.11.0.tar.xz) = 356b4e207257b5cf0f965b586dba766300dfff7408dcc7473435fb59540c8a0e
+SIZE (KDE/kphotoalbum-5.11.0.tar.xz) = 12005836
diff --git a/graphics/kphotoalbum/files/patch-DB_FileInfo.cpp b/graphics/kphotoalbum/files/patch-DB_FileInfo.cpp
deleted file mode 100644
index c4854157f698..000000000000
--- a/graphics/kphotoalbum/files/patch-DB_FileInfo.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- DB/FileInfo.cpp.orig	2023-03-25 09:46:12 UTC
-+++ DB/FileInfo.cpp
-@@ -80,7 +80,7 @@ void DB::FileInfo::parseEXIV2(const DB::FileName &file
- 
-         int orientation = 0;
-         if (datum.count() > 0)
--            orientation = datum.toLong();
-+            orientation = datum.toInt64();
-         m_angle = orientationToAngle(orientation);
-     }
- 
diff --git a/graphics/kphotoalbum/files/patch-lib_kpaexif_Database.cpp b/graphics/kphotoalbum/files/patch-lib_kpaexif_Database.cpp
deleted file mode 100644
index 579ee1be525a..000000000000
--- a/graphics/kphotoalbum/files/patch-lib_kpaexif_Database.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/kpaexif/Database.cpp.orig	2023-03-25 09:46:12 UTC
-+++ lib/kpaexif/Database.cpp
-@@ -320,7 +320,7 @@ bool Exif::Database::add(const DB::FileName &fileName)
-         return false;
- 
-     try {
--        Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
-+        Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data()) };
-         Q_ASSERT(image.get() != nullptr);
-         image->readMetadata();
-         Exiv2::ExifData &exifData = image->exifData();
-@@ -341,7 +341,7 @@ bool Exif::Database::add(const DB::FileNameList &list)
- 
-     for (const DB::FileName &fileName : list) {
-         try {
--            Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
-+            Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data()) };
-             Q_ASSERT(image.get() != nullptr);
-             image->readMetadata();
-             map << DBExifInfo(fileName, image->exifData());
diff --git a/graphics/kphotoalbum/files/patch-lib_kpaexif_DatabaseElement.cpp b/graphics/kphotoalbum/files/patch-lib_kpaexif_DatabaseElement.cpp
deleted file mode 100644
index f85163774238..000000000000
--- a/graphics/kphotoalbum/files/patch-lib_kpaexif_DatabaseElement.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/kpaexif/DatabaseElement.cpp.orig	2023-03-25 09:46:12 UTC
-+++ lib/kpaexif/DatabaseElement.cpp
-@@ -77,7 +77,7 @@ QString Exif::IntExifElement::queryString() const
- QVariant Exif::IntExifElement::valueFromExif(Exiv2::ExifData &data) const
- {
-     if (data[m_tag].count() > 0)
--        return QVariant { (int)data[m_tag].toLong() };
-+        return QVariant { (int)data[m_tag].toInt64() };
-     else
-         return QVariant { (int)0 };
- }
diff --git a/graphics/kphotoalbum/files/patch-lib_kpaexif_Info.cpp b/graphics/kphotoalbum/files/patch-lib_kpaexif_Info.cpp
deleted file mode 100644
index 2675b0c306d2..000000000000
--- a/graphics/kphotoalbum/files/patch-lib_kpaexif_Info.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/kpaexif/Info.cpp.orig	2023-07-02 23:13:17 UTC
-+++ lib/kpaexif/Info.cpp
-@@ -166,7 +166,7 @@ Info::Info()
- void Exif::writeExifInfoToFile(const DB::FileName &srcName, const QString &destName, const QString &imageDescription)
- {
-     // Load Exif from source image
--    Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(QFile::encodeName(srcName.absolute()).data());
-+    Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(QFile::encodeName(srcName.absolute()).data()) };
-     image->readMetadata();
-     Exiv2::ExifData data = image->exifData();
- 
-@@ -201,7 +201,7 @@ Exif::Metadata Exif::Info::metadata(const DB::FileName
- {
-     try {
-         Exif::Metadata result;
--        Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(QFile::encodeName(fileName.absolute()).data());
-+        Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(QFile::encodeName(fileName.absolute()).data()) };
-         Q_ASSERT(image.get() != nullptr);
-         image->readMetadata();
-         result.exif = image->exifData();