Attachment 215679 Details for Bug 243991 – deskutils/recoll: update to 1.26.4

[patch] deskutils/recoll: update to 1.26.4

recoll.diff (text/plain), 3.98 KB, created by Jose G. Juanino on 2020-06-17 21:32:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jose G. Juanino

Created: 2020-06-17 21:32:13 UTC

Size: 3.98 KB

patch

obsolete

>From 53e8c08b5f65ef433f633c78991a8ba1f8a02c3b Mon Sep 17 00:00:00 2001
>From: "Jose G. Juanino" <jjuanino@gmail.com>
>Date: Wed, 17 Jun 2020 23:25:46 +0200
>Subject: [PATCH] deskutils/recoll: update to 1.26.4
>
>* Force dependency to python:3.5+, as 2.7 is deprecated.
>* audio/py-karaoke port is not compatible with python3, and as
>  consequence, has been removed from the dependence list.
>* Disable dependency with textproc/pychm, as no longer in tree ports.
>  See https://svnweb.freebsd.org/ports?view=revision&revision=528757
>
>Changelog:
>
>https://www.lesbonscomptes.com/recoll/release-1.26.html
>---
> deskutils/recoll/Makefile                     | 13 ++++--------
> deskutils/recoll/distinfo                     |  6 +++---
> .../recoll/files/patch-internfile-mh_xslt.cpp | 20 +++++++++++++++++++
> 3 files changed, 27 insertions(+), 12 deletions(-)
> create mode 100644 deskutils/recoll/files/patch-internfile-mh_xslt.cpp
>
>diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
>index 8f1ca1afef88..66e91201d78c 100644
>--- a/deskutils/recoll/Makefile
>+++ b/deskutils/recoll/Makefile
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	recoll
>-DISTVERSION=	1.25.22
>-PORTREVISION=	7
>+DISTVERSION=	1.26.4
> CATEGORIES=	deskutils
> MASTER_SITES=	https://www.lesbonscomptes.com/recoll/
> 
>@@ -13,10 +12,6 @@ COMMENT=	Personal full text search package, based on Xapian
> LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BROKEN=		configure: error: --enable-python-chm is set but libchm is not found
>-DEPRECATED=	Uses deprecated version of python
>-EXPIRATION_DATE=	2020-08-15
>-
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
> LIB_DEPENDS=	libxapian.so:databases/xapian-core
> RUN_DEPENDS=	unrar:archivers/unrar \
>@@ -26,7 +21,7 @@ RUN_DEPENDS=	unrar:archivers/unrar \
> 		unrtf:textproc/unrtf
> 
> USES=		bison compiler:c++11-lang gmake gnome iconv libtool localbase \
>-		python:2.7 shebangfix
>+		python:3.5+ shebangfix
> USE_GNOME=	libxslt
> USE_LDCONFIG=	yes
> USE_PYTHON=	py3kplist
>@@ -38,6 +33,7 @@ SHEBANG_FILES=	filters/*.py filters/rcl7z filters/rclaudio \
> 		filters/rclrar filters/rcltar filters/rclwar \
> 		filters/rclzip desktop/hotrecoll.py
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--disable-python-chm
> MAKE_ENV=	PYTHON_CMD=${PYTHON_CMD}
> 
> PYDISTUTILS_PKGNAME=	Recoll
>@@ -65,8 +61,7 @@ QT5_USE=		GL=gl
> 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} \
>-			pykaraoke:audio/py-karaoke@${PY_FLAVOR}
>+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
>diff --git a/deskutils/recoll/distinfo b/deskutils/recoll/distinfo
>index f98b07c7b17f..43580a16eb4d 100644
>--- a/deskutils/recoll/distinfo
>+++ b/deskutils/recoll/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1569679178
>-SHA256 (recoll-1.25.22.tar.gz) = 500d114952aa03c222847df8ecd0f9c58fc1d03b940df72de81e02e52ca905bc
>-SIZE (recoll-1.25.22.tar.gz) = 2849390
>+TIMESTAMP = 1581185473
>+SHA256 (recoll-1.26.4.tar.gz) = 1c3f67c6be39f4eb8cf06629a09a92120d8c845ffd3ba950cd81b05531cdf1ae
>+SIZE (recoll-1.26.4.tar.gz) = 2993366
>diff --git a/deskutils/recoll/files/patch-internfile-mh_xslt.cpp b/deskutils/recoll/files/patch-internfile-mh_xslt.cpp
>new file mode 100644
>index 000000000000..ff3a325e5e48
>--- /dev/null
>+++ b/deskutils/recoll/files/patch-internfile-mh_xslt.cpp
>@@ -0,0 +1,20 @@
>+--- internfile/mh_xslt.cpp.orig	2020-01-11 15:49:52 UTC
>++++ internfile/mh_xslt.cpp
>+@@ -16,7 +16,7 @@
>+  */
>+ #include "autoconfig.h"
>+ 
>+-#include <malloc.h>
>++#include <stdlib.h>
>+ 
>+ #include <libxml/parser.h>
>+ #include <libxml/tree.h>
>+@@ -52,9 +52,6 @@ class FileScanXML : public FileScanDo { (public)
>+ 			// malloc_trim() and mallopt() doc seems to be a bit
>+ 			// misleading, there is probably a frag size under which
>+ 			// free() does not try to malloc_trim() at all
>+-#ifndef _WIN32
>+-			malloc_trim(0);
>+-#endif
>+         }
>+     }
>-- 
>2.26.2
>

Flags:

jjuanino: maintainer-approval+

Actions: View | Diff

Attachments on bug 243991: 211483 | 215679 | 215823