bug#53289: [PATCH] gnu: Remove Qt WebKit.

[Leo Famulari]

On Wed, Jan 19, 2022 at 03:54:46PM +, Guillaume Le Vaillant wrote:
> Leo Famulari  skribis:
> 
> > New failures:
> > [...]
> > freecad
> 
> For freecad, the qtwebkit input can be replaced by qtdeclarative,
> qtwebchannel and qtwebengine.

Thanks, I sent a patch as .


signature.asc
Description: PGP signature

bug#53289: [PATCH] gnu: Remove Qt WebKit.

[Guillaume Le Vaillant]

Leo Famulari  skribis:

> New failures:
> [...]
> freecad

For freecad, the qtwebkit input can be replaced by qtdeclarative,
qtwebchannel and qtwebengine.


signature.asc
Description: PGP signature

bug#53289: [PATCH] gnu: Remove Qt WebKit.

[Guillaume Le Vaillant]

Leo Famulari  skribis:

> I applied the patch and tried building all packages that are changed by
> the it.
>
> New failures:
> qgis
> [...]

For qgis, adding "-DWITH_QTWEBKIT=NO" to 'configure-flags' should work,
but I don't know what features would then be unavailable in the
application.


signature.asc
Description: PGP signature

bug#53289: [PATCH] gnu: Remove Qt WebKit.

[Leo Famulari]

On Sat, Jan 15, 2022 at 02:38:48PM -0500, Leo Famulari wrote:
> Preliminary untested patch!

I applied the patch and tried building all packages that are changed by
the it.

New failures:
qgis
quiterss
kdevelop
psi
qsyncthingtray
freecad

Still succeeding (there could be some run-time breakage, however):
shotcut
texmaker
nextcloud-client
gnuradio
dream
kdenlive
libksysguard
k3b
choqok
ktorrent
sonnet
kdesignerplugin
fcitx5-qt
python-pyqt

Still failing (we should remove these packages now if they don't build):
luminance-hdr
aseba
kmessagelib

bug#53289: [PATCH] gnu: Remove Qt WebKit.

[Leo Famulari]

Preliminary untested patch!

* gnu/packages/qt.scm (qtwebkit): Remove variable.
(python-pyqt)[inputs]: Remove qtwebkit.
(python-pyqt-without-qtwebkit): Remove variable.
* gnu/packages/kde-frameworks.scm (kdewebkit): Remove variable.

* gnu/packages/engineering.scm (freecad)[inputs]: Remove qtwebkit.
* gnu/packages/fcitx5.scm (fcitx5-qt)[inputs]: Remove qtwebkit.
* gnu/packages/geo.scm (qgis): Remove qtwebkit.
* gnu/packages/image-viewers.scm (luminance-hdr)[inputs]: Remove qtwebkit.
* gnu/packages/kde-frameworks.scm (kdesignerplugin)[inputs]: Remove qtwebkit 
and kdewebkit.
* gnu/packages/kde-internet.scm (sonnet)[inputs]: Remove qtwebkit.
(ktorrent)[inputs]: Remove qtwebkit and kdewebkit.
(choqok)[inputs]: Remove kdewebkit.
* gnu/packages/kde-multimedia.scm (k3b)[inputs]: Remove qtwebkit.
* gnu/packages/kde-pim.scm (kmessagelib)[inputs]: Remove qtwebkit.
* gnu/packages/kde-pim.scm (libksysguard)[inputs]: Remove qtwebkit.
* gnu/packages/kde.scm (kdenlive)[inputs]: Likewise.
(kdevelop)[inputs]: Likewise.
* gnu/packages/messaging.scm (psi)[inputs]: Remove qtwebkit.
* gnu/packages/radio.scm (dream)[inputs]: Remove qtwebkit.
(gnuradio): Replace python-pyqt-without-qtwebkit with python-pyqt.
* gnu/packages/robotics.scm (aseba)[inputs]: Remove qtwebkit.
* gnu/packages/sync.scm (nextcloud-client)[inputs]: Remove qtwebkit.
(qsyncthingtray)[inputs]: Remove qtwebkit.
* gnu/packages/syndication.scm (quiterss)[inputs]: Remove qtwebkit.
* gnu/packages/tex.scm (texmaker)[inputs]: Remove qtwebkit.
* gnu/packages/video.scm (shotcut)[inputs]: Remove qtwebkit.
* gnu/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch,
  gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch,
gnu/packages/patches/qtwebkit-fix-building-with-icu-68.patch,
gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch,
gnu/packages/patches/qtwebkit-pbutils-include.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Remove them.
---
 gnu/local.mk  |   5 -
 gnu/packages/engineering.scm  |   1 -
 gnu/packages/fcitx5.scm   |   3 +-
 gnu/packages/geo.scm  |   1 -
 gnu/packages/image-viewers.scm|   1 -
 gnu/packages/kde-frameworks.scm   |  34 
 gnu/packages/kde-internet.scm |   4 -
 gnu/packages/kde-multimedia.scm   |   1 -
 gnu/packages/kde-pim.scm  |   1 -
 gnu/packages/kde-plasma.scm   |   1 -
 gnu/packages/kde.scm  |   2 -
 gnu/packages/messaging.scm|   1 -
 ...qtwebkit-fix-building-with-bison-3.7.patch |  54 ---
 ...qtwebkit-fix-building-with-glib-2.68.patch |  21 ---
 .../qtwebkit-fix-building-with-icu-68.patch   | 152 --
 ...twebkit-fix-building-with-python-3.9.patch |  35 
 .../patches/qtwebkit-pbutils-include.patch|  15 --
 gnu/packages/qt.scm   |  93 ---
 gnu/packages/radio.scm|   2 -
 gnu/packages/robotics.scm |   1 -
 gnu/packages/sync.scm |   3 +-
 gnu/packages/syndication.scm  |   2 +-
 gnu/packages/tex.scm  |   2 +-
 gnu/packages/video.scm|   1 -
 24 files changed, 4 insertions(+), 432 deletions(-)
 delete mode 100644 
gnu/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch
 delete mode 100644 
gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch
 delete mode 100644 gnu/packages/patches/qtwebkit-fix-building-with-icu-68.patch
 delete mode 100644 
gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch
 delete mode 100644 gnu/packages/patches/qtwebkit-pbutils-include.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 0eed20e7af..ea0bde5313 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1731,11 +1731,6 @@ dist_patch_DATA =
\
   %D%/packages/patches/qtscript-disable-tests.patch\
   %D%/packages/patches/quagga-reproducible-build.patch  \
   %D%/packages/patches/quickswitch-fix-dmenu-check.patch   \
-  %D%/packages/patches/qtwebkit-pbutils-include.patch  \
-  %D%/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch \
-  %D%/packages/patches/qtwebkit-fix-building-with-python-3.9.patch \
-  %D%/packages/patches/qtwebkit-fix-building-with-icu-68.patch \
-  %D%/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch  \
   %D%/packages/patches/ragel-char-signedness.patch \
   %D%/packages/patches/randomjungle-disable-static-build.patch \
   %D%/packages/patches/range-v3-build-with-gcc10.patch \
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index d27ad677bb..ac695a2c73 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2485,7 +2485,6 @@ (define-public freecad
python-wrapper
qtbase-5