Attachment #229836 for bug #260162

View | Details | Raw Unified | Return to bug 260162
Collapse All | Expand All




# Created by: J.F. Dockes <jean-francois.dockes@wanadoo.fr>

PORTNAME=	recoll
PORTVERSION=	1.31.4
CATEGORIES=	deskutils
MASTER_SITES=	https://www.lesbonscomptes.com/recoll/



BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
LIB_DEPENDS=	libxapian.so:databases/xapian-core
RUN_DEPENDS=	antiword:textproc/antiword \
		antiword:textproc/antiword \
		catdoc:textproc/catdoc \
		unrar:archivers/unrar \
		unrtf:textproc/unrtf \
		wpd2html:textproc/libwpd010

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
PYDISTUTILS_PKGNAME=	Recoll
PYDISTUTILS_PKGVERSION=	1.0
USE_QT=		core gui printsupport widgets xml buildtools_build qmake_build

SHEBANG_FILES=	desktop/hotrecoll.py filters/*.py filters/rcl7z \
		filters/rclaudio filters/rclchm filters/rcldia filters/rclepub \
		filters/rclepub1 filters/rclics filters/rclimg filters/rclinfo \
		filters/rclkar filters/rclrar filters/rcltar filters/rclwar \
		filters/rclzip

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/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}
BINARY_ALIAS=	python2=${FALSE} python3=${PYTHON_CMD}

PLIST_SUB=	PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}" \
		VERSION="${PORTVERSION}"

OPTIONS_DEFINE=		ASPELL CHM DJVU IMAGE LATEX PDF PS QT5 SOUND X11MON
OPTIONS_DEFAULT=	ASPELL CHM IMAGE PDF PS QT5 SOUND X11MON

OPTIONS_DEFINE=		ASPELL CHM DJVU LATEX IMAGE PDF PS \
			SOUND QT5 X11MON
OPTIONS_DEFAULT=	ASPELL CHM IMAGE PDF PS QT5 SOUND
OPTIONS_SUB=		yes

CHM_DESC=			Python bindings for Microsoft ITSS/CHM format
IMAGE_DESC=			Store personal tags or textual descriptions in images
X11MON_DESC=			X11 session monitoring support
ASPELL_LIB_DEPENDS=		libaspell.so:textproc/aspell
ASPELL_CONFIGURE_WITH=		aspell
CHM_LIB_DEPENDS=		libchm.so:misc/chmlib
CHM_CONFIGURE_OFF=		--disable-python-chm
DJVU_RUN_DEPENDS=		djvutxt:graphics/djvulibre
IMAGE_RUN_DEPENDS=		exiftool:graphics/p5-Image-ExifTool
LATEX_USE=			dvipsk:run \
				latex:run
PDF_RUN_DEPENDS=		pdftotext:graphics/poppler-utils
PS_RUN_DEPENDS=			pstotext:print/pstotext
QT5_USES=			gl qt:5
QT5_USE=			GL=gl
QT5_CONFIGURE_ON=		--disable-webkit
QT5_CONFIGURE_ENABLE=		qtgui
QT5_CONFIGURE_ENV=		QMAKE="${QMAKE}" \
				QMAKESPEC="${QMAKESPEC}" \
				QTDIR="${PREFIX}"
SOUND_RUN_DEPENDS=		mutagen-pony-${PYTHON_VER}:audio/py-mutagen@${PY_FLAVOR}
X11MON_USES=			fam xorg
X11MON_USE=			XORG=ice,sm,x11
X11MON_CONFIGURE_ENABLE=	x11mon
X11MON_CONFIGURE_WITH=		fam

post-patch:
	@${REINPLACE_CMD} -e 's|@QMAKE@|${TRUE}|' \
		's|@QMAKE@|${TRUE}|' \
		${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e 's|/usr/local/lib|${LOCALBASE}/lib|' \
		's|/usr/local/lib|${LOCALBASE}/lib|' \
		${WRKSRC}/configure
	@${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 \

Lines 1-3 Link Here

(-)b/deskutils/recoll/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1633945035	1	TIMESTAMP = 1638053561
2	SHA256 (recoll-1.31.2.tar.gz) = d3edb28fa76f2bb15e6555f82ef74e9151a2271535d3fdeb5f34012b1c2c3c54	2	SHA256 (recoll-1.31.4.tar.gz) = 6825f0ef2e4135e79c0a7cbbd1ab48be46d1caf9617f5b919ebffa85a1310156
3	SIZE (recoll-1.31.2.tar.gz) = 3689921	3	SIZE (recoll-1.31.4.tar.gz) = 3696726




--- Makefile.in.orig	2021-12-01 09:04:57 UTC
+++ Makefile.in
@@ -884,7 +884,7 @@ recollindex_SOURCES = \
     index/webqueue.cpp \

 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
@@ -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

Lines 1-4 Link Here

(-)b/deskutils/recoll/files/patch-utils_fstreewalk.cpp (-2 / +2 lines)
1	--- utils/fstreewalk.cpp.orig 2020-08-30 18:31:25 UTC	1	--- utils/fstreewalk.cpp.orig 2021-08-03 07:29:21 UTC
2	+++ utils/fstreewalk.cpp	2	+++ utils/fstreewalk.cpp
3	@@ -17,6 +17,7 @@	3	@@ -17,6 +17,7 @@
4		4
Lines 6-10 Link Here
6		6
7	+#include <sys/types.h>	7	+#include <sys/types.h>
8	#include <stdio.h>	8	#include <stdio.h>
9	#include <dirent.h>	9
10	#include <errno.h>	10	#include <errno.h>

Lines 7-13 Features: Link Here

(-)b/deskutils/recoll/pkg-descr (-1 / +1 lines)
7	* Easy installation, few dependencies. No database daemon, web server,	7	* Easy installation, few dependencies. No database daemon, web server,
8	desktop environment or exotic language necessary.	8	desktop environment or exotic language necessary.
9	* Will run on most Unix-based systems	9	* Will run on most Unix-based systems
10	* Qt 4 GUI, plus command line.	10	* Qt 5 GUI, plus command line.
11	* Searches most common document types, emails and their attachments.	11	* Searches most common document types, emails and their attachments.
12	Transparently handles decompression (gzip, bzip2).	12	Transparently handles decompression (gzip, bzip2).
13	* Powerful query facilities, with boolean searches, phrases, proximity,	13	* Powerful query facilities, with boolean searches, phrases, proximity,

Return to bug 260162

Lines 1-7 Link Here

(-)b/deskutils/recoll/Makefile (-55 / +49 lines)
1	# Created by: J.F. Dockes <jean-francois.dockes@wanadoo.fr>
2
3	PORTNAME= recoll	1	PORTNAME= recoll
4	PORTVERSION= 1.31.2	2	PORTVERSION= 1.31.4
5	CATEGORIES= deskutils	3	CATEGORIES= deskutils
6	MASTER_SITES= https://www.lesbonscomptes.com/recoll/	4	MASTER_SITES= https://www.lesbonscomptes.com/recoll/
7		5
Lines 13-91 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
13		11
14	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}	12	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
15	LIB_DEPENDS= libxapian.so:databases/xapian-core	13	LIB_DEPENDS= libxapian.so:databases/xapian-core
16	RUN_DEPENDS= unrar:archivers/unrar \	14	RUN_DEPENDS= antiword:textproc/antiword \
17	antiword:textproc/antiword \
18	catdoc:textproc/catdoc \	15	catdoc:textproc/catdoc \
19	wpd2html:textproc/libwpd010 \	16	unrar:archivers/unrar \
20	unrtf:textproc/unrtf	17	unrtf:textproc/unrtf \
		18	wpd2html:textproc/libwpd010
21		19
22	USES= bison compiler:c++11-lang gmake gnome iconv libtool localbase \	20	USES= bison compiler:c++11-lang gmake gnome iconv libtool localbase \
23	pkgconfig python:3.5+ shebangfix	21	pkgconfig python:3.5+ shebangfix
24	USE_GNOME= libxslt	22	USE_GNOME= libxslt
25	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
26	USE_PYTHON= py3kplist	24	USE_PYTHON= py3kplist
		25	PYDISTUTILS_PKGNAME= Recoll
		26	PYDISTUTILS_PKGVERSION= 1.0
		27	USE_QT= core gui printsupport widgets xml buildtools_build qmake_build
		28
		29	SHEBANG_FILES= desktop/hotrecoll.py filters/*.py filters/rcl7z \
		30	filters/rclaudio filters/rclchm filters/rcldia filters/rclepub \
		31	filters/rclepub1 filters/rclics filters/rclimg filters/rclinfo \
		32	filters/rclkar filters/rclrar filters/rcltar filters/rclwar \
		33	filters/rclzip
27		34
28	SHEBANG_FILES= filters/*.py filters/rcl7z filters/rclaudio \
29	filters/rclchm filters/rcldia filters/rclepub \
30	filters/rclepub1 filters/rclics filters/rclimg \
31	filters/rclinfo filters/rclkar \
32	filters/rclrar filters/rcltar filters/rclwar \
33	filters/rclzip desktop/hotrecoll.py
34	GNU_CONFIGURE= yes	35	GNU_CONFIGURE= yes
35	CONFIGURE_ARGS= --enable-recollq --enable-xadump	36	CONFIGURE_ARGS= --enable-recollq \
		37	--enable-xadump
36	MAKE_ENV= PYTHON_CMD=${PYTHON_CMD}	38	MAKE_ENV= PYTHON_CMD=${PYTHON_CMD}
		39	BINARY_ALIAS= python2=${FALSE} python3=${PYTHON_CMD}
37		40
38	PYDISTUTILS_PKGNAME= Recoll	41	PLIST_SUB= PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}" \
39	PYDISTUTILS_PKGVERSION= 1.0	42	VERSION="${PORTVERSION}"
40		43
41	PLIST_SUB= VERSION="${PORTVERSION}" \	44	OPTIONS_DEFINE= ASPELL CHM DJVU IMAGE LATEX PDF PS QT5 SOUND X11MON
42	PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}"	45	OPTIONS_DEFAULT= ASPELL CHM IMAGE PDF PS QT5 SOUND X11MON
43
44	OPTIONS_DEFINE= ASPELL CHM DJVU LATEX IMAGE PDF PS \
45	SOUND QT5 X11MON
46	OPTIONS_DEFAULT= ASPELL CHM IMAGE PDF PS QT5 SOUND
47	OPTIONS_SUB= yes	46	OPTIONS_SUB= yes
48		47
49	ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell	48	CHM_DESC= Python bindings for Microsoft ITSS/CHM format
50	ASPELL_CONFIGURE_WITH= aspell	49	IMAGE_DESC= Store personal tags or textual descriptions in images
51	CHM_DESC= Python bindings for Microsoft ITSS/CHM format	50	X11MON_DESC= X11 session monitoring support
52	CHM_LIB_DEPENDS= libchm.so:misc/chmlib	51	ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell
53	CHM_CONFIGURE_OFF= --disable-python-chm	52	ASPELL_CONFIGURE_WITH= aspell
54	DJVU_RUN_DEPENDS= djvutxt:graphics/djvulibre	53	CHM_LIB_DEPENDS= libchm.so:misc/chmlib
55	IMAGE_DESC= Store personal tags or textual descriptions in images	54	CHM_CONFIGURE_OFF= --disable-python-chm
56	IMAGE_RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool	55	DJVU_RUN_DEPENDS= djvutxt:graphics/djvulibre
57	LATEX_USE= tex=dvipsk:run,latex:run	56	IMAGE_RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool
58	PDF_RUN_DEPENDS= pdftotext:graphics/poppler-utils	57	LATEX_USE= dvipsk:run \
59	PS_RUN_DEPENDS= pstotext:print/pstotext	58	latex:run
60	USE_QT= core gui printsupport widgets xml \	59	PDF_RUN_DEPENDS= pdftotext:graphics/poppler-utils
61	buildtools_build qmake_build	60	PS_RUN_DEPENDS= pstotext:print/pstotext
62	QT5_USES= qt:5 gl	61	QT5_USES= gl qt:5
63	QT5_USE= GL=gl	62	QT5_USE= GL=gl
64	QT5_CONFIGURE_ENABLE= qtgui	63	QT5_CONFIGURE_ON= --disable-webkit
65	QT5_CONFIGURE_ON= --disable-webkit	64	QT5_CONFIGURE_ENABLE= qtgui
66	QT5_CONFIGURE_ENV= QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \	65	QT5_CONFIGURE_ENV= QMAKE="${QMAKE}" \
67	QTDIR="${PREFIX}"	66	QMAKESPEC="${QMAKESPEC}" \
68	SOUND_RUN_DEPENDS= mutagen-pony-${PYTHON_VER}:audio/py-mutagen@${PY_FLAVOR}	67	QTDIR="${PREFIX}"
69	X11MON_DESC= X11 session monitoring support	68	SOUND_RUN_DEPENDS= mutagen-pony-${PYTHON_VER}:audio/py-mutagen@${PY_FLAVOR}
70	X11MON_USES= fam xorg	69	X11MON_USES= fam xorg
71	X11MON_USE= xorg=ice,sm,x11	70	X11MON_USE= XORG=ice,sm,x11
72	X11MON_CONFIGURE_ENABLE= x11mon	71	X11MON_CONFIGURE_ENABLE= x11mon
73	X11MON_CONFIGURE_WITH= fam	72	X11MON_CONFIGURE_WITH= fam
74		73
75	post-patch:	74	post-patch:
76	@${REINPLACE_CMD} -e \	75	@${REINPLACE_CMD} -e 's\|@QMAKE@\|${TRUE}\|' \
77	's\|@QMAKE@\|${TRUE}\|' \
78	${WRKSRC}/Makefile.in	76	${WRKSRC}/Makefile.in
79	@${REINPLACE_CMD} -e \	77	@${REINPLACE_CMD} -e 's\|/usr/local/lib\|${LOCALBASE}/lib\|' \
80	's\|/usr/local/lib\|${LOCALBASE}/lib\|' \
81	${WRKSRC}/configure	78	${WRKSRC}/configure
82	@${REINPLACE_CMD} -e \
83	's\|%%PYTHON_CMD%%\|${PYTHON_CMD}\|' \
84	${WRKSRC}/Makefile.in
85		79
86	pre-build-QT5-on:	80	pre-build-QT5-on:
87	@cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} ${QMAKE} \	81	@cd ${WRKSRC}/qtgui && \
88	${QMAKE_ARGS} recoll.pro	82	${SETENV} ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS} recoll.pro
89		83
90	post-install:	84	post-install:
91	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/*.so \	85	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/*.so \

Lines 1-4 Link Here

(-)b/deskutils/recoll/files/patch-Makefile.in (-39 / +1 lines)
1	--- Makefile.in.orig 2021-10-11 09:30:17 UTC	1	--- Makefile.in.orig 2021-12-01 09:04:57 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -884,7 +884,7 @@ recollindex_SOURCES = \	3	@@ -884,7 +884,7 @@ recollindex_SOURCES = \
4	index/webqueue.cpp \	4	index/webqueue.cpp \
Lines 9-49 Link Here
9	recollq_SOURCES = query/recollqmain.cpp	9	recollq_SOURCES = query/recollqmain.cpp
10	recollq_LDADD = librecoll.la	10	recollq_LDADD = librecoll.la
11	xadump_SOURCES = query/xadump.cpp	11	xadump_SOURCES = query/xadump.cpp
12	@@ -2795,16 +2795,12 @@ PicStatic: $(librecoll_la_OBJECTS)
13	@MAKEPYTHON_TRUE@clean-local:: recollpython-clean
14	@MAKEPYTHON_TRUE@recollpython: librecoll.la
15	@MAKEPYTHON_TRUE@ (cd python/recoll; set -x; \
16	-@MAKEPYTHON_TRUE@ for v in 2 3;do test -n "`which python$${v}`" && \
17	-@MAKEPYTHON_TRUE@ libdir=$(libdir) python$${v} setup.py build; \
18	-@MAKEPYTHON_TRUE@ done \
19	+@MAKEPYTHON_TRUE@ libdir=$(libdir) %%PYTHON_CMD%% setup.py build; \
20	@MAKEPYTHON_TRUE@ )
21	@MAKEPYTHON_TRUE@recollpython-install:
22	@MAKEPYTHON_TRUE@ (cd python/recoll; set -x; \
23	-@MAKEPYTHON_TRUE@ for v in 2 3;do test -n "`which python$${v}`" && \
24	-@MAKEPYTHON_TRUE@ python$${v} setup.py install \
25	+@MAKEPYTHON_TRUE@ %%PYTHON_CMD%% setup.py install \
26	@MAKEPYTHON_TRUE@ --prefix=${prefix} --root=$${DESTDIR:-/} $(OPTSFORPYTHON); \
27	-@MAKEPYTHON_TRUE@ done; \
28	@MAKEPYTHON_TRUE@ )
29	@MAKEPYTHON_TRUE@recollpython-clean:
30	@MAKEPYTHON_TRUE@ rm -f python/recoll/*.pyc
31	@@ -2820,16 +2816,12 @@ PicStatic: $(librecoll_la_OBJECTS)
32	@MAKEPYTHONCHM_TRUE@clean-local:: rclpychm-clean
33	@MAKEPYTHONCHM_TRUE@rclpychm:
34	@MAKEPYTHONCHM_TRUE@ (cd python/pychm; set -x; \
35	-@MAKEPYTHONCHM_TRUE@ for v in 2 3;do \
36	-@MAKEPYTHONCHM_TRUE@ test -n "`which python$${v}`" && python$${v} setup.py build;\
37	-@MAKEPYTHONCHM_TRUE@ done \
38	+@MAKEPYTHONCHM_TRUE@ %%PYTHON_CMD%% setup.py build;\
39	@MAKEPYTHONCHM_TRUE@ )
40	@MAKEPYTHONCHM_TRUE@rclpychm-install:
41	@MAKEPYTHONCHM_TRUE@ (cd python/pychm; set -x; \
42	-@MAKEPYTHONCHM_TRUE@ for v in 2 3;do test -n "`which python$${v}`" && \
43	-@MAKEPYTHONCHM_TRUE@ python$${v} setup.py install \
44	+@MAKEPYTHONCHM_TRUE@ %%PYTHON_CMD%% setup.py install \
45	@MAKEPYTHONCHM_TRUE@ --prefix=${prefix} --root=$${DESTDIR:-/} $(OPTSFORPYTHON); \
46	-@MAKEPYTHONCHM_TRUE@ done \
47	@MAKEPYTHONCHM_TRUE@ )
48	@MAKEPYTHONCHM_TRUE@rclpychm-clean:
49	@MAKEPYTHONCHM_TRUE@ rm -rf python/pychm/build