pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
recoll: finish package
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By: wiz
Date: Sat Sep 30 10:25:35 2023 +0200
Changeset: db98c9bd577edf65314535f0f7fbcb29034579fc
Modified Files:
Makefile
TODO
recoll/Makefile
recoll/PLIST
recoll/distinfo
recoll/patches/patch-utils_pxattr.cpp
Added Files:
recoll/patches/patch-qtgui_recoll.pro.in
Removed Files:
recoll/TODO
Log Message:
recoll: finish package
With some help from Jean-Francois Dockes, thanks!
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=db98c9bd577edf65314535f0f7fbcb29034579fc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 +
TODO | 1 -
recoll/Makefile | 30 +++++-
recoll/PLIST | 153 +++++++++++++++++++++++++------
recoll/TODO | 26 ------
recoll/distinfo | 3 +-
recoll/patches/patch-qtgui_recoll.pro.in | 16 ++++
recoll/patches/patch-utils_pxattr.cpp | 2 +
8 files changed, 174 insertions(+), 59 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 84d98feb55..4b39810a11 100644
--- a/Makefile
+++ b/Makefile
@@ -1675,6 +1675,7 @@ SUBDIR+= hu-go
SUBDIR+= hungrycat
SUBDIR+= hunspell-dictionaries
SUBDIR+= hunspell-uk_UA
+SUBDIR+= hut
SUBDIR+= hypatia
SUBDIR+= hyperrogue
SUBDIR+= hztool
@@ -5679,6 +5680,7 @@ SUBDIR+= vpnc
SUBDIR+= vpr
SUBDIR+= vsearch
SUBDIR+= vulkan-loader
+SUBDIR+= w3c-httpd
SUBDIR+= wackamole
SUBDIR+= waffle
SUBDIR+= wakeonlan
diff --git a/TODO b/TODO
index 4b7fedfc98..ae5f97f1c1 100644
--- a/TODO
+++ b/TODO
@@ -117,7 +117,6 @@ Suggested package updates
o qmc2-0.59
o qupzilla-2.2.1
o rdup-1.1.13
- o recoll-1.19.14
o rosegarden-current-1.4.0
o rsyslog6-6.3.6
o rygel-0.26.0
diff --git a/recoll/Makefile b/recoll/Makefile
index da1fdc6d85..ef50b828ab 100644
--- a/recoll/Makefile
+++ b/recoll/Makefile
@@ -27,13 +27,41 @@ DEPENDS+= ${PYPKGPREFIX}-rarfile-[0-9]*:../../archivers/py-rarfile
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
USE_TOOLS+= perl:run pkg-config unzip:run
-#CONFIGURE_ARGS+= --disable-python-module
CONFIGURE_ARGS+= --with-aspell=${BUILDLINK_PREFIX.aspell}/bin/aspell
CONFIGURE_ARGS+= --with-file-command=${BUILDLINK_PREFIX.file}/bin/file
BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/recoll
+
+PLIST_SUBST+= PYSITELIB=${PYSITELIB}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+REPLACE_PYTHON+= *.py */*.py */*/*.py */*/*/*.py
+REPLACE_PERL+= filters/rclimg
+
+SUBST_CLASSES+= base64
+SUBST_SED.base64+= -e "s/base64.h/recoll_base64.h/"
+SUBST_MESSAGE.base64= Renaming file to avoid conflict with krb5/base64.h
+SUBST_STAGE.base64= pre-configure
+SUBST_FILES.base64+= qtgui/xmltosd.cpp
+SUBST_FILES.base64+= qtgui/ssearch_w.cpp
+SUBST_FILES.base64+= rcldb/searchdatatox.cpp
+SUBST_FILES.base64+= rcldb/searchdataxml.cpp
+SUBST_FILES.base64+= rcldb/searchdata.cpp
+SUBST_FILES.base64+= Makefile.in
+#SUBST_FILES.base64+= Makefile.am
+SUBST_FILES.base64+= utils/fileudi.cpp
+SUBST_FILES.base64+= utils/mimeparse.cpp
+SUBST_FILES.base64+= utils/mimeparse.h
+SUBST_FILES.base64+= query/docseqhist.cpp
+SUBST_FILES.base64+= query/recollq.cpp
+SUBST_FILES.base64+= query/dynconf.h
+SUBST_FILES.base64+= query/dynconf.cpp
+
+pre-configure:
+ ${MV} ${WRKSRC}/utils/base64.h ${WRKSRC}/utils/recoll_base64.h
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/recoll/PLIST b/recoll/PLIST
index 3185439150..be4e4e0be5 100644
--- a/recoll/PLIST
+++ b/recoll/PLIST
@@ -1,71 +1,155 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/06/02 11:02:13 slitvinov Exp $
+@comment $NetBSD$
bin/recoll
bin/recollindex
+${PYSITELIB}/Recoll-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/PKG-INFO
+${PYSITELIB}/Recoll-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
+${PYSITELIB}/Recoll-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
+${PYSITELIB}/Recoll-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/top_level.txt
+${PYSITELIB}/recoll/__init__.py
+${PYSITELIB}/recoll/__pycache__/__init__.cpython-311.pyc
+${PYSITELIB}/recoll/__pycache__/conftree.cpython-311.pyc
+${PYSITELIB}/recoll/__pycache__/rclconfig.cpython-311.pyc
+${PYSITELIB}/recoll/__pycache__/rclextract.cpython-311.pyc
+${PYSITELIB}/recoll/__pycache__/recoll.cpython-311.pyc
+${PYSITELIB}/recoll/_recoll.so
+${PYSITELIB}/recoll/conftree.py
+${PYSITELIB}/recoll/rclconfig.py
+${PYSITELIB}/recoll/rclextract.py
+${PYSITELIB}/recoll/recoll.py
+${PYSITELIB}/recoll_aspell_python_py3-1.15-py${PYVERSSUFFIX}.egg-info/PKG-INFO
+${PYSITELIB}/recoll_aspell_python_py3-1.15-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
+${PYSITELIB}/recoll_aspell_python_py3-1.15-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
+${PYSITELIB}/recoll_aspell_python_py3-1.15-py${PYVERSSUFFIX}.egg-info/top_level.txt
+${PYSITELIB}/recollaspell.so
+${PYSITELIB}/recollchm-0.8.4.1+git-py${PYVERSSUFFIX}.egg-info/PKG-INFO
+${PYSITELIB}/recollchm-0.8.4.1+git-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
+${PYSITELIB}/recollchm-0.8.4.1+git-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
+${PYSITELIB}/recollchm-0.8.4.1+git-py${PYVERSSUFFIX}.egg-info/top_level.txt
+${PYSITELIB}/recollchm/__init__.py
+${PYSITELIB}/recollchm/__pycache__/__init__.cpython-311.pyc
+${PYSITELIB}/recollchm/__pycache__/chm.cpython-311.pyc
+${PYSITELIB}/recollchm/__pycache__/chmlib.cpython-311.pyc
+${PYSITELIB}/recollchm/_chmlib.so
+${PYSITELIB}/recollchm/chm.py
+${PYSITELIB}/recollchm/chmlib.py
+${PYSITELIB}/recollchm/extra.so
+lib/recoll/librecoll.la
man/man1/recoll.1
man/man1/recollindex.1
+man/man1/recollq.1
man/man5/recoll.conf.5
share/applications/recoll-searchgui.desktop
share/icons/hicolor/48x48/apps/recoll.png
+share/metainfo/recoll.appdata.xml
share/pixmaps/recoll.png
-share/recoll/doc/docbook.css
+share/recoll/doc/docbook-xsl.css
share/recoll/doc/usermanual.html
share/recoll/examples/fields
+share/recoll/examples/fragment-buttons.xml
share/recoll/examples/mimeconf
share/recoll/examples/mimemap
share/recoll/examples/mimeview
share/recoll/examples/rclmon.sh
+share/recoll/examples/recoll-common.css
+share/recoll/examples/recoll-common.qss
+share/recoll/examples/recoll-dark.css
+share/recoll/examples/recoll-dark.qss
share/recoll/examples/recoll.conf
share/recoll/examples/recoll.qss
share/recoll/examples/recollindex.desktop
+share/recoll/examples/recollindex.service
+share/recoll/examples/recollindex@.service
+share/recoll/filters/abiword.xsl
+share/recoll/filters/cmdtalk.py
+share/recoll/filters/conftree.py
+share/recoll/filters/fb2.xsl
+share/recoll/filters/gnumeric.xsl
share/recoll/filters/hotrecoll.py
-share/recoll/filters/rclabw
+share/recoll/filters/kosplitter.py
+share/recoll/filters/msodump.zip
+share/recoll/filters/okular-note.xsl
+share/recoll/filters/opendoc-body.xsl
+share/recoll/filters/opendoc-flat.xsl
+share/recoll/filters/opendoc-meta.xsl
+share/recoll/filters/openxml-meta.xsl
+share/recoll/filters/openxml-word-body.xsl
+share/recoll/filters/openxml-xls-body.xsl
+share/recoll/filters/ppt-dump.py
+share/recoll/filters/rcl7z.py
share/recoll/filters/rclaptosidman
-share/recoll/filters/rclaudio
-share/recoll/filters/rclchm
-share/recoll/filters/rcldia
-share/recoll/filters/rcldjvu
-share/recoll/filters/rcldoc
+share/recoll/filters/rclaspell-sugg.py
+share/recoll/filters/rclaudio.py
+share/recoll/filters/rclbasehandler.py
+share/recoll/filters/rclbibtex.sh
+share/recoll/filters/rclcheckneedretry.sh
+share/recoll/filters/rclchm.py
+share/recoll/filters/rclconfig.py
+share/recoll/filters/rcldia.py
+share/recoll/filters/rcldjvu.py
+share/recoll/filters/rcldoc.py
share/recoll/filters/rcldvi
+share/recoll/filters/rclepub.py
+share/recoll/filters/rclepub1.py
+share/recoll/filters/rclexec1.py
share/recoll/filters/rclexecm.py
-share/recoll/filters/rclfb2
+share/recoll/filters/rclfb2.py
share/recoll/filters/rclgaim
-share/recoll/filters/rclgnm
-share/recoll/filters/rclics
+share/recoll/filters/rclgenxslt.py
+share/recoll/filters/rclhwp.py
+share/recoll/filters/rclics.py
share/recoll/filters/rclimg
-share/recoll/filters/rclinfo
-share/recoll/filters/rclkar
+share/recoll/filters/rclimg.py
+share/recoll/filters/rclinfo.py
+share/recoll/filters/rclipynb.py
+share/recoll/filters/rclkar.py
share/recoll/filters/rclkwd
share/recoll/filters/rcllatinclass.py
share/recoll/filters/rcllatinstops.zip
share/recoll/filters/rcllyx
share/recoll/filters/rclman
-share/recoll/filters/rclnull
-share/recoll/filters/rclokulnote
-share/recoll/filters/rclopxml
-share/recoll/filters/rclpdf
-share/recoll/filters/rclppt
+share/recoll/filters/rclmidi.py
+share/recoll/filters/rclocr.py
+share/recoll/filters/rclocrabbyy.py
+share/recoll/filters/rclocrcache.py
+share/recoll/filters/rclocrtesseract.py
+share/recoll/filters/rclopxml.py
+share/recoll/filters/rclorgmode.py
+share/recoll/filters/rclpdf.py
+share/recoll/filters/rclppt.py
share/recoll/filters/rclps
+share/recoll/filters/rclpst.py
share/recoll/filters/rclpurple
-share/recoll/filters/rclpython
-share/recoll/filters/rclrar
-share/recoll/filters/rclrtf
+share/recoll/filters/rclpython.py
+share/recoll/filters/rclrar.py
+share/recoll/filters/rclrtf.py
share/recoll/filters/rclscribus
share/recoll/filters/rclshowinfo
-share/recoll/filters/rclsiduxman
-share/recoll/filters/rclsoff
-share/recoll/filters/rclsvg
+share/recoll/filters/rcltar.py
share/recoll/filters/rcltex
-share/recoll/filters/rcltext
+share/recoll/filters/rcltext.py
share/recoll/filters/rcluncomp
-share/recoll/filters/rclwar
-share/recoll/filters/rclwpd
-share/recoll/filters/rclxls
-share/recoll/filters/rclzip
-share/recoll/filters/xdg-open
+share/recoll/filters/rcluncomp.py
+share/recoll/filters/rclwar.py
+share/recoll/filters/rclxls.py
+share/recoll/filters/rclxml.py
+share/recoll/filters/rclxmp.py
+share/recoll/filters/rclxslt.py
+share/recoll/filters/rclzip.py
+share/recoll/filters/recoll-we-move-files.py
+share/recoll/filters/recollepub.zip
+share/recoll/filters/svg.xsl
+share/recoll/filters/thunderbird-open-message.sh
+share/recoll/filters/xls-dump.py
+share/recoll/filters/xlsxmltocsv.py
+share/recoll/filters/xml.xsl
share/recoll/images/aptosid-book.png
share/recoll/images/aptosid-manual.png
+share/recoll/images/archive.png
+share/recoll/images/book.png
+share/recoll/images/bookchap.png
share/recoll/images/document.png
share/recoll/images/drawing.png
+share/recoll/images/emblem-symbolic-link.png
share/recoll/images/folder.png
share/recoll/images/html.png
share/recoll/images/image.png
@@ -82,14 +166,23 @@ share/recoll/images/sownd.png
share/recoll/images/spreadsheet.png
share/recoll/images/text-x-python.png
share/recoll/images/txt.png
+share/recoll/images/video.png
share/recoll/images/wordprocessing.png
share/recoll/translations/recoll_cs.qm
+share/recoll/translations/recoll_da.qm
share/recoll/translations/recoll_de.qm
+share/recoll/translations/recoll_el.qm
share/recoll/translations/recoll_es.qm
share/recoll/translations/recoll_fr.qm
+share/recoll/translations/recoll_hu.qm
share/recoll/translations/recoll_it.qm
+share/recoll/translations/recoll_ja.qm
+share/recoll/translations/recoll_ko.qm
share/recoll/translations/recoll_lt.qm
+share/recoll/translations/recoll_nl.qm
+share/recoll/translations/recoll_pl.qm
share/recoll/translations/recoll_ru.qm
+share/recoll/translations/recoll_sv.qm
share/recoll/translations/recoll_tr.qm
share/recoll/translations/recoll_uk.qm
share/recoll/translations/recoll_xx.qm
diff --git a/recoll/TODO b/recoll/TODO
deleted file mode 100644
index 3c2dc837d0..0000000000
--- a/recoll/TODO
+++ /dev/null
@@ -1,26 +0,0 @@
-Build stops with
-
---- .obj/advshist.o ---
-In file included from advshist.cpp:24:
-../query/dynconf.h: In member function 'virtual bool RclSListEntry::decode(const string&)':
-../query/dynconf.h:75:9: error: 'base64_decode' was not declared in this scope; did you mean 'rk_base64_decode'?
- 75 | base64_decode(enc, value);
- | ^~~~~~~~~~~~~
- | rk_base64_decode
-../query/dynconf.h: In member function 'virtual bool RclSListEntry::encode(std::string&)':
-../query/dynconf.h:79:9: error: 'base64_encode' was not declared in this scope; did you mean 'rk_base64_encode'?
- 79 | base64_encode(value, enc);
- | ^~~~~~~~~~~~~
- | rk_base64_encode
---- .obj/guiutils.o ---
-In file included from guiutils.cpp:37:
-../query/dynconf.h: In member function 'virtual bool RclSListEntry::decode(const string&)':
-../query/dynconf.h:75:9: error: 'base64_decode' was not declared in this scope; did you mean 'rk_base64_decode'?
- 75 | base64_decode(enc, value);
- | ^~~~~~~~~~~~~
- | rk_base64_decode
-../query/dynconf.h: In member function 'virtual bool RclSListEntry::encode(std::string&)':
-../query/dynconf.h:79:9: error: 'base64_encode' was not declared in this scope; did you mean 'rk_base64_encode'?
- 79 | base64_encode(value, enc);
- | ^~~~~~~~~~~~~
- | rk_base64_encode
diff --git a/recoll/distinfo b/recoll/distinfo
index 7869a58176..8bfec06a29 100644
--- a/recoll/distinfo
+++ b/recoll/distinfo
@@ -3,4 +3,5 @@ $NetBSD: distinfo,v 1.2 2012/06/14 07:29:13 thomasklausner Exp $
BLAKE2s (recoll-1.35.0.tar.gz) = ea04fb056b3b0d8d3f0cc1d64932f842268d19d246952d9947bf2516fc2395ae
SHA512 (recoll-1.35.0.tar.gz) = 35dcbfb650251b00f2c7654dc7617bf24f7e480955121821c55e0d31c6ec4fa041f8f99e64afa12ad4ead725c366084d7d727dbdcee875b93bbc858a6229d236
Size (recoll-1.35.0.tar.gz) = 3121862 bytes
-SHA1 (patch-utils_pxattr.cpp) = da808290ecfe0189255fd3f1336415a55b9dd873
+SHA1 (patch-qtgui_recoll.pro.in) = e13244b57a7eebfb8978b9848a570d8a01a6f915
+SHA1 (patch-utils_pxattr.cpp) = dd0b60ae48891b455c23190ed2d85d852b8a5700
diff --git a/recoll/patches/patch-qtgui_recoll.pro.in b/recoll/patches/patch-qtgui_recoll.pro.in
new file mode 100644
index 0000000000..d359528b7f
--- /dev/null
+++ b/recoll/patches/patch-qtgui_recoll.pro.in
@@ -0,0 +1,16 @@
+$NetBSD$
+
+ld: ../.libs/librecoll.a(mh_xslt.o): undefined reference to symbol 'xmlFreeDoc@@LIBXML2_2.4.30'
+ld: /usr/pkg/lib/libxml2.so.2: error adding symbols: DSO missing from command line
+
+--- qtgui/recoll.pro.in.orig 2023-05-12 08:19:26.000000000 +0000
++++ qtgui/recoll.pro.in
+@@ -417,7 +417,7 @@ VPATH = @srcdir@
+ LIBS += -Wl,-rpath=@libdir@/recoll
+
+ LIBS += @XAPIAN_LIBS@ \
+- @LIBICONV@ $(BDYNAMIC) @LIBQZEITGEIST@ -lz
++ @LIBICONV@ $(BDYNAMIC) @LIBQZEITGEIST@ -lz -lxml2 -lxslt
+
+ INCLUDEPATH += ../common @srcdir@/../common @srcdir@/../index \
+ @srcdir@/../internfile @srcdir@/../query @srcdir@/../unac \
diff --git a/recoll/patches/patch-utils_pxattr.cpp b/recoll/patches/patch-utils_pxattr.cpp
index 2e1fef7f53..c36c7489f4 100644
--- a/recoll/patches/patch-utils_pxattr.cpp
+++ b/recoll/patches/patch-utils_pxattr.cpp
@@ -1,5 +1,7 @@
$NetBSD$
+Fix build on NetBSD, from upstream.
+
--- utils/pxattr.cpp.orig 2023-05-12 08:19:26.000000000 +0000
+++ utils/pxattr.cpp
@@ -27,14 +27,6 @@
Home |
Main Index |
Thread Index |
Old Index