git: bf666655aa6c - main - deskutils/pinot: Update to 1.22

From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Sun, 16 Feb 2025 11:00:13 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bf666655aa6c4424d19f718bda521ec544d7e9c0

commit bf666655aa6c4424d19f718bda521ec544d7e9c0
Author:     Charlie Li <vishwin@freebsd.org>
AuthorDate: 2025-02-16 10:57:32 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-02-16 11:00:01 +0000

    deskutils/pinot: Update to 1.22
    
    PR:             283998
    Approved by:    thierry (maintainer)
---
 deskutils/pinot/Makefile                             |  6 ++----
 deskutils/pinot/distinfo                             |  6 +++---
 .../files/patch-Tokenize_filters_Exiv2ImageFilter.cc | 20 --------------------
 deskutils/pinot/pkg-plist                            |  1 +
 4 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index 67842c964983..9c77b0882da8 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	pinot
-PORTVERSION=	1.21
-PORTREVISION=	16
+PORTVERSION=	1.22
 CATEGORIES=	deskutils
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -16,7 +15,7 @@ LIB_DEPENDS=	libxapian.so:databases/xapian-core		\
 		libfreetype.so:print/freetype2			\
 		libexttextcat-2.0.so:textproc/libexttextcat	\
 		libdbus-1.so:devel/dbus				\
-		libxml++-2.6.so:textproc/libxml++26		\
+		libxml++-3.0.so:textproc/libxml++30		\
 		libboost_thread.so:devel/boost-libs		\
 		libharfbuzz.so:print/harfbuzz			\
 		libnotify.so:devel/libnotify			\
@@ -47,7 +46,6 @@ USE_LDCONFIG=	${PREFIX}/lib/pinot/backends ${PREFIX}/lib/pinot/filters
 SHEBANG_FILES=	scripts/bash/*.sh
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-http=curl --with-ssl=${OPENSSLBASE} --enable-libarchive	\
 		--enable-mempool=no --enable-libnotify
 CONFIGURE_ENV=	MKDIR_P="${MKDIR}" TEXTCAT_LIBS="-lexttextcat-2.0"
diff --git a/deskutils/pinot/distinfo b/deskutils/pinot/distinfo
index f2334992f789..cf71e0a6c6c9 100644
--- a/deskutils/pinot/distinfo
+++ b/deskutils/pinot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1645649625
-SHA256 (FabriceColin-pinot-1.21_GH0.tar.gz) = be1a3abd7e5781a976c180dd38588c342e8dea02ee6db5df7266c52bf3f11e07
-SIZE (FabriceColin-pinot-1.21_GH0.tar.gz) = 739268
+TIMESTAMP = 1739702745
+SHA256 (FabriceColin-pinot-1.22_GH0.tar.gz) = 2aa1f8fef692f635a1199688f27832316a9bac83bc40da0152691b1a43dbe357
+SIZE (FabriceColin-pinot-1.22_GH0.tar.gz) = 742934
diff --git a/deskutils/pinot/files/patch-Tokenize_filters_Exiv2ImageFilter.cc b/deskutils/pinot/files/patch-Tokenize_filters_Exiv2ImageFilter.cc
deleted file mode 100644
index 6feb36bc6a12..000000000000
--- a/deskutils/pinot/files/patch-Tokenize_filters_Exiv2ImageFilter.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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;
diff --git a/deskutils/pinot/pkg-plist b/deskutils/pinot/pkg-plist
index 235fed4ae719..c84103118d73 100644
--- a/deskutils/pinot/pkg-plist
+++ b/deskutils/pinot/pkg-plist
@@ -81,6 +81,7 @@ lib/pinot/backends/libxapianbackend.so
 lib/pinot/backends/libxapianbackend.so.1
 lib/pinot/backends/libxapianbackend.so.1.0.0
 lib/pinot/filters/libarchivefilter.so
+%%CHMLIB%%lib/pinot/filters/libchmfilter.so
 lib/pinot/filters/libexiv2imagefilter.so
 lib/pinot/filters/libexternalfilter.so
 lib/pinot/filters/libmboxfilter.so