[neon/qt/qttools/Neon/testing] debian: do not use webkit as it no longer builds

Jonathan Riddell null at kde.org
Thu Oct 22 18:17:55 BST 2020


Git commit c360d23889946a6f43a4e2aa97c6a16fcc2db3b1 by Jonathan Riddell.
Committed on 22/10/2020 at 17:17.
Pushed by jriddell into branch 'Neon/testing'.

do not use webkit as it no longer builds

M  +0    -2    debian/control
M  +0    -1    debian/qttools5-dev-tools.install.in
M  +2    -0    debian/qttools5-dev.install.in

https://invent.kde.org/neon/qt/qttools/commit/c360d23889946a6f43a4e2aa97c6a16fcc2db3b1

diff --git a/debian/control b/debian/control
index 6aa4bff..34e9008 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,6 @@ Build-Depends: debhelper (>= 12),
                libclang-dev (>= 1:3.9~) [amd64 arm64 armel armhf hurd-i386 i386 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsr6 mipsr6el powerpc ppc64 ppc64el riscv64 s390x sparc64],
                libqt5opengl5-dev (>= 5.15.1+dfsg~),
                libqt5sql5-sqlite (>= 5.15.1+dfsg~),
-               libqt5webkit5-dev (>= 5.212.0~alpha4-3~) [alpha amd64 arm64 armel armhf i386 mips64el mipsel ppc64 ppc64el riscv64 s390x sh4 x32],
-               libqt5webview5-dev,
                llvm-dev (>= 1:3.9~) [amd64 arm64 armel armhf hurd-i386 i386 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsr6 mipsr6el powerpc ppc64 ppc64el riscv64 s390x sparc64],
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.15.1+dfsg~),
diff --git a/debian/qttools5-dev-tools.install.in b/debian/qttools5-dev-tools.install.in
index cf18f8e..e959a4b 100644
--- a/debian/qttools5-dev-tools.install.in
+++ b/debian/qttools5-dev-tools.install.in
@@ -14,7 +14,6 @@ usr/lib/qt5/bin/qtdiag
 usr/lib/qt5/bin/qtpaths
 usr/lib/qt5/bin/qtplugininfo
 usr/lib/*/qt5/plugins/designer/libqquickwidget.so
-usr/lib/*/qt5/plugins/designer/libqwebview.so
 usr/share/qt5/phrasebooks/danish.qph
 usr/share/qt5/phrasebooks/dutch.qph
 usr/share/qt5/phrasebooks/finnish.qph
diff --git a/debian/qttools5-dev.install.in b/debian/qttools5-dev.install.in
index 62ac409..9cd2a47 100644
--- a/debian/qttools5-dev.install.in
+++ b/debian/qttools5-dev.install.in
@@ -170,3 +170,5 @@ usr/lib/*/qt5/mkspecs/modules/qt_lib_designer.pri
 usr/lib/*/qt5/mkspecs/modules/qt_lib_help.pri
 usr/lib/*/qt5/mkspecs/modules/qt_lib_uiplugin.pri
 usr/lib/*/qt5/mkspecs/modules/qt_lib_uitools.pri
+usr/include/*/qt5/QtHelp/qhelpfiltersettingswidget.h
+usr/include/*/qt5/QtHelp/QHelpFilterSettingsWidget


More information about the Neon-commits mailing list