From 1c37d88d3263aa0eaa88ad17827c88138a0cb423 Mon Sep 17 00:00:00 2001
From: "Jose G. Juanino" <jjuanino@gmail.com>
Date: Sat, 8 Feb 2020 21:52:22 +0100
Subject: [PATCH] deskutils/recoll: update to 1.26.4

I send a patch to update recoll to 1.26.4 version. Take into account
the following changes:

* 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.

Changelog:

https://www.lesbonscomptes.com/recoll/release-1.26.html
---
 deskutils/recoll/Makefile                     |  8 +++----
 deskutils/recoll/distinfo                     |  6 +++---
 .../recoll/files/patch-internfile-mh_xslt.cpp | 21 +++++++++++++++++++
 3 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 deskutils/recoll/files/patch-internfile-mh_xslt.cpp

diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index 01b7359abce9..799650b717d1 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	recoll
-DISTVERSION=	1.25.22
-PORTREVISION=	3
+DISTVERSION=	1.26.4
 CATEGORIES=	deskutils
 MASTER_SITES=	https://www.lesbonscomptes.com/recoll/
 
@@ -22,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
@@ -65,8 +64,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..1e7e4d78ed4a
--- /dev/null
+++ b/deskutils/recoll/files/patch-internfile-mh_xslt.cpp
@@ -0,0 +1,21 @@
+--- 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.24.1