Attachment #215679 for bug #243991




# $FreeBSD$

PORTNAME=	recoll
DISTVERSION=	1.26.4
PORTREVISION=	7
CATEGORIES=	deskutils
MASTER_SITES=	https://www.lesbonscomptes.com/recoll/


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 \

		unrtf:textproc/unrtf

USES=		bison compiler:c++11-lang gmake gnome iconv libtool localbase \
		python:3.5+ shebangfix
USE_GNOME=	libxslt
USE_LDCONFIG=	yes
USE_PYTHON=	py3kplist

		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

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}
X11MON_DESC=		X11 session monitoring support
X11MON_USES=		fam xorg
X11MON_USE=		xorg=ice,sm,x11

Lines 1-3 Link Here

(-)b/deskutils/recoll/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1569679178	1	TIMESTAMP = 1581185473
2	SHA256 (recoll-1.25.22.tar.gz) = 500d114952aa03c222847df8ecd0f9c58fc1d03b940df72de81e02e52ca905bc	2	SHA256 (recoll-1.26.4.tar.gz) = 1c3f67c6be39f4eb8cf06629a09a92120d8c845ffd3ba950cd81b05531cdf1ae
3	SIZE (recoll-1.25.22.tar.gz) = 2849390	3	SIZE (recoll-1.26.4.tar.gz) = 2993366




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

Return to bug 243991

Lines 2-9 Link Here

(-)b/deskutils/recoll/Makefile (-9 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= recoll	4	PORTNAME= recoll
5	DISTVERSION= 1.25.22	5	DISTVERSION= 1.26.4
6	PORTREVISION= 7
7	CATEGORIES= deskutils	6	CATEGORIES= deskutils
8	MASTER_SITES= https://www.lesbonscomptes.com/recoll/	7	MASTER_SITES= https://www.lesbonscomptes.com/recoll/
9		8
Lines 13-22 COMMENT= Personal full text search package, based on Xapian Link Here
13	LICENSE= GPLv2+	12	LICENSE= GPLv2+
14	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
15		14
16	BROKEN= configure: error: --enable-python-chm is set but libchm is not found
17	DEPRECATED= Uses deprecated version of python
18	EXPIRATION_DATE= 2020-08-15
19
20	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}	15	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
21	LIB_DEPENDS= libxapian.so:databases/xapian-core	16	LIB_DEPENDS= libxapian.so:databases/xapian-core
22	RUN_DEPENDS= unrar:archivers/unrar \	17	RUN_DEPENDS= unrar:archivers/unrar \
Lines 26-32 RUN_DEPENDS= unrar:archivers/unrar \ Link Here
26	unrtf:textproc/unrtf	21	unrtf:textproc/unrtf
27		22
28	USES= bison compiler:c++11-lang gmake gnome iconv libtool localbase \	23	USES= bison compiler:c++11-lang gmake gnome iconv libtool localbase \
29	python:2.7 shebangfix	24	python:3.5+ shebangfix
30	USE_GNOME= libxslt	25	USE_GNOME= libxslt
31	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
32	USE_PYTHON= py3kplist	27	USE_PYTHON= py3kplist
Lines 38-43 SHEBANG_FILES= filters/*.py filters/rcl7z filters/rclaudio \ Link Here
38	filters/rclrar filters/rcltar filters/rclwar \	33	filters/rclrar filters/rcltar filters/rclwar \
39	filters/rclzip desktop/hotrecoll.py	34	filters/rclzip desktop/hotrecoll.py
40	GNU_CONFIGURE= yes	35	GNU_CONFIGURE= yes
		36	CONFIGURE_ARGS= --disable-python-chm
41	MAKE_ENV= PYTHON_CMD=${PYTHON_CMD}	37	MAKE_ENV= PYTHON_CMD=${PYTHON_CMD}
42		38
43	PYDISTUTILS_PKGNAME= Recoll	39	PYDISTUTILS_PKGNAME= Recoll
Lines 65-72 QT5_USE= GL=gl Link Here
65	QT5_CONFIGURE_ENABLE= qtgui	61	QT5_CONFIGURE_ENABLE= qtgui
66	QT5_CONFIGURE_ENV= QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \	62	QT5_CONFIGURE_ENV= QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \
67	QTDIR="${PREFIX}"	63	QTDIR="${PREFIX}"
68	SOUND_RUN_DEPENDS= mutagen-pony-${PYTHON_VER}:audio/py-mutagen@${PY_FLAVOR} \	64	SOUND_RUN_DEPENDS= mutagen-pony-${PYTHON_VER}:audio/py-mutagen@${PY_FLAVOR}
69	pykaraoke:audio/py-karaoke@${PY_FLAVOR}
70	X11MON_DESC= X11 session monitoring support	65	X11MON_DESC= X11 session monitoring support
71	X11MON_USES= fam xorg	66	X11MON_USES= fam xorg
72	X11MON_USE= xorg=ice,sm,x11	67	X11MON_USE= xorg=ice,sm,x11

Added Link Here

(-)b/deskutils/recoll/files/patch-internfile-mh_xslt.cpp (-1 / +20 lines)
0	-	1	--- internfile/mh_xslt.cpp.orig 2020-01-11 15:49:52 UTC
		2	+++ internfile/mh_xslt.cpp
		3	@@ -16,7 +16,7 @@
		4	*/
		5	#include "autoconfig.h"
		6
		7	-#include <malloc.h>
		8	+#include <stdlib.h>
		9
		10	#include <libxml/parser.h>
		11	#include <libxml/tree.h>
		12	@@ -52,9 +52,6 @@ class FileScanXML : public FileScanDo { (public)
		13	// malloc_trim() and mallopt() doc seems to be a bit
		14	// misleading, there is probably a frag size under which
		15	// free() does not try to malloc_trim() at all
		16	-#ifndef _WIN32
		17	- malloc_trim(0);
		18	-#endif
		19	}
		20	}