From nobody Sun Jul 09 22:09:45 2023 X-Original-To: dev-commits-ports-all@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 4QzhBf1cJcz4mqx3; Sun, 9 Jul 2023 22:09:46 +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 4QzhBd5hMfz3CXP; Sun, 9 Jul 2023 22:09:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940585; 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=y2/uNaoJXamNE6oN1nCtvQ036n1b3gKPs8LFg75KA0Y=; b=VwEEOhGarVUyYH7nCA/h3Wh0/Oekcdg0BdEjRLcP88izJdPntGPEQBQ/YuBkyJaV7w/FV+ P2Mz8WjKtXqd3m3PcZhu1gilRccAT20iH68B4Nh/Vw3SaaiVZfMKMHFaE6kzy1e3bJlZJ3 Ezxp8wJPnBGN3kYBktpuWr/Ai4G1TitcNNs3P2umsw0NkWWJ8fjcItYj7Tcp/mlQrK/ESJ Ratq/kHRsfjLgfRmFHleZ7WcsdPCfq7W+GHzgU0R8Cy6aq2LKqOKcBwbqSii8dfvs4EAm0 fdPxPvbz4IOIsC1U3J+nAJVNiDR4xPu9zw6gfek6vfO97GcEpDyyysLGHePlkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940585; 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=y2/uNaoJXamNE6oN1nCtvQ036n1b3gKPs8LFg75KA0Y=; b=shWm/+Ca5JkTKsnFZ0BeZTiwbHrsS3vwifql6Jkb+uHISJnGuch4I0wEk4Lvcgd2pmf/1q cEWc9oyI8iGmVF8paNH4LeFeIylrdd28C9amy+eVVbuRmcyHVY+Jr20jZow5LBkRyx+SPO MTXbg0FL7JU/5a50XYduzIvHsaWPtIneu2sx70QEIT0bChuitnrH7v84nEjHrl/Hc7lZQp c82SIWXDsmuc70GDOrr4jmgSA0aCxaSXEqXGO1Eu/bYA9vBac9G0125/YAas5BedN+s2W6 9yM4EFtE7ZrGyauaH6nWF4KzG6W4o9e75o+F0U/B4/nxsqYTKows3AMlIJMDlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688940585; a=rsa-sha256; cv=none; b=S3a7EzuazSNthIfR2b85feK+daYtRd7qF//mCyH80o9Al9sKk0+TmFe9KYu7cV7FqmImMJ P99fQZ7R4xWt8ZLbQ+91wwSPEGx+Ku4kHJL40iS+9WZOoSI/HG7KdPxKS076a3+DmjsSFg 7FlGYKJbHwSA+pI2Ohx30XZbdsgqFN8D8xDUr3iJGnON5XcHf0y9xAseQV5sd6c44UoVqB e4k5ndmZFrNw1h1kSgAOlOQP2VneqKZvv8Oos+dF9gJMIn+8vzZGfjW81FE3zJLGaJJgzW MaL4doQwCHWt5S0y/Z2nTU1U2SqbbCr2jvfQ7xJjppSFi+AgH8DI2ER2Qv8sEA== 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 4QzhBd4gzqzKRs; Sun, 9 Jul 2023 22:09:45 +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 369M9jJp034383; Sun, 9 Jul 2023 22:09:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369M9jWi034382; Sun, 9 Jul 2023 22:09:45 GMT (envelope-from git) Date: Sun, 9 Jul 2023 22:09:45 GMT Message-Id: <202307092209.369M9jWi034382@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: 5e7242d99af0 - main - deskutils/pinot: make compatible with exiv2 0.28 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 5e7242d99af0988c1a6d12cac50f75e0ba9d63dc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=5e7242d99af0988c1a6d12cac50f75e0ba9d63dc commit 5e7242d99af0988c1a6d12cac50f75e0ba9d63dc Author: Matthias Andree AuthorDate: 2023-07-02 21:47:18 +0000 Commit: Matthias Andree CommitDate: 2023-07-09 22:08:11 +0000 deskutils/pinot: make compatible with exiv2 0.28 PR: 272311 --- deskutils/pinot/Makefile | 2 +- .../files/patch-Tokenize_filters_Exiv2ImageFilter.cc | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile index 43e07259ea10..1a67b04c177f 100644 --- a/deskutils/pinot/Makefile +++ b/deskutils/pinot/Makefile @@ -1,6 +1,6 @@ PORTNAME= pinot PORTVERSION= 1.21 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= deskutils MAINTAINER= thierry@FreeBSD.org diff --git a/deskutils/pinot/files/patch-Tokenize_filters_Exiv2ImageFilter.cc b/deskutils/pinot/files/patch-Tokenize_filters_Exiv2ImageFilter.cc new file mode 100644 index 000000000000..6feb36bc6a12 --- /dev/null +++ b/deskutils/pinot/files/patch-Tokenize_filters_Exiv2ImageFilter.cc @@ -0,0 +1,20 @@ +--- Tokenize/filters/Exiv2ImageFilter.cc.orig 2022-02-22 20:31:11 UTC ++++ Tokenize/filters/Exiv2ImageFilter.cc +@@ -236,7 +236,7 @@ bool Exiv2ImageFilter::next_document(void) + + try + { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(m_filePath); ++ Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(m_filePath) }; + if (image.get() == NULL) + { + clog << m_filePath.c_str() << " is not an image" << endl; +@@ -388,7 +388,7 @@ bool Exiv2ImageFilter::next_document(void) + } + } + } +- catch (Exiv2::AnyError &e) ++ catch (Exiv2::Error &e) + { + clog << "Caught exiv2 exception: " << e << endl; + foundData = false;