diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh index c3cbe4d7..fea8fe0c 100644 --- a/packaging/debian/buildppa.sh +++ b/packaging/debian/buildppa.sh @@ -11,7 +11,7 @@ PPA_KEYID=7808CE96D38B9201 -RCLVERS=1.32.4 +RCLVERS=1.32.5pre1 SCOPEVERS=1.20.2.4 GSSPVERS=1.1.1 PPAVERS=1 @@ -28,7 +28,7 @@ case $RCLVERS in [23]*) PPANAME=recollexp-ppa;; *) PPANAME=recoll15-ppa;; esac -PPANAME=recollexp1-ppa +PPANAME=recollexp2-ppa echo "PPA: $PPANAME. Type CR if Ok, else ^C" read rep @@ -50,7 +50,7 @@ check_recoll_orig() ####### QT debdir=debian series="bionic focal impish jammy" -series=focal +series="bionic impish jammy" if test "X$series" != X ; then check_recoll_orig diff --git a/packaging/debian/debian/changelog b/packaging/debian/debian/changelog index 8118b150..42c1c882 100644 --- a/packaging/debian/debian/changelog +++ b/packaging/debian/debian/changelog @@ -1,3 +1,9 @@ +recoll (1.32.5pre1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low + + * Experiments with webengine rendering + + -- Jean-Francois Dockes Fri, 01 Jul 2022 09:36:00 +0200 + recoll (1.32.4-1~ppaPPAVERS~SERIES1) SERIES; urgency=low * Try to improve font size consistency by using px sizes everywhere. diff --git a/packaging/debian/debian/control b/packaging/debian/debian/control index e2e19af4..492f07eb 100644 --- a/packaging/debian/debian/control +++ b/packaging/debian/debian/control @@ -8,7 +8,7 @@ Build-Depends: bison, dpkg-dev (>= 1.16.1~), libaspell-dev, libchm-dev, - libqt5webkit5-dev, + qtwebengine5-dev, libx11-dev, libxapian-dev (>= 1.2.0), libxslt1-dev, diff --git a/packaging/debian/debian/rules b/packaging/debian/debian/rules index 027c4cd1..5598d77f 100755 --- a/packaging/debian/debian/rules +++ b/packaging/debian/debian/rules @@ -24,7 +24,7 @@ endif dh $@ --with python2 --with python3 override_dh_auto_configure: - dh_auto_configure -- --enable-recollq --enable-xadump + dh_auto_configure -- --enable-recollq --enable-xadump --enable-webengine build3vers := $(shell py3versions -sv) diff --git a/src/RECOLL-VERSION.txt b/src/RECOLL-VERSION.txt index ef62e369..244bbbc9 100644 --- a/src/RECOLL-VERSION.txt +++ b/src/RECOLL-VERSION.txt @@ -1 +1 @@ -1.32.4 +1.32.5pre1 diff --git a/src/qtgui/reslist.cpp b/src/qtgui/reslist.cpp index 44a416d3..34a503ee 100644 --- a/src/qtgui/reslist.cpp +++ b/src/qtgui/reslist.cpp @@ -787,6 +787,24 @@ void ResList::append(const QString &text) #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() { resetView(); @@ -810,18 +828,7 @@ void ResList::displayPage() m_progress = nullptr; } const static QUrl baseUrl("file:///"); - - 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); - } - } - } + maybeDump(m_text); setHtml(m_text, baseUrl); #endif