Deb packaging: revert GUI to using webkit
This commit is contained in:
parent
44530f277b
commit
4ad7c71ff0
@ -8,14 +8,14 @@
|
|||||||
# 18.04LTS bionic 2023-04
|
# 18.04LTS bionic 2023-04
|
||||||
# 20.04LTS focal 2025-04
|
# 20.04LTS focal 2025-04
|
||||||
# 22.04LTS jammy 2027-04
|
# 22.04LTS jammy 2027-04
|
||||||
SERIES="bionic focal jammy"
|
SERIES="bionic focal jammy kinetic"
|
||||||
|
|
||||||
PPA_KEYID=7808CE96D38B9201
|
PPA_KEYID=7808CE96D38B9201
|
||||||
|
|
||||||
RCLVERS=1.32.7
|
RCLVERS=1.32.7
|
||||||
SCOPEVERS=1.20.2.4
|
SCOPEVERS=1.20.2.4
|
||||||
GSSPVERS=1.1.1
|
GSSPVERS=1.1.1
|
||||||
PPAVERS=2
|
PPAVERS=3
|
||||||
|
|
||||||
#
|
#
|
||||||
#Y=/y
|
#Y=/y
|
||||||
@ -29,7 +29,7 @@ case $RCLVERS in
|
|||||||
[23]*) PPANAME=recollexp-ppa;;
|
[23]*) PPANAME=recollexp-ppa;;
|
||||||
*) PPANAME=recoll15-ppa;;
|
*) PPANAME=recoll15-ppa;;
|
||||||
esac
|
esac
|
||||||
#PPANAME=recollexp2-ppa
|
#PPANAME=recollexp1-ppa
|
||||||
echo "PPA: $PPANAME. Type CR if Ok, else ^C"
|
echo "PPA: $PPANAME. Type CR if Ok, else ^C"
|
||||||
read rep
|
read rep
|
||||||
|
|
||||||
@ -51,7 +51,7 @@ check_recoll_orig()
|
|||||||
####### QT
|
####### QT
|
||||||
debdir=debian
|
debdir=debian
|
||||||
series=$SERIES
|
series=$SERIES
|
||||||
series=bionic
|
#series=bionic
|
||||||
|
|
||||||
if test "X$series" != X ; then
|
if test "X$series" != X ; then
|
||||||
check_recoll_orig
|
check_recoll_orig
|
||||||
|
|||||||
@ -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,
|
||||||
qtwebengine5-dev,
|
libqt5webkit5-dev,
|
||||||
libx11-dev,
|
libx11-dev,
|
||||||
libxapian-dev (>= 1.2.0),
|
libxapian-dev (>= 1.2.0),
|
||||||
libxslt1-dev,
|
libxslt1-dev,
|
||||||
|
|||||||
@ -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,
|
||||||
qtwebengine5-dev,
|
libqt5webkit5-dev,
|
||||||
libx11-dev,
|
libx11-dev,
|
||||||
libxapian-dev (>= 1.2.0),
|
libxapian-dev (>= 1.2.0),
|
||||||
libxslt1-dev,
|
libxslt1-dev,
|
||||||
|
|||||||
@ -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 --enable-webengine
|
dh_auto_configure -- --enable-recollq --enable-xadump --enable-webkit
|
||||||
|
|
||||||
build3vers := $(shell py3versions -sv)
|
build3vers := $(shell py3versions -sv)
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user