ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-15 03:15:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: qutebrowser: Update to 3.1.0.

Browse source 
* gnu/packages/web-browsers (qutebrowser): Update to 3.1.0.
[inputs]: Use PyQt6, placed before PyQtWebengine.
[arguments]: Replace qt5 path with qt6 path and wrap program with
QTWEBENGINE_RESOURCES_PATH.
[description]: Replace PyQt5 with PyQt6.

Signed-off-by: Clément Lassieur <clement@lassieur.org>
This commit is contained in:
Herman Rimm 2023-12-25 18:22:35 +01:00 committed by Clément Lassieur
parent bcc9cd1aae
commit 3f301ddc4f
No known key found for this signature in database
GPG key ID: 89F96D4808F359C7
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/web-browsers.scm
View file

@ -21,6 +21,7 @@
;;; Copyright © 2021 Alexander Krotov <krotov@iitp.ru>
;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2021 Christopher Howard <christopher@librehacker.com>
;;; Copyright © 2023 Herman Rimm <herman@rimm.ee>
;;;
;;; This file is part of GNU Guix.
;;;
@ -460,7 +461,7 @@ (define-public kristall
(define-public qutebrowser
(package
(name "qutebrowser")
(version "2.5.4")
(version "3.1.0")
(source
(origin
(method url-fetch)
@ -468,7 +469,7 @@ (define-public qutebrowser
"qutebrowser/releases/download/v" version "/"
"qutebrowser-" version ".tar.gz"))
(sha256
(base32 "1c8skkc5vjbvbslz65hzrj9d05v4zbcjbli61ikjmr174lhb4q54"))))
(base32 "0prf9c7nx4aizfczjb0fpsn3alz210i6wc7s2jwb1mh8r8fcq3ah"))))
(build-system python-build-system)
(native-inputs
(list python-attrs)) ; for tests
@ -481,15 +482,13 @@ (define-public qutebrowser
python-pynacl
python-pypeg2
python-pyyaml
;; FIXME: python-pyqtwebengine needs to come before python-pyqt so
;; that it's __init__.py is used first.
python-pyqtwebengine
python-pyqt
;; While qtwebengine-5 is provided by python-pyqtwebengine, it's
python-pyqt-6
python-pyqtwebengine-6
;; While qtwebengine is provided by python-pyqtwebengine-6, it's
;; included here so we can wrap QTWEBENGINEPROCESS_PATH.
qtwebengine-5))
qtwebengine))
(arguments
`(;; FIXME: With the existance of qtwebengine-5, tests can now run. But
`(;; FIXME: With the existence of qtwebengine, tests can now run. But
;; they are still disabled because test phase hangs. It's not readily
;; apparent as to why.
#:tests? #f
@ -539,13 +538,16 @@ (define-public qutebrowser
(add-after 'wrap 'wrap-qt-process-path
(lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (search-input-file outputs "bin/qutebrowser")
`("QTWEBENGINE_RESOURCES_PATH" =
(,(search-input-directory
inputs "/share/qt6/resources")))
`("QTWEBENGINEPROCESS_PATH" =
(,(search-input-file
inputs "/lib/qt5/libexec/QtWebEngineProcess")))))))))
inputs "/lib/qt6/libexec/QtWebEngineProcess")))))))))
(home-page "https://qutebrowser.org/")
(synopsis "Minimal, keyboard-focused, vim-like web browser")
(description "qutebrowser is a keyboard-focused browser with a minimal
GUI. It is based on PyQt5 and QtWebEngine.")
GUI. It is based on PyQt6 and QtWebEngine.")
(license license:gpl3+)))
(define-public vimb