gnu: qtwebengine: Rename to qtwebengine-5.

Automated with:

  git grep -l qtwebengine | xargs sed 's/\bqtwebengine\b/\0-5/g' -i
  git checkout NEWS
This commit is contained in:
Maxim Cournoyer 2022-07-18 07:57:16 -04:00
parent ef648459df
commit a0beb297a3
No known key found for this signature in database
GPG key ID: 1260E46482E63562
19 changed files with 42 additions and 42 deletions

View file

@ -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

View file

@ -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)))

View file

@ -202,7 +202,7 @@ (define-public calibre
python-regex
speech-dispatcher
python-zeroconf
qtwebengine
qtwebengine-5
sqlite))
(arguments
(list

View file

@ -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

View file

@ -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

View file

@ -2493,7 +2493,7 @@ (define-public freecad
qtdeclarative-5
qtsvg-5
qtwebchannel-5
qtwebengine
qtwebengine-5
qtx11extras
qtxmlpatterns
sqlite

View file

@ -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"))

View file

@ -1961,7 +1961,7 @@ (define-public qmapshack
qtdeclarative-5
qtlocation
qtwebchannel-5
qtwebengine
qtwebengine-5
quazip
routino
sqlite ; See wrap phase

View file

@ -531,7 +531,7 @@ (define-public luminance-hdr
libjpeg-turbo
lcms
openexr-2
qtwebengine
qtwebengine-5
qtdeclarative-5
qtwebchannel-5
fftwf

View file

@ -605,7 +605,7 @@ (define-public jami
network-manager
qrencode
qtsvg-5
qtwebengine
qtwebengine-5
qtwebchannel-5
qtmultimedia-5
qtdeclarative-5

View file

@ -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

View file

@ -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))

View file

@ -2913,7 +2913,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

View file

@ -2011,7 +2011,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")
@ -2206,7 +2206,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"
@ -2324,7 +2324,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\\)")
@ -2354,7 +2354,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"
@ -2647,7 +2647,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))
@ -3358,7 +3358,7 @@ (define-public python-pyside-2
qtspeech
qtsvg-5
qtwebchannel-5
qtwebengine
qtwebengine-5
qtwebsockets-5
qtx11extras
qtxmlpatterns))
@ -3408,7 +3408,7 @@ (define-public python-pyside-2
"qtsvg-5"
"qttools"
"qtwebchannel-5"
"qtwebengine"
"qtwebengine-5"
"qtwebsockets-5"
"qtx11extras"
"qtxmlpatterns"))))

View file

@ -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.")

View file

@ -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

View file

@ -737,7 +737,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")
@ -757,7 +757,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")

View file

@ -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)))))))))

View file

@ -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")))