From nobody Sun Jul 09 22:09:56 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QzhBs36thz4mr17; Sun, 9 Jul 2023 22:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzhBs1bc3z3D7L; Sun, 9 Jul 2023 22:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mobsLnfpqiAXHXdIHMXqufwNVVB6N0bsDWMGh89MCiI=; b=e+JQeFVP5Yxvq8aGsxZKBjd4z/HiVJAb+JpfMx8mwz0a42osjRDk5H7WZ5Yw3nJrg8vDXw 16XalHVZQh4dVXg5amQnwujzW1jF8DY+Hpx+2pQy/joA3RQ/ehMQ4QTBgRbHp1Y1VUOvLp QPD/k1LsdFIxvikN3b8nLEV1nAkwL1Ow2rXO9xZSTGsKIgajocOPAic/onW0mXYq4nFwBG kx5pnl1kKRXHfK4QQV6CnczMgdU7iPOG+y2ur2g0IFqn9gJnBDT+1t+1eLpXClDtQtHxWa xDPZST3DWyaxpjH+2Ys6uCDFOvv/i2yIKw3HAQKh2pPxstKupqzWjMms0J6yGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mobsLnfpqiAXHXdIHMXqufwNVVB6N0bsDWMGh89MCiI=; b=ubIEjnXtzkO+1W/CamOYKoRQVgIlj7CYM5UFlLp47QXM30tT+NwmnttQwqGx1rzU9yvgcu F8q9Yx/69GRegjBplan3sPtBVXEozlSLM7hAy7q3qh/3HmO3yVBMcS8jIxEFo14nS1gM7+ w7infwPpQCrABDIjadCad4IoJOwOrVHCzCmaxowqQbX0eiPsI1og1njz3O1DCoC2zKcYMh 8k+F7BtceqUAJJB2eStDWeSFqHmihthZO2NDoMhVZ6qTroDlyA1jBBkPkKuGtI/Y6n7c77 F38lNpu7Athma3S7YTWPcAilp6ici8ir6qJ+zk/K+6XqioQESOpOuTnkBBlgcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688940597; a=rsa-sha256; cv=none; b=P6iBZDxc884rCd4l+Hj8M3fZ5kfcKGaB4oZO5GnAeLfqaYvYsAJBK/zkQ48J4tub6KVk84 ddMkXZWLHmMluoJifqZGqJTBIudM/PEiJisIFXvxlF7z1a41krih7KoIn7jqkRSBINv2On Uv+UDjm/V5r8ecyKih/YZPXxjJth9+32DWwSV74OlYyfv2z3hEes6sRhdKCXkdN05QoVu5 /Ng7RlMBWIg8WbT30+2qG6Dh3xe91Zw4Vqm7NhE7IpReVIDukeAj7BCuvqwzJoEHYQKWON hM6JTmkMoCSBmFj3QBp90XwIiIzWaKFleQdPgHWJMhALJAaw96tEGzByXNkDhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzhBs0fFjzKty; Sun, 9 Jul 2023 22:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369M9uaX034589; Sun, 9 Jul 2023 22:09:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369M9uTa034588; Sun, 9 Jul 2023 22:09:56 GMT (envelope-from git) Date: Sun, 9 Jul 2023 22:09:56 GMT Message-Id: <202307092209.369M9uTa034588@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 31eddbf0fa99 - main - graphics/kphotoalbum: make compatible with exiv2 0.28 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31eddbf0fa9911b71a8b4f37ea2245cbb137a8f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=31eddbf0fa9911b71a8b4f37ea2245cbb137a8f1 commit 31eddbf0fa9911b71a8b4f37ea2245cbb137a8f1 Author: Matthias Andree AuthorDate: 2023-07-03 00:04:09 +0000 Commit: Matthias Andree 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();