Attachment 229328 Details for Bug 259679 – update to 1.31.2

[patch] update to 1.31.2

recoll.patch (text/plain), 10.61 KB, created by Jose G. Juanino on 2021-11-06 16:47:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jose G. Juanino

Created: 2021-11-06 16:47:06 UTC

Size: 10.61 KB

patch

obsolete

>From 735c3d25476b76e17d778044a30346381ac4b216 Mon Sep 17 00:00:00 2001
>From: "Jose G. Juanino" <jjuanino@gmail.com>
>Date: Fri, 5 Nov 2021 19:32:11 +0100
>Subject: [PATCH] deskutils/recoll: Update to 1.31.1
>
>Software release notes:
>
>https://www.lesbonscomptes.com/recoll/pages/release-history.html
>
>Specific changes to this port version:
>
>- Update filters according to new version
>- X11MON option is not longer broken, fixed in Makefile.in patch
>---
> deskutils/recoll/Makefile                     | 13 ++---
> deskutils/recoll/distinfo                     |  6 +--
> deskutils/recoll/files/patch-Makefile.in      | 15 ++++--
> .../recoll/files/patch-utils_fileudi.cpp      |  4 +-
> .../recoll/files/patch-utils_fstreewalk.cpp   |  4 +-
> deskutils/recoll/pkg-plist                    | 48 +++++++++++--------
> 6 files changed, 52 insertions(+), 38 deletions(-)
>
>diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
>index 29ab15f43281..dc894ae5d4ae 100644
>--- a/deskutils/recoll/Makefile
>+++ b/deskutils/recoll/Makefile
>@@ -1,8 +1,7 @@
> # Created by: J.F. Dockes <jean-francois.dockes@wanadoo.fr>
> 
> PORTNAME=	recoll
>-PORTVERSION=	1.27.3
>-PORTREVISION=	16
>+PORTVERSION=	1.31.2
> CATEGORIES=	deskutils
> MASTER_SITES=	https://www.lesbonscomptes.com/recoll/
> 
>@@ -29,9 +28,9 @@ 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/rclrar filters/rcltar filters/rclwar \
>-		filters/rclzip desktop/hotrecoll.py
>+		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}
>@@ -72,7 +71,6 @@ 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 \
>@@ -81,9 +79,6 @@ post-patch:
> 	@${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
>diff --git a/deskutils/recoll/distinfo b/deskutils/recoll/distinfo
>index 3ba03e177c9f..66d624881573 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 = 1636060156
>+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,6 +1,15 @@
>---- 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; \
>@@ -19,7 +28,7 @@
>  @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; \
>diff --git a/deskutils/recoll/files/patch-utils_fileudi.cpp b/deskutils/recoll/files/patch-utils_fileudi.cpp
>index 2dca3d529210..10b60dd44645 100644
>--- a/deskutils/recoll/files/patch-utils_fileudi.cpp
>+++ b/deskutils/recoll/files/patch-utils_fileudi.cpp
>@@ -1,9 +1,9 @@
>---- utils/fileudi.cpp.orig	2014-07-07 16:10:11 UTC
>+--- utils/fileudi.cpp.orig	2021-11-04 21:26:31 UTC
> +++ utils/fileudi.cpp
> @@ -18,6 +18,7 @@
>  
>- #include <stdio.h>
>  #include <cstdlib>
>+ #include <iostream>
> +#include <sys/types.h>
>  
>  #include "fileudi.h"
>diff --git a/deskutils/recoll/files/patch-utils_fstreewalk.cpp b/deskutils/recoll/files/patch-utils_fstreewalk.cpp
>index 58691eb0c7ae..c249051f745f 100644
>--- a/deskutils/recoll/files/patch-utils_fstreewalk.cpp
>+++ b/deskutils/recoll/files/patch-utils_fstreewalk.cpp
>@@ -1,4 +1,4 @@
>---- utils/fstreewalk.cpp.orig	2020-08-30 18:31:25 UTC
>+--- utils/fstreewalk.cpp.orig	2021-08-03 07:29:21 UTC
> +++ utils/fstreewalk.cpp
> @@ -17,6 +17,7 @@
>  
>@@ -6,5 +6,5 @@
>  
> +#include <sys/types.h>
>  #include <stdio.h>
>- #include <dirent.h>
>+ 
>  #include <errno.h>
>diff --git a/deskutils/recoll/pkg-plist b/deskutils/recoll/pkg-plist
>index 7abdf8bd9399..27b05040b5e9 100644
>--- a/deskutils/recoll/pkg-plist
>+++ b/deskutils/recoll/pkg-plist
>@@ -2,30 +2,33 @@
> 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/__init__.py
>-%%PYTHON_SITELIBDIR%%/recoll/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/recoll/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
>+%%PYTHON_SITELIBDIR%%/recoll/__pycache__/conftree%%PYTHON_EXT_SUFFIX%%.pyc
>+%%PYTHON_SITELIBDIR%%/recoll/__pycache__/rclconfig%%PYTHON_EXT_SUFFIX%%.pyc
>+%%PYTHON_SITELIBDIR%%/recoll/__pycache__/rclextract%%PYTHON_EXT_SUFFIX%%.pyc
>+%%PYTHON_SITELIBDIR%%/recoll/__pycache__/recoll%%PYTHON_EXT_SUFFIX%%.pyc
>+%%PYTHON_SITELIBDIR%%/recoll/_recoll%%PYTHON_EXT_SUFFIX%%.so
> %%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-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
> %%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/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
>+%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__pycache__/chm%%PYTHON_EXT_SUFFIX%%.pyc
>+%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__pycache__/chmlib%%PYTHON_EXT_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
>@@ -40,14 +43,18 @@ man/man5/recoll.conf.5.gz
> %%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%%/examples/recollindex.service
>+%%DATADIR%%/examples/recollindex@.service
> %%DATADIR%%/filters/abiword.xsl
> %%DATADIR%%/filters/cmdtalk.py
> %%DATADIR%%/filters/conftree.py
>@@ -88,6 +95,7 @@ man/man5/recoll.conf.5.gz
> %%DATADIR%%/filters/rclimg
> %%DATADIR%%/filters/rclimg.py
> %%DATADIR%%/filters/rclinfo
>+%%DATADIR%%/filters/rclipynb.py
> %%DATADIR%%/filters/rclkar
> %%DATADIR%%/filters/rclkwd
> %%DATADIR%%/filters/rcllatinclass.py
>@@ -100,12 +108,13 @@ man/man5/recoll.conf.5.gz
> %%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
>@@ -161,12 +170,13 @@ man/man5/recoll.conf.5.gz
> %%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
>-- 
>2.32.0
>

Actions: View | Diff

Attachments on bug 259679: 229328 | 229371 | 229372