Subject: [PATCH 20/33] gnu: qtwebengine: Rename to qtwebengine-5.

From: Maxim Cournoyer <[email-masked]>
Date: Mon, 25 Jul 2022 19:07:50 -0400

Automated with:

  git grep -l qtwebengine | xargs sed 's/\bqtwebengine\b/\0-5/g' -i
  git checkout NEWS
---
 gnu/packages/audio.scm         |  2 +-
 gnu/packages/documentation.scm |  4 ++--
 gnu/packages/ebook.scm         |  2 +-
 gnu/packages/education.scm     | 10 +++++-----
 gnu/packages/emacs-xyz.scm     |  2 +-
 gnu/packages/engineering.scm   |  2 +-
 gnu/packages/fcitx5.scm        |  2 +-
 gnu/packages/geo.scm           |  2 +-
 gnu/packages/image-viewers.scm |  2 +-
 gnu/packages/jami.scm          |  2 +-
 gnu/packages/kde-pim.scm       | 12 ++++++------
 gnu/packages/kde.scm           |  6 +++---
 gnu/packages/messaging.scm     |  2 +-
 gnu/packages/qt.scm            | 14 +++++++-------
 gnu/packages/sync.scm          |  2 +-
 gnu/packages/text-editors.scm  |  2 +-
 gnu/packages/vpn.scm           |  4 ++--
 gnu/packages/web-browsers.scm  |  8 ++++----
 gnu/packages/web.scm           |  4 ++--
 19 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index dc6fc94845..7a59530e89 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3237,7 +3237,7 @@ (define-public supercollider
                   qtwebchannel-5
                   qtwebsockets-5))
     (propagated-inputs                  ;to get native-search-path
-     (list qtwebengine))
+     (list qtwebengine-5))
     (home-page "https://github.com/supercollider/supercollider")
     (synopsis "Synthesis engine and programming language")
     (description "SuperCollider is a synthesis engine (@code{scsynth} or
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index 32dc26868d..6f24149b5d 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -371,7 +371,7 @@ (define-public zeal
                (let* ((out (assoc-ref outputs "out"))
                       (bin (string-append out "/bin/zeal"))
                       (qt-process-path (string-append
-                                        (assoc-ref inputs "qtwebengine")
+                                        (assoc-ref inputs "qtwebengine-5")
                                         "/lib/qt5/libexec/QtWebEngineProcess")))
                  (wrap-program bin
                    `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))
@@ -384,7 +384,7 @@ (define-public zeal
          ("qtbase" ,qtbase-5)
          ("qtdeclarative-5" ,qtdeclarative-5)
          ("qtwebchannel-5" ,qtwebchannel-5)
-         ("qtwebengine" ,qtwebengine)
+         ("qtwebengine-5" ,qtwebengine-5)
          ("qtquickcontrols-5" ,qtquickcontrols-5)
          ("qtx11extras" ,qtx11extras)
          ("xcb-util-keyms" ,xcb-util-keysyms)))
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 5d864da281..ccc0bdf88d 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -202,7 +202,7 @@ (define-public calibre
            python-regex
            speech-dispatcher
            python-zeroconf
-           qtwebengine
+           qtwebengine-5
            sqlite))
     (arguments
      (list
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 5551fd0594..aabf3dfc21 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -448,7 +448,7 @@ (define-public toutenclic
 (define-public openboard
   ;; The last release builds from qtwebkit, which is planned for removal in
   ;; Guix, so use the latest commit of the 1.7-dev branch, which builds with
-  ;; qtwebengine.
+  ;; qtwebengine-5.
   (let ((commit "39e914f600d26565706f0e5b6ea2482b8b4038c7") ;1.6.2-rc0311
         (revision "1"))
     (package
@@ -562,7 +562,7 @@ (define-public openboard
              qtmultimedia-5
              qtsvg-5
              qtwebchannel-5
-             qtwebengine
+             qtwebengine-5
              qtxmlpatterns
              quazip-0
              sdl
@@ -807,9 +807,9 @@ (define-public anki
        ("python-requests" ,python-requests)
        ("python-send2trash" ,python-send2trash)
        ("python-sip" ,python-sip)
-       ;; `qtwebengine' is included in `pyqtwebengine', included here for easy
+       ;; `qtwebengine-5' is included in `pyqtwebengine', included here for easy
        ;; wrapping.
-       ("qtwebengine" ,qtwebengine)))
+       ("qtwebengine-5" ,qtwebengine-5)))
     (home-page "https://apps.ankiweb.net/")
     (synopsis "Powerful, intelligent flash cards")
     (description "Anki is a program which makes remembering things
@@ -999,7 +999,7 @@ (define-public qolibri
            qtquickcontrols2-5
            qtdeclarative-5
            qtwebchannel-5
-           qtwebengine
+           qtwebengine-5
            zlib))
     (synopsis "EPWING dictionary reader")
     (description "qolibri is a dictionary viewer for the EPWING dictionary
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 702378c206..a5ae7b9567 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13111,7 +13111,7 @@ (define-public emacs-org-contrib
        (sha256
         (base32 "17aca4mc3gbdh6nhlcaa5ymh1yy76nwysrvy9sfcqkzvd5lgagzc"))
        ;; XXX: ob-sclang.el is packaged separately to avoid the dependency on
-       ;; SuperCollider and qtwebengine.  This will be unnecessary in 0.4+
+       ;; SuperCollider and qtwebengine-5.  This will be unnecessary in 0.4+
        ;; release as the file is going to be removed from the repository.
 
        ;; XXX: org-contacts.el is now maintained in a separate repository and
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 463b90cd97..5a6560669d 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2493,7 +2493,7 @@ (define-public freecad
            qtdeclarative-5
            qtsvg-5
            qtwebchannel-5
-           qtwebengine
+           qtwebengine-5
            qtx11extras
            qtxmlpatterns
            sqlite
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index ea7f1be752..00648ea963 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -394,7 +394,7 @@ (define-public fcitx5-chinese-addons
        ("fcitx5-qt" ,fcitx5-qt)
        ("qtdeclarative-5" ,qtdeclarative-5)
        ("qtwebchannel-5" ,qtwebchannel-5)
-       ("qtwebengine" ,qtwebengine)))
+       ("qtwebengine-5" ,qtwebengine-5)))
     (native-inputs
      (list extra-cmake-modules pkg-config))
     (outputs '("out" "gui"))
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 324178181c..b8125ffe6e 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1961,7 +1961,7 @@ (define-public qmapshack
            qtdeclarative-5
            qtlocation
            qtwebchannel-5
-           qtwebengine
+           qtwebengine-5
            quazip
            routino
            sqlite ; See wrap phase
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 81b097df07..045fdae882 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -531,7 +531,7 @@ (define-public luminance-hdr
            libjpeg-turbo
            lcms
            openexr-2
-           qtwebengine
+           qtwebengine-5
            qtdeclarative-5
            qtwebchannel-5
            fftwf
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 2583a59a26..22d2f0c5ce 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -605,7 +605,7 @@ (define-public jami
            network-manager
            qrencode
            qtsvg-5
-           qtwebengine
+           qtwebengine-5
            qtwebchannel-5
            qtmultimedia-5
            qtdeclarative-5
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index b78c4b8c45..f0f5683ac5 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -728,7 +728,7 @@ (define-public kdepim-runtime
            qtnetworkauth
            qtspeech
            qtwebchannel-5
-           qtwebengine
+           qtwebengine-5
            qtxmlpatterns))
     (arguments
       ;; TODO: 5/45 tests fail for quite different reasons, even with
@@ -1072,7 +1072,7 @@ (define-public kmail
            qtbase-5
            qtdeclarative-5
            qtwebchannel-5
-           qtwebengine
+           qtwebengine-5
            sonnet))
     (arguments
      `(#:phases
@@ -1324,7 +1324,7 @@ (define-public kmessagelib
            qtbase-5
            qtdeclarative-5
            qtwebchannel-5
-           qtwebengine
+           qtwebengine-5
            qtwebkit
            sonnet))
     (arguments
@@ -1656,7 +1656,7 @@ (define-public kpimcommon
            libxslt
            purpose
            qtbase-5
-           qtwebengine))
+           qtwebengine-5))
     (arguments
      `(#:tests? #f)) ;; TODO tests hang
     (home-page "https://invent.kde.org/pim/pimcommon")
@@ -1850,7 +1850,7 @@ (define-public libkgapi
            qtbase-5
            qtdeclarative-5
            qtwebchannel-5
-           qtwebengine))
+           qtwebengine-5))
     (arguments
      `(#:tests? #f)) ;; TODO 6/48 tests fail
     (home-page "https://invent.kde.org/pim/libkgapi")
@@ -1933,7 +1933,7 @@ (define-public libksieve
            qtbase-5
            qtdeclarative-5
            qtwebchannel-5
-           qtwebengine))
+           qtwebengine-5))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 6e9d9d125f..c43758ef7f 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -170,7 +170,7 @@ (define-public akregator
              (let* ((out (assoc-ref outputs "out"))
                     (bin (string-append out "/bin/akregator"))
                     (qt-process-path (string-append
-                                       (assoc-ref inputs "qtwebengine")
+                                       (assoc-ref inputs "qtwebengine-5")
                                        "/lib/qt5/libexec/QtWebEngineProcess")))
                (wrap-program bin
                  `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))
@@ -207,7 +207,7 @@ (define-public akregator
            qtbase-5
            qtdeclarative-5
            qtwebchannel-5
-           qtwebengine
+           qtwebengine-5
            syndication))
     (home-page "https://apps.kde.org/en/akregator")
     (synopsis "KDE Feed Reader")
@@ -1029,7 +1029,7 @@ (define-public marble-qt
            qtserialport
            qtsvg-5
            qtwebchannel-5
-           qtwebengine
+           qtwebengine-5
            shapelib
            shared-mime-info
            zlib))
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index c7457022c0..b047ee0d9f 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2912,7 +2912,7 @@ (define-public movim-desktop
       (inputs
        (list qtbase-5 qtdeclarative-5 qtwebchannel-5))
       (propagated-inputs
-       (list qtwebengine))
+       (list qtwebengine-5))
       (home-page "https://movim.eu/")
       (synopsis "Desktop Application for Movim")
       (description
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b051fc5fe5..578837fb14 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2013,7 +2013,7 @@ (define-public qtspell
     ;; COPYING file specify GPL3, but source code files all refer to GPL2+.
     (license license:gpl2+)))
 
-(define-public qtwebengine
+(define-public qtwebengine-5
   (package
     (inherit qtsvg-5)
     (name "qtwebengine")
@@ -2208,7 +2208,7 @@ (define (delete-unwanted-files child stat flag base level)
                  (_ #t)))
 
              (with-directory-excursion "src/3rdparty"
-               ;; TODO: Try removing "gn" too for future versions of qtwebengine.
+               ;; TODO: Try removing "gn" too for future versions of qtwebengine-5.
                (delete-file-recursively "ninja")
 
                (with-directory-excursion "chromium"
@@ -2326,7 +2326,7 @@ (define (delete-unwanted-files child stat flag base level)
                     (display "\ngn_args += use_system_openh264=true\n" out)))
                  ;; Qtwebengine is not installed into the same prefix as
                  ;; qtbase.  Some qtbase QTLibraryInfo constants will not
-                 ;; work.  Replace with the full path to the qtwebengine
+                 ;; work.  Replace with the full path to the qtwebengine-5
                  ;; translations and locales in the store.
                  (substitute* "src/core/web_engine_library_info.cpp"
                    (("QLibraryInfo::location\\(QLibraryInfo::TranslationsPath\\)")
@@ -2356,7 +2356,7 @@ (define (delete-unwanted-files child stat flag base level)
                (invoke "qmake" "QT_BUILD_PARTS = libs tools" "--"
                        "--webengine-printing-and-pdf=no"
                        "--webengine-ffmpeg=system"
-                       ;; FIXME: Building qtwebengine 5.12.2 with
+                       ;; FIXME: Building qtwebengine-5 5.12.2 with
                        ;; icu4c >= 68 fails.
                        ;;"--webengine-icu=system"
                        "--webengine-pepper-plugins=no"
@@ -2649,7 +2649,7 @@ (define-public python-pyqtwebengine
        ("qtsvg-5" ,qtsvg-5)
        ("qtdeclarative-5" ,qtdeclarative-5)
        ("qtwebchannel-5" ,qtwebchannel-5)
-       ("qtwebengine" ,qtwebengine)))
+       ("qtwebengine-5" ,qtwebengine-5)))
     (arguments
      `(#:modules ((srfi srfi-1)
                   ((guix build python-build-system) #:select (python-version))
@@ -3360,7 +3360,7 @@ (define-public python-pyside-2
            qtspeech
            qtsvg-5
            qtwebchannel-5
-           qtwebengine
+           qtwebengine-5
            qtwebsockets-5
            qtx11extras
            qtxmlpatterns))
@@ -3410,7 +3410,7 @@ (define-public python-pyside-2
                                 "qtsvg-5"
                                 "qttools"
                                 "qtwebchannel-5"
-                                "qtwebengine"
+                                "qtwebengine-5"
                                 "qtwebsockets-5"
                                 "qtx11extras"
                                 "qtxmlpatterns"))))
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 10aef0c83a..5b82e0ca3d 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -201,7 +201,7 @@ (define-public nextcloud-client
            xdg-utils
            zlib))
     (propagated-inputs
-     (list qtwebengine))
+     (list qtwebengine-5))
     (synopsis "Desktop sync client for Nextcloud")
     (description "Nextcloud-Desktop is a tool to synchronize files from
 Nextcloud Server with your computer.")
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index acf0400b75..345454bd62 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -673,7 +673,7 @@ (define-public ghostwriter
            qtsvg-5
            qtwebchannel-5))
     (propagated-inputs                  ; To get native-search-path
-     (list qtwebengine))
+     (list qtwebengine-5))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index ccba5b9968..df891ea09c 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -736,7 +736,7 @@ (define-public openconnect-sso
              (let* ((out (assoc-ref outputs "out"))
                     (bin (string-append out "/bin/openconnect-sso"))
                     (qt-process-path (string-append
-                                       (assoc-ref inputs "qtwebengine")
+                                       (assoc-ref inputs "qtwebengine-5")
                                        "/lib/qt5/libexec/QtWebEngineProcess")))
                (wrap-program bin
                  #:sh (search-input-file inputs "bin/bash")
@@ -756,7 +756,7 @@ (define-public openconnect-sso
            python-pyxdg
            python-structlog
            python-toml
-           qtwebengine))
+           qtwebengine-5))
     (native-inputs
      (list python-pytest python-setuptools-scm))
     (home-page "https://github.com/vlaci/openconnect-sso")
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 751478c3d1..f47db2e752 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -492,11 +492,11 @@ (define-public qutebrowser
            ;; that it's __init__.py is used first.
            python-pyqtwebengine
            python-pyqt-without-qtwebkit
-           ;; While qtwebengine is provided by python-pyqtwebengine, it's
+           ;; While qtwebengine-5 is provided by python-pyqtwebengine, it's
            ;; included here so we can wrap QTWEBENGINEPROCESS_PATH.
-           qtwebengine))
+           qtwebengine-5))
     (arguments
-     `(;; FIXME: With the existance of qtwebengine, tests can now run.  But
+     `(;; FIXME: With the existance of qtwebengine-5, tests can now run.  But
        ;; they are still disabled because test phase hangs.  It's not readily
        ;; apparent as to why.
        #:tests? #f
@@ -543,7 +543,7 @@ (define-public qutebrowser
              (let* ((out (assoc-ref outputs "out"))
                     (bin (string-append out "/bin/qutebrowser"))
                     (qt-process-path (string-append
-                                      (assoc-ref inputs "qtwebengine")
+                                      (assoc-ref inputs "qtwebengine-5")
                                       "/lib/qt5/libexec/QtWebEngineProcess")))
                (wrap-program bin
                  `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))))))))
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 5f68d401ac..7b84f18d4e 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -8078,7 +8078,7 @@ (define-public kiwix-desktop
              (let* ((out (assoc-ref outputs "out"))
                     (bin (string-append out "/bin/kiwix-desktop"))
                     (qt-process-path (string-append
-                                      (assoc-ref inputs "qtwebengine")
+                                      (assoc-ref inputs "qtwebengine-5")
                                       "/lib/qt5/libexec/QtWebEngineProcess")))
                (wrap-program bin
                  `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))
@@ -8093,7 +8093,7 @@ (define-public kiwix-desktop
            qtbase-5
            qtdeclarative-5
            qtwebchannel-5
-           qtwebengine
+           qtwebengine-5
            xapian
            zlib
            `(,zstd "lib")))
-- 
2.36.1