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

1325prex experiments

Browse Source
This commit is contained in:
Jean-Francois Dockes 2022-07-01 09:41:10 +02:00
parent e7074329b5
commit 3560b9e3b0
6 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packaging/debian/buildppa.sh
View File

@ -11,7 +11,7 @@
PPA_KEYID=7808CE96D38B9201 PPA_KEYID=7808CE96D38B9201
RCLVERS=1.32.4 RCLVERS=1.32.5pre1
SCOPEVERS=1.20.2.4 SCOPEVERS=1.20.2.4
GSSPVERS=1.1.1 GSSPVERS=1.1.1
PPAVERS=1 PPAVERS=1
@ -28,7 +28,7 @@ case $RCLVERS in
[23]*) PPANAME=recollexp-ppa;; [23]*) PPANAME=recollexp-ppa;;
*) PPANAME=recoll15-ppa;; *) PPANAME=recoll15-ppa;;
esac esac
PPANAME=recollexp1-ppa PPANAME=recollexp2-ppa
echo "PPA: $PPANAME. Type CR if Ok, else ^C" echo "PPA: $PPANAME. Type CR if Ok, else ^C"
read rep read rep
@ -50,7 +50,7 @@ check_recoll_orig()
####### QT ####### QT
debdir=debian debdir=debian
series="bionic focal impish jammy" series="bionic focal impish jammy"
series=focal series="bionic impish jammy"
if test "X$series" != X ; then if test "X$series" != X ; then
check_recoll_orig check_recoll_orig

6
packaging/debian/debian/changelog
View File

@ -1,3 +1,9 @@
recoll (1.32.5pre1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
* Experiments with webengine rendering
-- Jean-Francois Dockes <jf@dockes.org> Fri, 01 Jul 2022 09:36:00 +0200
recoll (1.32.4-1~ppaPPAVERS~SERIES1) SERIES; urgency=low recoll (1.32.4-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
* Try to improve font size consistency by using px sizes everywhere. * Try to improve font size consistency by using px sizes everywhere.

2
packaging/debian/debian/control
View File

@ -8,7 +8,7 @@ Build-Depends: bison,
dpkg-dev (>= 1.16.1~), dpkg-dev (>= 1.16.1~),
libaspell-dev, libaspell-dev,
libchm-dev, libchm-dev,
libqt5webkit5-dev, qtwebengine5-dev,
libx11-dev, libx11-dev,
libxapian-dev (>= 1.2.0), libxapian-dev (>= 1.2.0),
libxslt1-dev, libxslt1-dev,

2
packaging/debian/debian/rules
View File

@ -24,7 +24,7 @@ endif
dh $@ --with python2 --with python3 dh $@ --with python2 --with python3
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure -- --enable-recollq --enable-xadump dh_auto_configure -- --enable-recollq --enable-xadump --enable-webengine
build3vers := $(shell py3versions -sv) build3vers := $(shell py3versions -sv)

2
src/RECOLL-VERSION.txt
View File

@ -1 +1 @@
1.32.4 1.32.5pre1

31
src/qtgui/reslist.cpp
View File

@ -787,6 +787,24 @@ void ResList::append(const QString &text)
#endif #endif
} }
static void maybeDump(const QString& text)
{
std::string dumpfile;
if (!theconfig->getConfParam("reslisthtmldumpfile", dumpfile) || dumpfile.empty()) {
return;
}
dumpfile = path_tildexpand(dumpfile);
if (path_exists(dumpfile)) {
return;
}
auto fp = fopen(dumpfile.c_str(), "w");
if (fp) {
auto s = qs2utf8s(text);
fwrite(s.c_str(), 1, s.size(), fp);
fclose(fp);
}
}
void ResList::displayPage() void ResList::displayPage()
{ {
resetView(); resetView();
@ -810,18 +828,7 @@ void ResList::displayPage()
m_progress = nullptr; m_progress = nullptr;
} }
const static QUrl baseUrl("file:///"); const static QUrl baseUrl("file:///");
maybeDump(m_text);
std::string dumpfile;
if (theconfig->getConfParam("reslisthtmldumpfile", dumpfile)) {
if (!dumpfile.empty() && !path_exists(dumpfile)) {
auto fp = fopen(dumpfile.c_str(), "w");
if (fp) {
auto s = qs2utf8s(m_text);
fwrite(s.c_str(), 1, s.size(), fp);
fclose(fp);
}
}
}
setHtml(m_text, baseUrl); setHtml(m_text, baseUrl);
#endif #endif