diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile index 0f3ffd1e9042..50a1cf4c2911 100644 --- a/deskutils/recoll/Makefile +++ b/deskutils/recoll/Makefile @@ -1,101 +1,99 @@ # Created by: J.F. Dockes PORTNAME= recoll -PORTVERSION= 1.27.3 -PORTREVISION= 17 +PORTVERSION= 1.31.2 CATEGORIES= deskutils MASTER_SITES= https://www.lesbonscomptes.com/recoll/ MAINTAINER= jjuanino@gmail.com COMMENT= Personal full text search package, based on Xapian LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} LIB_DEPENDS= libxapian.so:databases/xapian-core RUN_DEPENDS= unrar:archivers/unrar \ antiword:textproc/antiword \ catdoc:textproc/catdoc \ wpd2html:textproc/libwpd010 \ unrtf:textproc/unrtf USES= bison compiler:c++11-lang gmake gnome iconv libtool localbase \ pkgconfig python:3.5+ shebangfix USE_GNOME= libxslt USE_LDCONFIG= yes USE_PYTHON= py3kplist SHEBANG_FILES= filters/*.py filters/rcl7z filters/rclaudio \ filters/rclchm filters/rcldia filters/rclepub \ filters/rclepub1 filters/rclics filters/rclimg \ - filters/rclinfo filters/rclkar filters/rclpython \ + filters/rclinfo filters/rclkar \ filters/rclrar filters/rcltar filters/rclwar \ filters/rclzip desktop/hotrecoll.py GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-recollq --enable-xadump MAKE_ENV= PYTHON_CMD=${PYTHON_CMD} PYDISTUTILS_PKGNAME= Recoll PYDISTUTILS_PKGVERSION= 1.0 PLIST_SUB= VERSION="${PORTVERSION}" \ PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}" OPTIONS_DEFINE= ASPELL CHM DJVU LATEX IMAGE PDF PS \ SOUND QT5 X11MON OPTIONS_DEFAULT= ASPELL CHM IMAGE PDF PS QT5 SOUND OPTIONS_SUB= yes ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell ASPELL_CONFIGURE_WITH= aspell CHM_DESC= Python bindings for Microsoft ITSS/CHM format CHM_LIB_DEPENDS= libchm.so:misc/chmlib CHM_CONFIGURE_OFF= --disable-python-chm DJVU_RUN_DEPENDS= djvutxt:graphics/djvulibre IMAGE_DESC= Store personal tags or textual descriptions in images IMAGE_RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool LATEX_USE= tex=dvipsk:run,latex:run PDF_RUN_DEPENDS= pdftotext:graphics/poppler-utils PS_RUN_DEPENDS= pstotext:print/pstotext USE_QT= core gui printsupport widgets xml \ buildtools_build qmake_build QT5_USES= qt:5 gl QT5_USE= GL=gl QT5_CONFIGURE_ENABLE= qtgui QT5_CONFIGURE_ON= --disable-webkit QT5_CONFIGURE_ENV= QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \ QTDIR="${PREFIX}" SOUND_RUN_DEPENDS= mutagen-pony-${PYTHON_VER}:audio/py-mutagen@${PY_FLAVOR} X11MON_DESC= X11 session monitoring support X11MON_USES= fam xorg X11MON_USE= xorg=ice,sm,x11 X11MON_CONFIGURE_ENABLE= x11mon X11MON_CONFIGURE_WITH= fam -X11MON_BROKEN= does not build: index/rclmonrcv.cpp:(.text+0x1f13): undefined reference to `FAMOpen2' post-patch: @${REINPLACE_CMD} -e \ 's|@QMAKE@|${TRUE}|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ 's|/usr/local/lib|${LOCALBASE}/lib|' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e \ - 's|python setup.py|${PYTHON_CMD} setup.py|; s|sudo||' \ - ${WRKSRC}/python/recoll/Makefile @${REINPLACE_CMD} -e \ 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \ ${WRKSRC}/Makefile.in pre-build-QT5-on: @cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} ${QMAKE} \ ${QMAKE_ARGS} recoll.pro post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/*.so \ - ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recollchm/*.so \ - ${STAGEDIR}${PREFIX}/lib/recoll/*.so \ - ${STAGEDIR}${PREFIX}/bin/recoll + ${STAGEDIR}${PREFIX}/lib/recoll/*.so +# Remove systemd unit files (useless on FreeBSD) + @${RM} ${STAGEDIR}${DATADIR}/examples/recollindex*.service + +post-install-CHM-on: + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recollchm/*.so .include diff --git a/deskutils/recoll/distinfo b/deskutils/recoll/distinfo index 3ba03e177c9f..648f9be260cb 100644 --- a/deskutils/recoll/distinfo +++ b/deskutils/recoll/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1593261648 -SHA256 (recoll-1.27.3.tar.gz) = 3f62b792f57895a20dd334eb841d6fbe851e687dab43ea89cb3fbc0ccebcddac -SIZE (recoll-1.27.3.tar.gz) = 3172341 +TIMESTAMP = 1633945035 +SHA256 (recoll-1.31.2.tar.gz) = d3edb28fa76f2bb15e6555f82ef74e9151a2271535d3fdeb5f34012b1c2c3c54 +SIZE (recoll-1.31.2.tar.gz) = 3689921 diff --git a/deskutils/recoll/files/patch-Makefile.in b/deskutils/recoll/files/patch-Makefile.in index 89f52f8ac242..0be98671cc8b 100644 --- a/deskutils/recoll/files/patch-Makefile.in +++ b/deskutils/recoll/files/patch-Makefile.in @@ -1,40 +1,49 @@ ---- Makefile.in.orig 2019-05-22 12:46:15 UTC +--- Makefile.in.orig 2021-10-11 09:30:17 UTC +++ Makefile.in -@@ -2397,16 +2397,12 @@ PicStatic: $(librecoll_la_OBJECTS) +@@ -884,7 +884,7 @@ recollindex_SOURCES = \ + index/webqueue.cpp \ + index/webqueue.h + +-recollindex_LDADD = librecoll.la ++recollindex_LDADD = librecoll.la $(LIBFAM) + recollq_SOURCES = query/recollqmain.cpp + recollq_LDADD = librecoll.la + xadump_SOURCES = query/xadump.cpp +@@ -2795,16 +2795,12 @@ PicStatic: $(librecoll_la_OBJECTS) @MAKEPYTHON_TRUE@clean-local:: recollpython-clean @MAKEPYTHON_TRUE@recollpython: librecoll.la @MAKEPYTHON_TRUE@ (cd python/recoll; set -x; \ -@MAKEPYTHON_TRUE@ for v in 2 3;do test -n "`which python$${v}`" && \ -@MAKEPYTHON_TRUE@ libdir=$(libdir) python$${v} setup.py build; \ -@MAKEPYTHON_TRUE@ done \ +@MAKEPYTHON_TRUE@ libdir=$(libdir) %%PYTHON_CMD%% setup.py build; \ @MAKEPYTHON_TRUE@ ) @MAKEPYTHON_TRUE@recollpython-install: @MAKEPYTHON_TRUE@ (cd python/recoll; set -x; \ -@MAKEPYTHON_TRUE@ for v in 2 3;do test -n "`which python$${v}`" && \ -@MAKEPYTHON_TRUE@ python$${v} setup.py install \ +@MAKEPYTHON_TRUE@ %%PYTHON_CMD%% setup.py install \ @MAKEPYTHON_TRUE@ --prefix=${prefix} --root=$${DESTDIR:-/} $(OPTSFORPYTHON); \ -@MAKEPYTHON_TRUE@ done; \ @MAKEPYTHON_TRUE@ ) @MAKEPYTHON_TRUE@recollpython-clean: @MAKEPYTHON_TRUE@ rm -f python/recoll/*.pyc -@@ -2422,16 +2418,12 @@ PicStatic: $(librecoll_la_OBJECTS) +@@ -2820,16 +2816,12 @@ PicStatic: $(librecoll_la_OBJECTS) @MAKEPYTHONCHM_TRUE@clean-local:: rclpychm-clean @MAKEPYTHONCHM_TRUE@rclpychm: @MAKEPYTHONCHM_TRUE@ (cd python/pychm; set -x; \ -@MAKEPYTHONCHM_TRUE@ for v in 2 3;do \ -@MAKEPYTHONCHM_TRUE@ test -n "`which python$${v}`" && python$${v} setup.py build;\ -@MAKEPYTHONCHM_TRUE@ done \ +@MAKEPYTHONCHM_TRUE@ %%PYTHON_CMD%% setup.py build;\ @MAKEPYTHONCHM_TRUE@ ) @MAKEPYTHONCHM_TRUE@rclpychm-install: @MAKEPYTHONCHM_TRUE@ (cd python/pychm; set -x; \ -@MAKEPYTHONCHM_TRUE@ for v in 2 3;do test -n "`which python$${v}`" && \ -@MAKEPYTHONCHM_TRUE@ python$${v} setup.py install \ +@MAKEPYTHONCHM_TRUE@ %%PYTHON_CMD%% setup.py install \ @MAKEPYTHONCHM_TRUE@ --prefix=${prefix} --root=$${DESTDIR:-/} $(OPTSFORPYTHON); \ -@MAKEPYTHONCHM_TRUE@ done \ @MAKEPYTHONCHM_TRUE@ ) @MAKEPYTHONCHM_TRUE@rclpychm-clean: @MAKEPYTHONCHM_TRUE@ rm -rf python/pychm/build diff --git a/deskutils/recoll/files/patch-utils_fileudi.cpp b/deskutils/recoll/files/patch-utils_fileudi.cpp deleted file mode 100644 index 2dca3d529210..000000000000 --- a/deskutils/recoll/files/patch-utils_fileudi.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- utils/fileudi.cpp.orig 2014-07-07 16:10:11 UTC -+++ utils/fileudi.cpp -@@ -18,6 +18,7 @@ - - #include - #include -+#include - - #include "fileudi.h" - #include "md5.h" diff --git a/deskutils/recoll/pkg-plist b/deskutils/recoll/pkg-plist index 7abdf8bd9399..52b52cbff6e2 100644 --- a/deskutils/recoll/pkg-plist +++ b/deskutils/recoll/pkg-plist @@ -1,174 +1,182 @@ %%QT5%%bin/recoll bin/recollindex bin/recollq bin/xadump -%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%/PKG-INFO -%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%/SOURCES.txt -%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%/dependency_links.txt -%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%/top_level.txt +%%PYTHON_SITELIBDIR%%/Recoll-%%VERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO +%%PYTHON_SITELIBDIR%%/Recoll-%%VERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt +%%PYTHON_SITELIBDIR%%/Recoll-%%VERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt +%%PYTHON_SITELIBDIR%%/Recoll-%%VERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt +%%PYTHON_SITELIBDIR%%/recoll/_recoll%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/recoll/__init__.py %%PYTHON_SITELIBDIR%%/recoll/__init__.pyc +%%PYTHON_SITELIBDIR%%/recoll/__pycache__/rclextract.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/recoll/__pycache__/recoll.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/recoll/conftree.py %%PYTHON_SITELIBDIR%%/recoll/conftree.pyc %%PYTHON_SITELIBDIR%%/recoll/rclconfig.py %%PYTHON_SITELIBDIR%%/recoll/rclconfig.pyc -%%PYTHON_SITELIBDIR%%/recoll/rclextract%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/recoll/recoll%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/recoll/rclextract.py +%%PYTHON_SITELIBDIR%%/recoll/recoll.py %%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__init__.py %%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc %%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__pycache__/chm.cpython-%%PYTHON_SUFFIX%%.pyc %%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__pycache__/chmlib.cpython-%%PYTHON_SUFFIX%%.pyc %%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/_chmlib%%PYTHON_EXT_SUFFIX%%.so %%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/chm.py %%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/chmlib.py %%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/extra%%PYTHON_EXT_SUFFIX%%.so %%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/PKG-INFO %%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/SOURCES.txt %%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/dependency_links.txt %%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/top_level.txt lib/recoll/librecoll-%%VERSION%%.so lib/recoll/librecoll.so %%QT5%%man/man1/recoll.1.gz man/man1/recollindex.1.gz man/man1/recollq.1.gz man/man1/xadump.1.gz man/man5/recoll.conf.5.gz %%QT5%%share/applications/recoll-searchgui.desktop %%QT5%%share/icons/hicolor/48x48/apps/recoll.png %%QT5%%share/metainfo/recoll.appdata.xml %%QT5%%share/pixmaps/recoll.png %%DATADIR%%/doc/docbook-xsl.css %%DATADIR%%/doc/usermanual.html %%DATADIR%%/examples/fields -%%DATADIR%%/examples/fragbuts.xml +%%DATADIR%%/examples/fragment-buttons.xml %%DATADIR%%/examples/mimeconf %%DATADIR%%/examples/mimemap %%DATADIR%%/examples/mimeview %%DATADIR%%/examples/rclmon.sh +%%DATADIR%%/examples/recoll-dark.css +%%DATADIR%%/examples/recoll-dark.qss %%DATADIR%%/examples/recoll.conf %%DATADIR%%/examples/recoll.qss %%DATADIR%%/examples/recollindex.desktop %%DATADIR%%/filters/abiword.xsl %%DATADIR%%/filters/cmdtalk.py %%DATADIR%%/filters/conftree.py %%DATADIR%%/filters/fb2.xsl %%DATADIR%%/filters/gnumeric.xsl %%DATADIR%%/filters/hotrecoll.py %%DATADIR%%/filters/kosplitter.py %%DATADIR%%/filters/msodump.zip %%DATADIR%%/filters/okular-note.xsl %%DATADIR%%/filters/opendoc-body.xsl %%DATADIR%%/filters/opendoc-flat.xsl %%DATADIR%%/filters/opendoc-meta.xsl %%DATADIR%%/filters/openxml-meta.xsl %%DATADIR%%/filters/openxml-word-body.xsl %%DATADIR%%/filters/openxml-xls-body.xsl %%DATADIR%%/filters/ppt-dump.py %%DATADIR%%/filters/rcl7z %%DATADIR%%/filters/rclaptosidman %%DATADIR%%/filters/rclaudio %%DATADIR%%/filters/rclbasehandler.py %%DATADIR%%/filters/rclbibtex.sh %%DATADIR%%/filters/rclcheckneedretry.sh %%DATADIR%%/filters/rclchm %%DATADIR%%/filters/rclconfig.py %%DATADIR%%/filters/rcldia %%DATADIR%%/filters/rcldjvu.py %%DATADIR%%/filters/rcldoc.py %%DATADIR%%/filters/rcldvi %%DATADIR%%/filters/rclepub %%DATADIR%%/filters/rclepub1 %%DATADIR%%/filters/rclexec1.py %%DATADIR%%/filters/rclexecm.py %%DATADIR%%/filters/rclfb2.py %%DATADIR%%/filters/rclgaim %%DATADIR%%/filters/rclgenxslt.py %%DATADIR%%/filters/rclhwp.py %%DATADIR%%/filters/rclics %%DATADIR%%/filters/rclimg %%DATADIR%%/filters/rclimg.py %%DATADIR%%/filters/rclinfo +%%DATADIR%%/filters/rclipynb.py %%DATADIR%%/filters/rclkar %%DATADIR%%/filters/rclkwd %%DATADIR%%/filters/rcllatinclass.py %%DATADIR%%/filters/rcllatinstops.zip %%DATADIR%%/filters/rcllyx %%DATADIR%%/filters/rclman %%DATADIR%%/filters/rclmidi.py %%DATADIR%%/filters/rclocr.py %%DATADIR%%/filters/rclocrabbyy.py %%DATADIR%%/filters/rclocrcache.py %%DATADIR%%/filters/rclocrtesseract.py %%DATADIR%%/filters/rclopxml.py +%%DATADIR%%/filters/rclorgmode.py %%DATADIR%%/filters/rclpdf.py %%DATADIR%%/filters/rclppt.py %%DATADIR%%/filters/rclps %%DATADIR%%/filters/rclpst.py %%DATADIR%%/filters/rclpurple -%%DATADIR%%/filters/rclpython +%%DATADIR%%/filters/rclpython.py %%DATADIR%%/filters/rclrar %%DATADIR%%/filters/rclrtf.py %%DATADIR%%/filters/rclscribus %%DATADIR%%/filters/rclshowinfo %%DATADIR%%/filters/rcltar %%DATADIR%%/filters/rcltex %%DATADIR%%/filters/rcltext.py %%DATADIR%%/filters/rcluncomp %%DATADIR%%/filters/rcluncomp.py %%DATADIR%%/filters/rclwar %%DATADIR%%/filters/rclxls.py %%DATADIR%%/filters/rclxml.py %%DATADIR%%/filters/rclxmp.py %%DATADIR%%/filters/rclxslt.py %%DATADIR%%/filters/rclzip %%DATADIR%%/filters/recoll-we-move-files.py %%DATADIR%%/filters/recollepub.zip %%DATADIR%%/filters/svg.xsl %%DATADIR%%/filters/xls-dump.py %%DATADIR%%/filters/xlsxmltocsv.py %%DATADIR%%/filters/xml.xsl %%QT5%%%%DATADIR%%/images/aptosid-book.png %%QT5%%%%DATADIR%%/images/aptosid-manual.png %%QT5%%%%DATADIR%%/images/archive.png %%QT5%%%%DATADIR%%/images/book.png %%QT5%%%%DATADIR%%/images/bookchap.png %%QT5%%%%DATADIR%%/images/document.png %%QT5%%%%DATADIR%%/images/drawing.png %%QT5%%%%DATADIR%%/images/emblem-symbolic-link.png %%QT5%%%%DATADIR%%/images/folder.png %%QT5%%%%DATADIR%%/images/html.png %%QT5%%%%DATADIR%%/images/image.png %%QT5%%%%DATADIR%%/images/message.png %%QT5%%%%DATADIR%%/images/mozilla_doc.png %%QT5%%%%DATADIR%%/images/pdf.png %%QT5%%%%DATADIR%%/images/pidgin.png %%QT5%%%%DATADIR%%/images/postscript.png %%QT5%%%%DATADIR%%/images/presentation.png %%QT5%%%%DATADIR%%/images/sidux-book.png %%QT5%%%%DATADIR%%/images/soffice.png %%QT5%%%%DATADIR%%/images/source.png %%QT5%%%%DATADIR%%/images/sownd.png %%QT5%%%%DATADIR%%/images/spreadsheet.png %%QT5%%%%DATADIR%%/images/text-x-python.png %%QT5%%%%DATADIR%%/images/txt.png %%QT5%%%%DATADIR%%/images/video.png %%QT5%%%%DATADIR%%/images/wordprocessing.png %%QT5%%%%DATADIR%%/translations/recoll_cs.qm %%QT5%%%%DATADIR%%/translations/recoll_da.qm %%QT5%%%%DATADIR%%/translations/recoll_de.qm %%QT5%%%%DATADIR%%/translations/recoll_el.qm %%QT5%%%%DATADIR%%/translations/recoll_es.qm %%QT5%%%%DATADIR%%/translations/recoll_fr.qm %%QT5%%%%DATADIR%%/translations/recoll_hu.qm %%QT5%%%%DATADIR%%/translations/recoll_it.qm +%%QT5%%%%DATADIR%%/translations/recoll_ja.qm %%QT5%%%%DATADIR%%/translations/recoll_ko.qm -%%QT5%%%%DATADIR%%/translations/recoll_kr.qm %%QT5%%%%DATADIR%%/translations/recoll_lt.qm %%QT5%%%%DATADIR%%/translations/recoll_nl.qm %%QT5%%%%DATADIR%%/translations/recoll_pl.qm %%QT5%%%%DATADIR%%/translations/recoll_ru.qm +%%QT5%%%%DATADIR%%/translations/recoll_sv.qm %%QT5%%%%DATADIR%%/translations/recoll_tr.qm %%QT5%%%%DATADIR%%/translations/recoll_uk.qm %%QT5%%%%DATADIR%%/translations/recoll_xx.qm %%QT5%%%%DATADIR%%/translations/recoll_zh.qm %%QT5%%%%DATADIR%%/translations/recoll_zh_CN.qm