tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix kio build for newer ubuntu releases and recoll 1.25

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-02-15 18:18:25 +01:00
parent 55a9d59dd6
commit 5b8e2d06e1
9 changed files with 126 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packaging/debian/buildppa.sh
View File

@ -6,9 +6,9 @@
PPA_KEYID=D38B9201
RCLVERS=1.24.1
RCLVERS=1.25.3
SCOPEVERS=1.20.2.4
PPAVERS=2
PPAVERS=6
#
RCLSRC=/y/home/dockes/projets/fulltext/recoll/src
@ -20,7 +20,7 @@ case $RCLVERS in
1.14*) PPANAME=recoll-ppa;;
*) PPANAME=recoll15-ppa;;
esac
# PPANAME=recollexp-ppa
PPANAME=recollexp-ppa
echo "PPA: $PPANAME. Type CR if Ok, else ^C"
read rep
@ -46,8 +46,8 @@ debdir=debian
# Note: no new releases for lucid: no webkit. Or use old debianrclqt4 dir.
# No new releases for trusty either because of risk of kio compat (kio
# wont build)
series="xenial zesty artful bionic"
#series=
series="xenial bionic cosmic disco"
series=
if test "X$series" != X ; then
check_recoll_orig
@ -78,8 +78,8 @@ done
### KIO. Does not build on trusty from recoll 1.23 because of the need
### for c++11
series="xenial zesty artful bionic"
series=
series="xenial bionic cosmic disco"
series="cosmic disco"
debdir=debiankio
topdir=kio-recoll-${RCLVERS}
@ -102,6 +102,12 @@ for svers in $series ; do
rm -rf $topdir/debian
cp -rp ${debdir}/ $topdir/debian || exit 1
if test -f $debdir/control-$series ; then
cp -f -p $debdir/control-$series recoll-${RCLVERS}/debian/control
else
cp -f -p $debdir/control recoll-${RCLVERS}/debian/control
fi
sed -e s/SERIES/$svers/g \
-e s/PPAVERS/${PPAVERS}/g \
< ${debdir}/changelog > $topdir/debian/changelog ;

2
packaging/debian/debiankio/compat
View File

@ -1 +1 @@
7
9

3
packaging/debian/debiankio/control
View File

@ -10,9 +10,10 @@ Build-Depends: cdbs,
kdelibs5-dev (>= 4:4.2.2),
qtbase5-dev,
extra-cmake-modules,
kio-dev,
libkf5kio-dev,
pkg-kde-tools (>= 0.4.0),
libxapian-dev,
libxslt1-dev,
libz-dev
Standards-Version: 3.9.7
Homepage: http://www.recoll.org/

37
packaging/debian/debiankio/control-bionic Normal file
View File

@ -0,0 +1,37 @@
Source: kio-recoll
Section: kde
Priority: extra
Maintainer: Jean-Francois Dockes <jfd@recoll.org>
Build-Depends: cdbs,
cmake,
libtool,
debhelper (>= 7),
bison,
kdelibs5-dev (>= 4:4.2.2),
qtbase5-dev,
extra-cmake-modules,
kio-dev,
pkg-kde-tools (>= 0.4.0),
libxapian-dev,
libxslt1-dev,
libz-dev
Standards-Version: 3.9.7
Homepage: http://www.recoll.org/
Package: kio-recoll
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, recoll
Description: Recoll KIO slave for KDE 4
Recoll KIO slave for KDE 4, allows performing a Recoll search by
entering an appropriate URL in a KDE open dialog, or with an HTML-based
interface displayed in Konqueror.
The HTML-based interface is similar to the Recoll GUI QT-based interface,
slightly less powerful. It allows performing a search while staying fully
within the KDE framework: drag and drop from the result list works
normally and you have your normal choice of applications for opening files.
An alternative interface uses a directory view of search results. Due to
limitations in the current KIO slave interface, it is currently not
obviously useful.
The interface is described in more detail inside a help file which you can
access by entering recoll:/ inside the konqueror URL line (this works only
if the recoll KIO slave has been previously installed).

37
packaging/debian/debiankio/control-xenial Normal file
View File

@ -0,0 +1,37 @@
Source: kio-recoll
Section: kde
Priority: extra
Maintainer: Jean-Francois Dockes <jfd@recoll.org>
Build-Depends: cdbs,
cmake,
libtool,
debhelper (>= 7),
bison,
kdelibs5-dev (>= 4:4.2.2),
qtbase5-dev,
extra-cmake-modules,
kio-dev,
pkg-kde-tools (>= 0.4.0),
libxapian-dev,
libxslt1-dev,
libz-dev
Standards-Version: 3.9.7
Homepage: http://www.recoll.org/
Package: kio-recoll
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, recoll
Description: Recoll KIO slave for KDE 4
Recoll KIO slave for KDE 4, allows performing a Recoll search by
entering an appropriate URL in a KDE open dialog, or with an HTML-based
interface displayed in Konqueror.
The HTML-based interface is similar to the Recoll GUI QT-based interface,
slightly less powerful. It allows performing a search while staying fully
within the KDE framework: drag and drop from the result list works
normally and you have your normal choice of applications for opening files.
An alternative interface uses a directory view of search results. Due to
limitations in the current KIO slave interface, it is currently not
obviously useful.
The interface is described in more detail inside a help file which you can
access by entering recoll:/ inside the konqueror URL line (this works only
if the recoll KIO slave has been previously installed).

11
packaging/debian/debiankio/patches/fix-kio-build-ldl.patch
View File

@ -1,11 +0,0 @@
diff -r 110af3426961 src/kde/kioslave/kio_recoll/CMakeLists.txt
--- a/kde/kioslave/kio_recoll/CMakeLists.txt Mon May 15 13:18:53 2017 +0200
+++ b/kde/kioslave/kio_recoll/CMakeLists.txt Mon May 15 13:19:28 2017 +0200
@@ -83,6 +83,7 @@
recoll
xapian
KF5::KIOCore
+dl
z
pthread
)

29
packaging/debian/debiankio/patches/fix-kio-cmake-nopython+xml.patch Normal file
View File

@ -0,0 +1,29 @@
diff --git a/kde/kioslave/kio_recoll/CMakeLists.txt b/kde/kioslave/kio_recoll/CMakeLists.txt
index 0c2de973..277f1578 100644
--- a/kde/kioslave/kio_recoll/CMakeLists.txt
+++ b/kde/kioslave/kio_recoll/CMakeLists.txt
@@ -42,7 +42,7 @@ set(rcltop ${CMAKE_CURRENT_SOURCE_DIR}/../../../)
# Execute recoll configuration to create autoconfig.h and version.h and
# generate a PIC lib
-execute_process(COMMAND ${rcltop}/configure --disable-static --disable-qtgui --disable-x11mon --prefix=${CMAKE_INSTALL_PREFIX} --mandir=${CMAKE_INSTALL_PREFIX}/share/man
+execute_process(COMMAND ${rcltop}/configure --disable-static --disable-qtgui --disable-x11mon --disable-python-chm --disable-python-module --prefix=${CMAKE_INSTALL_PREFIX} --mandir=${CMAKE_INSTALL_PREFIX}/share/man
WORKING_DIRECTORY ${rcltop}
)
@@ -82,10 +82,12 @@ add_dependencies(kio_recoll rcllib)
target_link_libraries(kio_recoll
recoll
xapian
-KF5::KIOCore
-dl
+xslt
+xml2
+KF5::KIOCore
+dl
z
-pthread
+pthread
)
install(FILES recoll.protocol recollf.protocol

1
packaging/debian/debiankio/patches/series
View File

@ -0,0 +1 @@
fix-kio-cmake-nopython+xml.patch

10
src/kde/kioslave/kio_recoll/CMakeLists.txt
View File

@ -42,7 +42,7 @@ set(rcltop ${CMAKE_CURRENT_SOURCE_DIR}/../../../)
# Execute recoll configuration to create autoconfig.h and version.h and
# generate a PIC lib
execute_process(COMMAND ${rcltop}/configure --disable-static --disable-qtgui --disable-x11mon --prefix=${CMAKE_INSTALL_PREFIX} --mandir=${CMAKE_INSTALL_PREFIX}/share/man
execute_process(COMMAND ${rcltop}/configure --disable-static --disable-qtgui --disable-x11mon --disable-python-chm --disable-python-module --prefix=${CMAKE_INSTALL_PREFIX} --mandir=${CMAKE_INSTALL_PREFIX}/share/man
WORKING_DIRECTORY ${rcltop}
)
@ -80,11 +80,13 @@ add_custom_target(rcllib
add_dependencies(kio_recoll rcllib)
target_link_libraries(kio_recoll
recoll
xapian
recoll
xapian
xslt
xml2
KF5::KIOCore
dl
z
z
pthread
)