From nobody Thu Oct 21 18:39:06 2021 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 0E772181634E; Thu, 21 Oct 2021 18:39:07 +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 4HZx8V6xQZz3rgH; Thu, 21 Oct 2021 18:39:06 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C85F12014F; Thu, 21 Oct 2021 18:39:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19LId6ts000163; Thu, 21 Oct 2021 18:39:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19LId6NH000162; Thu, 21 Oct 2021 18:39:06 GMT (envelope-from git) Date: Thu, 21 Oct 2021 18:39:06 GMT Message-Id: <202110211839.19LId6NH000162@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 7bef3594d373 - main - deskutils/pinot: upgrade to v1.20 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bef3594d3731d70ba51200d807a057db871c88d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=7bef3594d3731d70ba51200d807a057db871c88d commit 7bef3594d3731d70ba51200d807a057db871c88d Author: Thierry Thomas AuthorDate: 2021-10-21 18:37:28 +0000 Commit: Thierry Thomas CommitDate: 2021-10-21 18:37:28 +0000 deskutils/pinot: upgrade to v1.20 Release notes at . --- deskutils/pinot/Makefile | 19 ++++++++++--------- deskutils/pinot/distinfo | 6 +++--- deskutils/pinot/pkg-descr | 3 +-- deskutils/pinot/pkg-plist | 21 +++++++++++---------- 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile index 7dfd04b309d2..b566e9a24406 100644 --- a/deskutils/pinot/Makefile +++ b/deskutils/pinot/Makefile @@ -1,7 +1,7 @@ # Created by: Thierry Thomas PORTNAME= pinot -PORTVERSION= 1.10 +PORTVERSION= 1.20 CATEGORIES= deskutils MAINTAINER= thierry@FreeBSD.org @@ -15,10 +15,10 @@ LIB_DEPENDS= libxapian.so:databases/xapian-core \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libexttextcat-2.0.so:textproc/libexttextcat \ - libdbus-glib-1.so:devel/dbus-glib \ libdbus-1.so:devel/dbus \ libxml++-2.6.so:textproc/libxml++26 \ libboost_thread.so:devel/boost-libs \ + libharfbuzz.so:print/harfbuzz \ libnotify.so:devel/libnotify \ libexif.so:graphics/libexif \ libexiv2.so:graphics/exiv2 \ @@ -37,11 +37,12 @@ RUN_DEPENDS= update-mime-database:misc/shared-mime-info \ USE_GITHUB= yes GH_ACCOUNT= FabriceColin -USES= compiler:c++11-lang autoreconf gettext gnome libarchive \ +USES= compiler:c++11-lang autoreconf gettext gnome libarchive \ libtool pkgconfig python shebangfix sqlite:3 ssl xorg USE_CXXSTD= c++11 USE_XORG= pixman -USE_GNOME= atkmm cairo cairomm glibmm gtk20 gtkmm24 libsigc++20 libxml2 pangomm +USE_GNOME= atkmm cairo cairomm gdkpixbuf2 glibmm gtk30 gtkmm30 \ + libsigc++20 libxml2 pangomm USE_LDCONFIG= ${PREFIX}/lib/pinot/backends ${PREFIX}/lib/pinot/filters SHEBANG_FILES= scripts/bash/*.sh @@ -57,13 +58,17 @@ OPTIONS_SUB= yes DEBUG_CONFIGURE_ON= --enable-debug=yes +CHMLIB_DESC= Support of Microsoft ITSS/CHM files CHMLIB_CONFIGURE_ON= --enable-chmlib=yes CHMLIB_CONFIGURE_OFF= --disable-chmlib CHMLIB_LIB_DEPENDS= libchm.so:misc/chmlib +INSTALL_TARGET= install-strip DOCS= AUTHORS ChangeLog ChangeLog-dijon INSTALL NEWS README TODO -LM2FIX= textcat_conf.txt textcat3_conf.txt textcat31_conf.txt textcat32_conf.txt +LM2FIX= Core/pinot-index.cpp Core/pinot-index.1 Makefile.am \ + textcat31_conf.txt aclocal.m4 Makefile.in \ + textcat3_conf.txt textcat_conf.txt textcat32_conf.txt SHR2FIX= Core/pinot-search.1 UL2FIX= Utils/xdgmime/xdgmime.c @@ -79,10 +84,6 @@ post-patch: pre-configure: ${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' \ ${LM2FIX:S|^|${WRKSRC}/|} - ${REINPLACE_CMD} -e 's|libtextcat/|libtextcat/LM/|' \ - ${WRKSRC}/textcat_conf.txt - ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ - ${UL2FIX:S|^|${WRKSRC}/|} ${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \ ${SHR2FIX:S|^|${WRKSRC}/|} diff --git a/deskutils/pinot/distinfo b/deskutils/pinot/distinfo index 1b3cccf64372..a6221027b75b 100644 --- a/deskutils/pinot/distinfo +++ b/deskutils/pinot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1581456790 -SHA256 (FabriceColin-pinot-1.10_GH0.tar.gz) = 3eb273b1b9ea2b146add790478acf58924d11650e21ca860bd5c79a797585f77 -SIZE (FabriceColin-pinot-1.10_GH0.tar.gz) = 808404 +TIMESTAMP = 1634840445 +SHA256 (FabriceColin-pinot-1.20_GH0.tar.gz) = 0efb5223fec8f30de4606e50011897d7221fe184819e263fe6582101e5ad8fa5 +SIZE (FabriceColin-pinot-1.20_GH0.tar.gz) = 1044201 diff --git a/deskutils/pinot/pkg-descr b/deskutils/pinot/pkg-descr index 7059a8a5fa12..f6b7ea1fc84e 100644 --- a/deskutils/pinot/pkg-descr +++ b/deskutils/pinot/pkg-descr @@ -15,9 +15,8 @@ Features: - only crawl and index the directories you choose. - D-Bus interface for easy integration with other applications, eg Deskbar Applet. -- no dependency on GNOME or KDE. - support for common file types. - search your desktop and the Web. - query remote indexes. -WWW: http://code.google.com/p/pinot-search/ +WWW: https://github.com/FabriceColin/pinot/ diff --git a/deskutils/pinot/pkg-plist b/deskutils/pinot/pkg-plist index e2b108dcb202..30c82e1848c1 100644 --- a/deskutils/pinot/pkg-plist +++ b/deskutils/pinot/pkg-plist @@ -16,6 +16,7 @@ include/pinot/CommandLine.h include/pinot/CrawlHistory.h include/pinot/CurlDownloader.h include/pinot/DBusIndex.h +include/pinot/DBusServerThreads.h include/pinot/DaemonState.h include/pinot/Document.h include/pinot/DocumentInfo.h @@ -41,6 +42,9 @@ include/pinot/NLS.h include/pinot/NeonDownloader.h include/pinot/OnDiskHandler.h include/pinot/OpenSearchParser.h +include/pinot/PinotDBus_common.h +include/pinot/PinotDBus_proxy.h +include/pinot/PinotDBus_stub.h include/pinot/PinotSettings.h include/pinot/PluginParsers.h include/pinot/PluginWebEngine.h @@ -51,6 +55,8 @@ include/pinot/SQLDB.h include/pinot/SQLiteBase.h include/pinot/SearchEngineInterface.h include/pinot/SearchPluginProperties.h +include/pinot/SearchProvider_common.h +include/pinot/SearchProvider_stub.h include/pinot/ServerThreads.h include/pinot/SherlockParser.h include/pinot/StringManip.h @@ -99,7 +105,7 @@ man/man1/pinot-search.1.gz man/man1/pinot.1.gz share/applications/pinot-prefs.desktop share/applications/pinot.desktop -share/dbus-1/services/de.berlios.Pinot.service +share/dbus-1/services/com.github.fabricecolin.Pinot.service %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/ChangeLog-dijon @@ -107,6 +113,7 @@ share/dbus-1/services/de.berlios.Pinot.service %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO +share/gnome-shell/search-providers/com.github.fabricecolin.Pinot.search-provider.ini share/icons/hicolor/16x16/apps/pinot.png share/icons/hicolor/22x22/apps/pinot.png share/icons/hicolor/24x24/apps/pinot.png @@ -127,20 +134,14 @@ share/locale/sv/LC_MESSAGES/pinot.mo share/locale/zh_CN/LC_MESSAGES/pinot.mo share/locale/zh_TW/LC_MESSAGES/pinot.mo %%DATADIR%%/engines/AmazonAPI.src -%%DATADIR%%/engines/Bing.src -%%DATADIR%%/engines/Clusty.src -%%DATADIR%%/engines/Freecode.src -%%DATADIR%%/engines/Google.src -%%DATADIR%%/engines/KodersDescription.xml +%%DATADIR%%/engines/Arxiv.src %%DATADIR%%/engines/OmegaDescription.xml -%%DATADIR%%/engines/Topix.src %%DATADIR%%/engines/UNData.src %%DATADIR%%/engines/Wikipedia.src -%%DATADIR%%/metase-gtk2.glade -%%DATADIR%%/metase-gtk2.gladep +%%DATADIR%%/extract-gtk-builder-translations.sh +%%DATADIR%%/metase-gtk3.gtkbuilder %%DATADIR%%/pinot-cd.sh %%DATADIR%%/pinot-check-file.sh %%DATADIR%%/pinot-dbus-daemon.xml %%DATADIR%%/pinot-enum-index.sh %%DATADIR%%/stopwords/.empty_file -%%DATADIR%%/xapian-powered.png