diff options
Diffstat (limited to 'deskutils/recoll')
| -rw-r--r-- | deskutils/recoll/Makefile | 6 | ||||
| -rw-r--r-- | deskutils/recoll/files/patch-internfile_mh__xslt.cpp | 20 | ||||
| -rw-r--r-- | deskutils/recoll/files/patch-utils_miniz.cpp | 15 | ||||
| -rw-r--r-- | deskutils/recoll/pkg-plist | 6 |
4 files changed, 41 insertions, 6 deletions
diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile index 86e1f1ccb305..9345205bd8c6 100644 --- a/deskutils/recoll/Makefile +++ b/deskutils/recoll/Makefile @@ -1,6 +1,6 @@ PORTNAME= recoll PORTVERSION= 1.33.1 -PORTREVISION= 10 +PORTREVISION= 12 CATEGORIES= deskutils MASTER_SITES= ${WWW} @@ -19,8 +19,8 @@ RUN_DEPENDS= antiword:textproc/antiword \ unrtf:textproc/unrtf \ wpd2html:textproc/libwpd010 -USES= bison compiler:c++11-lang gmake gnome iconv libtool localbase \ - pkgconfig python shebangfix +USES= bison compiler:c++11-lang fam gmake gnome iconv libtool \ + localbase pkgconfig python shebangfix USE_GNOME= libxslt USE_LDCONFIG= yes USE_PYTHON= py3kplist 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..48356e932aa7 --- /dev/null +++ b/deskutils/recoll/files/patch-internfile_mh__xslt.cpp @@ -0,0 +1,20 @@ +--- internfile/mh_xslt.cpp.orig 2022-01-14 09:19:06 UTC ++++ internfile/mh_xslt.cpp +@@ -65,7 +65,7 @@ class FileScanXML : public FileScanDo { (public) + xmlDocPtr getDoc() { + int ret; + if ((ret = xmlParseChunk(ctxt, nullptr, 0, 1))) { +- xmlError *error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + LOGERR("FileScanXML: final xmlParseChunk failed with error " << + ret << " error: " << + (error ? error->message : +@@ -94,7 +94,7 @@ class FileScanXML : public FileScanDo { (public) + } + int ret; + if ((ret = xmlParseChunk(ctxt, buf, cnt, 0))) { +- xmlError *error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + LOGERR("FileScanXML: xmlParseChunk failed with error " << + ret << " for [" << buf << "] error " << + (error ? error->message : diff --git a/deskutils/recoll/files/patch-utils_miniz.cpp b/deskutils/recoll/files/patch-utils_miniz.cpp new file mode 100644 index 000000000000..b3b352ac394b --- /dev/null +++ b/deskutils/recoll/files/patch-utils_miniz.cpp @@ -0,0 +1,15 @@ +Patch by Matthias Andree <mandree@freebsd.org> 2025-07-15 +to enable using 64-bit file I/O API such as ftello +that use off_t types. + +--- utils/miniz.cpp.orig 2022-01-14 09:19:07 UTC ++++ utils/miniz.cpp +@@ -3022,7 +3022,7 @@ static FILE *mz_freopen(const char *pPath, const char + #define MZ_FFLUSH fflush + #define MZ_FREOPEN(p, m, s) freopen64(p, m, s) + #define MZ_DELETE_FILE remove +-#elif defined(__APPLE__) ++#elif defined(__APPLE__) || defined(__FreeBSD__) + #ifndef MINIZ_NO_TIME + #include <utime.h> + #endif diff --git a/deskutils/recoll/pkg-plist b/deskutils/recoll/pkg-plist index 6ce389b8036e..62aace6ba8f5 100644 --- a/deskutils/recoll/pkg-plist +++ b/deskutils/recoll/pkg-plist @@ -6,7 +6,7 @@ bin/xadump %%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/_recoll%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/recoll/_recoll%%PYTHON_TAG%%.so %%PYTHON_SITELIBDIR%%/recoll/__init__.py %%PYTHON_SITELIBDIR%%/recoll/__init__.pyc %%PYTHON_SITELIBDIR%%/recoll/__pycache__/rclextract.cpython-%%PYTHON_SUFFIX%%.pyc @@ -21,10 +21,10 @@ bin/xadump %%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/_chmlib%%PYTHON_EXT_SUFFIX%%.so +%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/_chmlib%%PYTHON_TAG%%.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/extra%%PYTHON_TAG%%.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 |