From nobody Sun Jul 09 22:09:42 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 4QzhBZ3Zfqz4mqpp; Sun, 9 Jul 2023 22:09:42 +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 4QzhBZ2nq5z3CYZ; Sun, 9 Jul 2023 22:09:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940582; 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=Pd/QlPFX8JdodVbQ4VbQSIcfpOrv1Sz2CmC6Ss5wc5c=; b=p7IfHN6WnzG75MkJkihgQGTmN1iQJJv+WPd42jFN2vvBvO43MrPqj+4xGseYbh31pXJ/HM vbihEncL42us249htqq7qvncd3GEQz+B0pdKpLklQd/7LfXFPz3MPPsSuQ6mCvByChwYVn zc+G013VDusfcfXxc3MT7sOmOPFUYQYLB7G4u6aZJDGiaDW27ka/zmrG5mQGwwT+Bj84O3 M7fwSugkPm0aQXSbJtzykabSPjTyWXC5Tt0QcsSBOlU2r9EhRmy8uukQC4EZT8eVvwun9/ 5reE2Z59ESr+tDV7M8ZM2PesRXzWpb6/M4LfFPebTeIC4XJv7OvNhfn+ojHX+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940582; 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=Pd/QlPFX8JdodVbQ4VbQSIcfpOrv1Sz2CmC6Ss5wc5c=; b=n3yHFFZLGXgna0c65Wm2T/GfF+uX2V6IsGIj3wuL13g/OBznNEy5uJwMdCf34Ehkb9KB2O a9VRakMeTNt2kk5B/XEw/F3OR7eYfCJ7GV7rcVXv4BvKmNuwuBWpbtjFJx681rqQw+3yoW N9MIYt0GfUMIKBvW4oevpPIyZwF0jwyLqSOcbICin0sR6xMWs/GuW5dwSFUMdAmcpEE5HZ gEQf1hqidH+/71cn8SdYcnMqLK1oQwz9xrxBlFVPc+J/xKofdxhAv9BgnCxC+KpNFQY2Kg Gq1jkH5xwozxDlBrs19HUz/iQM7WuC+wJIn1R00zYwBwc13ugWw3jjbAbZy+4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688940582; a=rsa-sha256; cv=none; b=fH5yZMAw2atb5BRnhJ6Ak63srGaN1LnmGc0uBr5Oxdux/rWFOfITB/ZIWs3TZ6MmKI3sjs +nY5y2qHquN8nx5xfw1GQpXrX3i6mfM0FCo5TTJ16V5qAXa2Rkou1SD+xMkMCh7ZrRLy1x 86ZaZVoT309quLGH2Skas8nKrR4xxrnL3epMgqYC5lTVEe6kURV8bqm9o4ie38xbgxuri+ tcUhrfYz7qEUwlCMraGYfrtN0qORvFJ/Vs0hWWGuotXoqm5Hmm7R3Ms0JziVL2Az+w1f8D YZKbNHS9eMNW7d3ERDGtaVgq2ZyjGu17cW3VrMS1whXrQruViqXn61bXM6z7lg== 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 4QzhBZ1bLXzKx9; Sun, 9 Jul 2023 22:09:42 +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 369M9gTv034321; Sun, 9 Jul 2023 22:09:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369M9guN034320; Sun, 9 Jul 2023 22:09:42 GMT (envelope-from git) Date: Sun, 9 Jul 2023 22:09:42 GMT Message-Id: <202307092209.369M9guN034320@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: 738d7427d670 - main - graphics/photivo: 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: 738d7427d67024949b1541cf2968f16aa3b6f384 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=738d7427d67024949b1541cf2968f16aa3b6f384 commit 738d7427d67024949b1541cf2968f16aa3b6f384 Author: Matthias Andree AuthorDate: 2023-07-02 14:48:40 +0000 Commit: Matthias Andree CommitDate: 2023-07-09 22:08:10 +0000 graphics/photivo: make compatible with exiv2 0.28 PR: 272311 --- graphics/photivo/Makefile | 2 +- .../photivo/files/patch-Sources_ptImageHelper.cpp | 52 +++++++++++++++++++++- graphics/photivo/files/patch-Sources_ptMain.cpp | 11 +++++ 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/graphics/photivo/Makefile b/graphics/photivo/Makefile index 82fc7d296cb5..424647a55950 100644 --- a/graphics/photivo/Makefile +++ b/graphics/photivo/Makefile @@ -1,6 +1,6 @@ PORTNAME= photivo PORTVERSION= 0.0.2015.03.21 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics MASTER_SITES= https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/${PORTNAME}/ DISTNAME= source-archive diff --git a/graphics/photivo/files/patch-Sources_ptImageHelper.cpp b/graphics/photivo/files/patch-Sources_ptImageHelper.cpp index d697215968f1..5c67a26cc7dc 100644 --- a/graphics/photivo/files/patch-Sources_ptImageHelper.cpp +++ b/graphics/photivo/files/patch-Sources_ptImageHelper.cpp @@ -1,4 +1,4 @@ ---- Sources/ptImageHelper.cpp.orig 2019-07-07 08:34:52 UTC +--- Sources/ptImageHelper.cpp.orig 2023-07-02 14:41:47 UTC +++ Sources/ptImageHelper.cpp @@ -34,6 +34,7 @@ #pragma GCC diagnostic pop @@ -8,3 +8,53 @@ #include #include +@@ -106,7 +107,7 @@ bool ptImageHelper::WriteExif(const QString + if (!AFileName.endsWith(JpegExtensions.at(i))) deleteDNGdata = true; + } + +- Exiv2::Image::AutoPtr Exiv2Image = Exiv2::ImageFactory::open(AFileName.toLocal8Bit().data()); ++ Exiv2::Image::UniquePtr Exiv2Image = Exiv2::ImageFactory::open(AFileName.toLocal8Bit().data()); + + Exiv2Image->readMetadata(); + Exiv2::ExifData outExifData = Exiv2Image->exifData(); +@@ -176,7 +177,7 @@ bool ptImageHelper::WriteExif(const QString + Exiv2Image->writeMetadata(); + return true; + #endif +- } catch (Exiv2::AnyError& Error) { ++ } catch (Exiv2::Error& Error) { + if (Settings->GetInt("JobMode") == 0) { + ptMessageBox::warning(0 ,"Exiv2 Error","No exif data written!\nCaught Exiv2 exception '" + QString(Error.what()) + "'\n"); + } else { +@@ -198,7 +199,7 @@ bool ptImageHelper::ReadExif(const QString &AFi + if (Exiv2::ImageFactory::getType(AFileName.toLocal8Bit().data()) == Exiv2::ImageType::none) + return false; + +- Exiv2::Image::AutoPtr hImage = Exiv2::ImageFactory::open(AFileName.toLocal8Bit().data()); ++ Exiv2::Image::UniquePtr hImage = Exiv2::ImageFactory::open(AFileName.toLocal8Bit().data()); + + if (!hImage.get()) return false; + +@@ -295,19 +296,19 @@ bool ptImageHelper::TransferExif(const QString ASource + if (Exiv2::ImageFactory::getType(ASourceFile.toLocal8Bit().data()) == Exiv2::ImageType::none) + return false; + +- Exiv2::Image::AutoPtr hSourceImage = Exiv2::ImageFactory::open(ASourceFile.toLocal8Bit().data()); ++ Exiv2::Image::UniquePtr hSourceImage = Exiv2::ImageFactory::open(ASourceFile.toLocal8Bit().data()); + + if (!hSourceImage.get()) return false; + + hSourceImage->readMetadata(); + +- Exiv2::Image::AutoPtr hTargetImage = Exiv2::ImageFactory::open(ATargetFile.toLocal8Bit().data()); ++ Exiv2::Image::UniquePtr hTargetImage = Exiv2::ImageFactory::open(ATargetFile.toLocal8Bit().data()); + + hTargetImage->clearMetadata(); + hTargetImage->setMetadata(*hSourceImage); + hTargetImage->writeMetadata(); + return true; +- } catch (Exiv2::AnyError& Error) { ++ } catch (Exiv2::Error& Error) { + if (Settings->GetInt("JobMode") == 0) { + ptMessageBox::warning(0 ,"Exiv2 Error","No exif data written!\nCaught Exiv2 exception '" + QString(Error.what()) + "'\n"); + } else { diff --git a/graphics/photivo/files/patch-Sources_ptMain.cpp b/graphics/photivo/files/patch-Sources_ptMain.cpp new file mode 100644 index 000000000000..f250b801004f --- /dev/null +++ b/graphics/photivo/files/patch-Sources_ptMain.cpp @@ -0,0 +1,11 @@ +--- Sources/ptMain.cpp.orig 2016-03-22 03:34:55 UTC ++++ Sources/ptMain.cpp +@@ -5325,7 +5325,7 @@ void ReadSidecar(const QString& Sidecar) + return; + } + +- Exiv2::Image::AutoPtr hImage = Exiv2::ImageFactory::open(Sidecar.toLocal8Bit().data()); ++ Exiv2::Image::UniquePtr hImage = Exiv2::ImageFactory::open(Sidecar.toLocal8Bit().data()); + + if (!hImage.get()) { + return;