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

(-)b/deskutils/recoll/Makefile (-9 / +4 lines)
Lines 1-8 Link Here
1
# Created by: J.F. Dockes <jean-francois.dockes@wanadoo.fr>
1
# Created by: J.F. Dockes <jean-francois.dockes@wanadoo.fr>
2
2
3
PORTNAME=	recoll
3
PORTNAME=	recoll
4
PORTVERSION=	1.27.3
4
PORTVERSION=	1.31.2
5
PORTREVISION=	16
6
CATEGORIES=	deskutils
5
CATEGORIES=	deskutils
7
MASTER_SITES=	https://www.lesbonscomptes.com/recoll/
6
MASTER_SITES=	https://www.lesbonscomptes.com/recoll/
8
7
Lines 29-37 USE_PYTHON= py3kplist Link Here
29
SHEBANG_FILES=	filters/*.py filters/rcl7z filters/rclaudio \
28
SHEBANG_FILES=	filters/*.py filters/rcl7z filters/rclaudio \
30
		filters/rclchm filters/rcldia filters/rclepub \
29
		filters/rclchm filters/rcldia filters/rclepub \
31
		filters/rclepub1 filters/rclics filters/rclimg \
30
		filters/rclepub1 filters/rclics filters/rclimg \
32
		filters/rclinfo filters/rclkar filters/rclpython \
31
		filters/rclinfo filters/rclkar filters/rclrar \
33
		filters/rclrar filters/rcltar filters/rclwar \
32
		filters/rcltar filters/rclwar filters/rclzip \
34
		filters/rclzip desktop/hotrecoll.py
33
		desktop/hotrecoll.py
35
GNU_CONFIGURE=	yes
34
GNU_CONFIGURE=	yes
36
CONFIGURE_ARGS=	--enable-recollq --enable-xadump
35
CONFIGURE_ARGS=	--enable-recollq --enable-xadump
37
MAKE_ENV=	PYTHON_CMD=${PYTHON_CMD}
36
MAKE_ENV=	PYTHON_CMD=${PYTHON_CMD}
Lines 72-78 X11MON_USES= fam xorg Link Here
72
X11MON_USE=		xorg=ice,sm,x11
71
X11MON_USE=		xorg=ice,sm,x11
73
X11MON_CONFIGURE_ENABLE=	x11mon
72
X11MON_CONFIGURE_ENABLE=	x11mon
74
X11MON_CONFIGURE_WITH=	fam
73
X11MON_CONFIGURE_WITH=	fam
75
X11MON_BROKEN=		does not build: index/rclmonrcv.cpp:(.text+0x1f13): undefined reference to `FAMOpen2'
76
74
77
post-patch:
75
post-patch:
78
	@${REINPLACE_CMD} -e \
76
	@${REINPLACE_CMD} -e \
Lines 81-89 post-patch: Link Here
81
	@${REINPLACE_CMD} -e \
79
	@${REINPLACE_CMD} -e \
82
		's|/usr/local/lib|${LOCALBASE}/lib|' \
80
		's|/usr/local/lib|${LOCALBASE}/lib|' \
83
		${WRKSRC}/configure
81
		${WRKSRC}/configure
84
	@${REINPLACE_CMD} -e \
85
		's|python setup.py|${PYTHON_CMD} setup.py|; s|sudo||' \
86
		${WRKSRC}/python/recoll/Makefile
87
	@${REINPLACE_CMD} -e \
82
	@${REINPLACE_CMD} -e \
88
		's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \
83
		's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \
89
		${WRKSRC}/Makefile.in
84
		${WRKSRC}/Makefile.in
(-)b/deskutils/recoll/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1593261648
1
TIMESTAMP = 1636060156
2
SHA256 (recoll-1.27.3.tar.gz) = 3f62b792f57895a20dd334eb841d6fbe851e687dab43ea89cb3fbc0ccebcddac
2
SHA256 (recoll-1.31.2.tar.gz) = d3edb28fa76f2bb15e6555f82ef74e9151a2271535d3fdeb5f34012b1c2c3c54
3
SIZE (recoll-1.27.3.tar.gz) = 3172341
3
SIZE (recoll-1.31.2.tar.gz) = 3689921
(-)b/deskutils/recoll/files/patch-Makefile.in (-3 / +12 lines)
Lines 1-6 Link Here
1
--- Makefile.in.orig	2019-05-22 12:46:15 UTC
1
--- Makefile.in.orig	2021-10-11 09:30:17 UTC
2
+++ Makefile.in
2
+++ Makefile.in
3
@@ -2397,16 +2397,12 @@ PicStatic: $(librecoll_la_OBJECTS)
3
@@ -884,7 +884,7 @@ recollindex_SOURCES = \
4
     index/webqueue.cpp \
5
     index/webqueue.h
6
 
7
-recollindex_LDADD = librecoll.la 
8
+recollindex_LDADD = librecoll.la $(LIBFAM)
9
 recollq_SOURCES = query/recollqmain.cpp
10
 recollq_LDADD = librecoll.la
11
 xadump_SOURCES = query/xadump.cpp
12
@@ -2795,16 +2795,12 @@ PicStatic: $(librecoll_la_OBJECTS)
4
 @MAKEPYTHON_TRUE@clean-local:: recollpython-clean
13
 @MAKEPYTHON_TRUE@clean-local:: recollpython-clean
5
 @MAKEPYTHON_TRUE@recollpython: librecoll.la
14
 @MAKEPYTHON_TRUE@recollpython: librecoll.la
6
 @MAKEPYTHON_TRUE@	(cd python/recoll; set -x; \
15
 @MAKEPYTHON_TRUE@	(cd python/recoll; set -x; \
Lines 19-25 Link Here
19
 @MAKEPYTHON_TRUE@         )
28
 @MAKEPYTHON_TRUE@         )
20
 @MAKEPYTHON_TRUE@recollpython-clean:
29
 @MAKEPYTHON_TRUE@recollpython-clean:
21
 @MAKEPYTHON_TRUE@	rm -f python/recoll/*.pyc
30
 @MAKEPYTHON_TRUE@	rm -f python/recoll/*.pyc
22
@@ -2422,16 +2418,12 @@ PicStatic: $(librecoll_la_OBJECTS)
31
@@ -2820,16 +2816,12 @@ PicStatic: $(librecoll_la_OBJECTS)
23
 @MAKEPYTHONCHM_TRUE@clean-local:: rclpychm-clean
32
 @MAKEPYTHONCHM_TRUE@clean-local:: rclpychm-clean
24
 @MAKEPYTHONCHM_TRUE@rclpychm:
33
 @MAKEPYTHONCHM_TRUE@rclpychm:
25
 @MAKEPYTHONCHM_TRUE@	(cd python/pychm; set -x; \
34
 @MAKEPYTHONCHM_TRUE@	(cd python/pychm; set -x; \
(-)b/deskutils/recoll/files/patch-utils_fileudi.cpp (-2 / +2 lines)
Lines 1-9 Link Here
1
--- utils/fileudi.cpp.orig	2014-07-07 16:10:11 UTC
1
--- utils/fileudi.cpp.orig	2021-11-04 21:26:31 UTC
2
+++ utils/fileudi.cpp
2
+++ utils/fileudi.cpp
3
@@ -18,6 +18,7 @@
3
@@ -18,6 +18,7 @@
4
 
4
 
5
 #include <stdio.h>
6
 #include <cstdlib>
5
 #include <cstdlib>
6
 #include <iostream>
7
+#include <sys/types.h>
7
+#include <sys/types.h>
8
 
8
 
9
 #include "fileudi.h"
9
 #include "fileudi.h"
(-)b/deskutils/recoll/files/patch-utils_fstreewalk.cpp (-2 / +2 lines)
Lines 1-4 Link Here
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>
(-)b/deskutils/recoll/pkg-plist (-20 / +29 lines)
Lines 2-31 Link Here
2
bin/recollindex
2
bin/recollindex
3
bin/recollq
3
bin/recollq
4
bin/xadump
4
bin/xadump
5
%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%/PKG-INFO
5
%%PYTHON_SITELIBDIR%%/Recoll-%%VERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
6
%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%/SOURCES.txt
6
%%PYTHON_SITELIBDIR%%/Recoll-%%VERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
7
%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%/dependency_links.txt
7
%%PYTHON_SITELIBDIR%%/Recoll-%%VERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
8
%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%/top_level.txt
8
%%PYTHON_SITELIBDIR%%/Recoll-%%VERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
9
%%PYTHON_SITELIBDIR%%/recoll/__init__.py
9
%%PYTHON_SITELIBDIR%%/recoll/__init__.py
10
%%PYTHON_SITELIBDIR%%/recoll/__init__.pyc
10
%%PYTHON_SITELIBDIR%%/recoll/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
11
%%PYTHON_SITELIBDIR%%/recoll/__pycache__/conftree%%PYTHON_EXT_SUFFIX%%.pyc
12
%%PYTHON_SITELIBDIR%%/recoll/__pycache__/rclconfig%%PYTHON_EXT_SUFFIX%%.pyc
13
%%PYTHON_SITELIBDIR%%/recoll/__pycache__/rclextract%%PYTHON_EXT_SUFFIX%%.pyc
14
%%PYTHON_SITELIBDIR%%/recoll/__pycache__/recoll%%PYTHON_EXT_SUFFIX%%.pyc
15
%%PYTHON_SITELIBDIR%%/recoll/_recoll%%PYTHON_EXT_SUFFIX%%.so
11
%%PYTHON_SITELIBDIR%%/recoll/conftree.py
16
%%PYTHON_SITELIBDIR%%/recoll/conftree.py
12
%%PYTHON_SITELIBDIR%%/recoll/conftree.pyc
13
%%PYTHON_SITELIBDIR%%/recoll/rclconfig.py
17
%%PYTHON_SITELIBDIR%%/recoll/rclconfig.py
14
%%PYTHON_SITELIBDIR%%/recoll/rclconfig.pyc
18
%%PYTHON_SITELIBDIR%%/recoll/rclextract.py
15
%%PYTHON_SITELIBDIR%%/recoll/rclextract%%PYTHON_EXT_SUFFIX%%.so
19
%%PYTHON_SITELIBDIR%%/recoll/recoll.py
16
%%PYTHON_SITELIBDIR%%/recoll/recoll%%PYTHON_EXT_SUFFIX%%.so
20
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/PKG-INFO
21
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/SOURCES.txt
22
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/dependency_links.txt
23
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/top_level.txt
17
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__init__.py
24
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__init__.py
18
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
25
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
19
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__pycache__/chm.cpython-%%PYTHON_SUFFIX%%.pyc
26
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__pycache__/chm%%PYTHON_EXT_SUFFIX%%.pyc
20
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__pycache__/chmlib.cpython-%%PYTHON_SUFFIX%%.pyc
27
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__pycache__/chmlib%%PYTHON_EXT_SUFFIX%%.pyc
21
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/_chmlib%%PYTHON_EXT_SUFFIX%%.so
28
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/_chmlib%%PYTHON_EXT_SUFFIX%%.so
22
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/chm.py
29
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/chm.py
23
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/chmlib.py
30
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/chmlib.py
24
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/extra%%PYTHON_EXT_SUFFIX%%.so
31
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/extra%%PYTHON_EXT_SUFFIX%%.so
25
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/PKG-INFO
26
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/SOURCES.txt
27
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/dependency_links.txt
28
%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/top_level.txt
29
lib/recoll/librecoll-%%VERSION%%.so
32
lib/recoll/librecoll-%%VERSION%%.so
30
lib/recoll/librecoll.so
33
lib/recoll/librecoll.so
31
%%QT5%%man/man1/recoll.1.gz
34
%%QT5%%man/man1/recoll.1.gz
Lines 40-53 man/man5/recoll.conf.5.gz Link Here
40
%%DATADIR%%/doc/docbook-xsl.css
43
%%DATADIR%%/doc/docbook-xsl.css
41
%%DATADIR%%/doc/usermanual.html
44
%%DATADIR%%/doc/usermanual.html
42
%%DATADIR%%/examples/fields
45
%%DATADIR%%/examples/fields
43
%%DATADIR%%/examples/fragbuts.xml
46
%%DATADIR%%/examples/fragment-buttons.xml
44
%%DATADIR%%/examples/mimeconf
47
%%DATADIR%%/examples/mimeconf
45
%%DATADIR%%/examples/mimemap
48
%%DATADIR%%/examples/mimemap
46
%%DATADIR%%/examples/mimeview
49
%%DATADIR%%/examples/mimeview
47
%%DATADIR%%/examples/rclmon.sh
50
%%DATADIR%%/examples/rclmon.sh
51
%%DATADIR%%/examples/recoll-dark.css
52
%%DATADIR%%/examples/recoll-dark.qss
48
%%DATADIR%%/examples/recoll.conf
53
%%DATADIR%%/examples/recoll.conf
49
%%DATADIR%%/examples/recoll.qss
54
%%DATADIR%%/examples/recoll.qss
50
%%DATADIR%%/examples/recollindex.desktop
55
%%DATADIR%%/examples/recollindex.desktop
56
%%DATADIR%%/examples/recollindex.service
57
%%DATADIR%%/examples/recollindex@.service
51
%%DATADIR%%/filters/abiword.xsl
58
%%DATADIR%%/filters/abiword.xsl
52
%%DATADIR%%/filters/cmdtalk.py
59
%%DATADIR%%/filters/cmdtalk.py
53
%%DATADIR%%/filters/conftree.py
60
%%DATADIR%%/filters/conftree.py
Lines 88-93 man/man5/recoll.conf.5.gz Link Here
88
%%DATADIR%%/filters/rclimg
95
%%DATADIR%%/filters/rclimg
89
%%DATADIR%%/filters/rclimg.py
96
%%DATADIR%%/filters/rclimg.py
90
%%DATADIR%%/filters/rclinfo
97
%%DATADIR%%/filters/rclinfo
98
%%DATADIR%%/filters/rclipynb.py
91
%%DATADIR%%/filters/rclkar
99
%%DATADIR%%/filters/rclkar
92
%%DATADIR%%/filters/rclkwd
100
%%DATADIR%%/filters/rclkwd
93
%%DATADIR%%/filters/rcllatinclass.py
101
%%DATADIR%%/filters/rcllatinclass.py
Lines 100-111 man/man5/recoll.conf.5.gz Link Here
100
%%DATADIR%%/filters/rclocrcache.py
108
%%DATADIR%%/filters/rclocrcache.py
101
%%DATADIR%%/filters/rclocrtesseract.py
109
%%DATADIR%%/filters/rclocrtesseract.py
102
%%DATADIR%%/filters/rclopxml.py
110
%%DATADIR%%/filters/rclopxml.py
111
%%DATADIR%%/filters/rclorgmode.py
103
%%DATADIR%%/filters/rclpdf.py
112
%%DATADIR%%/filters/rclpdf.py
104
%%DATADIR%%/filters/rclppt.py
113
%%DATADIR%%/filters/rclppt.py
105
%%DATADIR%%/filters/rclps
114
%%DATADIR%%/filters/rclps
106
%%DATADIR%%/filters/rclpst.py
115
%%DATADIR%%/filters/rclpst.py
107
%%DATADIR%%/filters/rclpurple
116
%%DATADIR%%/filters/rclpurple
108
%%DATADIR%%/filters/rclpython
117
%%DATADIR%%/filters/rclpython.py
109
%%DATADIR%%/filters/rclrar
118
%%DATADIR%%/filters/rclrar
110
%%DATADIR%%/filters/rclrtf.py
119
%%DATADIR%%/filters/rclrtf.py
111
%%DATADIR%%/filters/rclscribus
120
%%DATADIR%%/filters/rclscribus
Lines 161-172 man/man5/recoll.conf.5.gz Link Here
161
%%QT5%%%%DATADIR%%/translations/recoll_fr.qm
170
%%QT5%%%%DATADIR%%/translations/recoll_fr.qm
162
%%QT5%%%%DATADIR%%/translations/recoll_hu.qm
171
%%QT5%%%%DATADIR%%/translations/recoll_hu.qm
163
%%QT5%%%%DATADIR%%/translations/recoll_it.qm
172
%%QT5%%%%DATADIR%%/translations/recoll_it.qm
173
%%QT5%%%%DATADIR%%/translations/recoll_ja.qm
164
%%QT5%%%%DATADIR%%/translations/recoll_ko.qm
174
%%QT5%%%%DATADIR%%/translations/recoll_ko.qm
165
%%QT5%%%%DATADIR%%/translations/recoll_kr.qm
166
%%QT5%%%%DATADIR%%/translations/recoll_lt.qm
175
%%QT5%%%%DATADIR%%/translations/recoll_lt.qm
167
%%QT5%%%%DATADIR%%/translations/recoll_nl.qm
176
%%QT5%%%%DATADIR%%/translations/recoll_nl.qm
168
%%QT5%%%%DATADIR%%/translations/recoll_pl.qm
177
%%QT5%%%%DATADIR%%/translations/recoll_pl.qm
169
%%QT5%%%%DATADIR%%/translations/recoll_ru.qm
178
%%QT5%%%%DATADIR%%/translations/recoll_ru.qm
179
%%QT5%%%%DATADIR%%/translations/recoll_sv.qm
170
%%QT5%%%%DATADIR%%/translations/recoll_tr.qm
180
%%QT5%%%%DATADIR%%/translations/recoll_tr.qm
171
%%QT5%%%%DATADIR%%/translations/recoll_uk.qm
181
%%QT5%%%%DATADIR%%/translations/recoll_uk.qm
172
%%QT5%%%%DATADIR%%/translations/recoll_xx.qm
182
%%QT5%%%%DATADIR%%/translations/recoll_xx.qm
173
- 

Return to bug 259679