Date: Sun, 9 Jul 2023 22:09:56 GMT From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 31eddbf0fa99 - main - graphics/kphotoalbum: make compatible with exiv2 0.28 Message-ID: <202307092209.369M9uTa034588@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=31eddbf0fa9911b71a8b4f37ea2245cbb137a8f1 commit 31eddbf0fa9911b71a8b4f37ea2245cbb137a8f1 Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2023-07-03 00:04:09 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> CommitDate: 2023-07-09 22:09:11 +0000 graphics/kphotoalbum: make compatible with exiv2 0.28 PR: 272311 --- graphics/kphotoalbum/Makefile | 2 +- graphics/kphotoalbum/files/patch-DB_FileInfo.cpp | 11 +++++++++++ .../kphotoalbum/files/patch-lib_kpaexif_Database.cpp | 20 ++++++++++++++++++++ .../files/patch-lib_kpaexif_DatabaseElement.cpp | 11 +++++++++++ .../kphotoalbum/files/patch-lib_kpaexif_Info.cpp | 20 ++++++++++++++++++++ 5 files changed, 63 insertions(+), 1 deletion(-) diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile index c548240b66f4..4202db82595b 100644 --- a/graphics/kphotoalbum/Makefile +++ b/graphics/kphotoalbum/Makefile @@ -1,6 +1,6 @@ PORTNAME= kphotoalbum DISTVERSION= 5.10.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/ DIST_SUBDIR= KDE diff --git a/graphics/kphotoalbum/files/patch-DB_FileInfo.cpp b/graphics/kphotoalbum/files/patch-DB_FileInfo.cpp new file mode 100644 index 000000000000..c4854157f698 --- /dev/null +++ b/graphics/kphotoalbum/files/patch-DB_FileInfo.cpp @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..579ee1be525a --- /dev/null +++ b/graphics/kphotoalbum/files/patch-lib_kpaexif_Database.cpp @@ -0,0 +1,20 @@ +--- 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 new file mode 100644 index 000000000000..f85163774238 --- /dev/null +++ b/graphics/kphotoalbum/files/patch-lib_kpaexif_DatabaseElement.cpp @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..2675b0c306d2 --- /dev/null +++ b/graphics/kphotoalbum/files/patch-lib_kpaexif_Info.cpp @@ -0,0 +1,20 @@ +--- 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();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307092209.369M9uTa034588>