Attachment 243171 Details for Bug 272311 – graphics/kphotoalbum: make compatible with exiv2 0.28

[patch] graphics/kphotoalbum: make compatible with exiv2 0.28

0007-graphics-kphotoalbum-make-compatible-with-exiv2-0.28.patch (text/plain), 5.25 KB, created by Matthias Andree on 2023-07-03 09:56:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2023-07-03 09:56:48 UTC

Size: 5.25 KB

patch

obsolete

>From f6149daab34fb5f0a8f1ab442e8abb305e3335dc Mon Sep 17 00:00:00 2001
>From: Matthias Andree <mandree@FreeBSD.org>
>Date: Mon, 3 Jul 2023 02:04:09 +0200
>Subject: [PATCH 7/7] graphics/kphotoalbum: make compatible with exiv2 0.28
>
>PR:		272311
>---
> graphics/kphotoalbum/Makefile                 |  2 +-
> .../kphotoalbum/files/patch-DB_FileInfo.cpp   | 11 ++++++++++
> .../files/patch-lib_kpaexif_Database.cpp      | 20 +++++++++++++++++++
> .../patch-lib_kpaexif_DatabaseElement.cpp     | 11 ++++++++++
> .../files/patch-lib_kpaexif_Info.cpp          | 20 +++++++++++++++++++
> 5 files changed, 63 insertions(+), 1 deletion(-)
> create mode 100644 graphics/kphotoalbum/files/patch-DB_FileInfo.cpp
> create mode 100644 graphics/kphotoalbum/files/patch-lib_kpaexif_Database.cpp
> create mode 100644 graphics/kphotoalbum/files/patch-lib_kpaexif_DatabaseElement.cpp
> create mode 100644 graphics/kphotoalbum/files/patch-lib_kpaexif_Info.cpp
>
>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();
>-- 
>2.41.0
>

Flags:

fluffy: maintainer-approval+

Actions: View | Diff

Attachments on bug 272311: 243098 | 243100 | 243103 | 243104 | 243106 | 243111 | 243124 | 243125 | 243135 | 243136 | 243137 | 243138 | 243139 | 243140 | 243141 | 243142 | 243143 | 243144 | 243145 | 243146 | 243147 | 243148 | 243154 | 243155 | 243156 | 243157 | 243158 | 243159 | 243160 | 243166 | 243167 | 243168 | 243169 | 243170 | 243171 | 243172 | 243175 | 243176