From 6cdce14bb88eebfc7da1a5aa3f59eab663550589 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Thu, 25 Aug 2022 18:19:51 +0800 Subject: [PATCH 2/9] gnu: python-pyqtwebengine: Rename to python-pyqtwebengine-5. Automated via the follownig commands: git grep -l '\bpython-pyqtwebengine\b' | xargs sed -E 's/python-pyqtwebengine/\0-5/g' -i --- gnu/packages/ebook.scm | 2 +- gnu/packages/education.scm | 4 ++-- gnu/packages/orange.scm | 2 +- gnu/packages/qt.scm | 6 +++--- gnu/packages/vpn.scm | 2 +- gnu/packages/web-browsers.scm | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index c3a27cb113..edcf7b486f 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -198,7 +198,7 @@ (define-public calibre python-pychm python-pygments python-pyqt-without-qtwebkit - python-pyqtwebengine + python-pyqtwebengine-5 python-regex speech-dispatcher python-zeroconf diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index c5666fb02e..3c574b4176 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -801,8 +801,8 @@ (define-public anki ("python-jsonschema" ,python-jsonschema) ("python-markdown" ,python-markdown) ("python-pyaudio" ,python-pyaudio) - ;; `python-pyqtwebengine' must precede `python-pyqt' in PYTHONPATH. - ("python-pyqtwebengine" ,python-pyqtwebengine) + ;; `python-pyqtwebengine-5' must precede `python-pyqt' in PYTHONPATH. + ("python-pyqtwebengine-5" ,python-pyqtwebengine-5) ("python-pyqt" ,python-pyqt-without-qtwebkit) ("python-requests" ,python-requests) ("python-send2trash" ,python-send2trash) diff --git a/gnu/packages/orange.scm b/gnu/packages/orange.scm index 367c9cc288..ef6f36d8a8 100644 --- a/gnu/packages/orange.scm +++ b/gnu/packages/orange.scm @@ -162,7 +162,7 @@ (define-public orange python-pygments python-pyqt-without-qtwebkit python-pyqtgraph - python-pyqtwebengine + python-pyqtwebengine-5 python-pyyaml python-qtconsole python-requests diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 1f8e51c667..e6779e333a 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3025,7 +3025,7 @@ (define-public python-pyqt ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases - ;; When building python-pyqtwebengine, can not be + ;; When building python-pyqtwebengine-5, can not be ;; included. Here we substitute the full path to the header in the ;; store. (add-before 'configure 'substitute-source @@ -3103,7 +3103,7 @@ (define-public python-pyqt6-sip (synopsis "Sip module support for PyQt6") (description "Sip module support for PyQt6"))) -(define-public python-pyqtwebengine +(define-public python-pyqtwebengine-5 (package (name "python-pyqtwebengine") (version "5.15.2") @@ -3187,7 +3187,7 @@ (define-public python-pyqtwebengine (license license:gpl3))) ;; XXX: This is useful for removing qtwebkit from other packages' dependency -;; graphs, as well as for preventing python-pyqtwebengine from transitively +;; graphs, as well as for preventing python-pyqtwebengine-5 from transitively ;; depending on qtwebkit. ;; Ultimately, it would be nicer to have a more modular set of python-pyqt-* ;; packages that could be used together. diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 1ec619b0c2..eeb5991303 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -751,7 +751,7 @@ (define-public openconnect-sso python-prompt-toolkit python-requests python-pyqt-without-qtwebkit - python-pyqtwebengine + python-pyqtwebengine-5 python-pysocks python-pyxdg python-structlog diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 68d27a838b..8708efdb56 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -488,11 +488,11 @@ (define-public qutebrowser python-pygments python-pynacl python-pyyaml - ;; FIXME: python-pyqtwebengine needs to come before python-pyqt so + ;; FIXME: python-pyqtwebengine-5 needs to come before python-pyqt so ;; that it's __init__.py is used first. - python-pyqtwebengine + python-pyqtwebengine-5 python-pyqt-without-qtwebkit - ;; While qtwebengine-5 is provided by python-pyqtwebengine, it's + ;; While qtwebengine-5 is provided by python-pyqtwebengine-5, it's ;; included here so we can wrap QTWEBENGINEPROCESS_PATH. qtwebengine-5)) (arguments -- 2.37.2