mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: qutebrowser: Update to 1.9.0.

Browse source 
* gnu/packages/web-browsers.scm (qutebrowser): Update to 1.9.0.

qutebrowser no longer uses qtwebkit by default. It now defaults to qtwebengine.
This commit is contained in:
Mike Rosset 2020-01-14 03:06:37 -08:00 committed by Pierre Neidhardt
parent eb5af18e7e
commit 44ce3ebb46
No known key found for this signature in database
GPG key ID: 9BDCF497A4BBCC7F
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -276,7 +276,7 @@ (define-public lynx
(define-public qutebrowser
(package
(name "qutebrowser")
(version "1.8.3")
(version "1.9.0")
(source
(origin
(method url-fetch)
@ -285,11 +285,10 @@ (define-public qutebrowser
"qutebrowser-" version ".tar.gz"))
(sha256
(base32
"055zmzk3q0m3hx1742nfy2mdawfllrkvijnbzp1hiv01dj1bxaf8"))))
"1y0yq1qfr6g1s7kf3w2crd0b025dv2dfknhlz3v0001ns3rgwj17"))))
(build-system python-build-system)
(native-inputs
`(("asciidoc" ,asciidoc)
("python-attrs" ,python-attrs))) ; for tests
`(("python-attrs" ,python-attrs))) ; for tests
(inputs
`(("python-colorama" ,python-colorama)
("python-cssutils" ,python-cssutils)
@ -298,23 +297,29 @@ (define-public qutebrowser
("python-pygments" ,python-pygments)
("python-pypeg2" ,python-pypeg2)
("python-pyyaml" ,python-pyyaml)
;; FIXME: python-pyqtwebengine needs to come before python-pyqt so
;; that it's __init__.py is used first.
("python-pyqtwebengine" ,python-pyqtwebengine)
("python-pyqt" ,python-pyqt)
("qtwebkit" ,qtwebkit)))
;; While qtwebengine is provided by python-pyqtwebengine, it's
;; included here so we can wrap QTWEBENGINEPROCESS_PATH.
("qtwebengine" ,qtwebengine)))
(arguments
`(;; FIXME: Tests have been added to Qutebrowser. But they currently fail on
;; trying to locate QtWebEngine, and run it on a specific display.
;; There does not seem to be a trivial way to suppress this test.
;; Either fix this, or wait for a liberated QtWebEngine to make into GNU Guix.
;; Change this according to <https://bugs.gnu.org/35866>.
`(;; FIXME: With the existance 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
#:phases
(modify-phases %standard-phases
(add-before 'check 'set-env-offscreen
(lambda _
(setenv "QT_QPA_PLATFORM" "offscreen")
#t))
(add-after 'install 'install-more
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(app (string-append out "/share/applications"))
(hicolor (string-append out "/share/icons/hicolor")))
(invoke "a2x" "-f" "manpage" "doc/qutebrowser.1.asciidoc")
(install-file "doc/qutebrowser.1"
(string-append out "/share/man/man1"))
(for-each
@ -331,11 +336,21 @@ (define-public qutebrowser
(("Exec=qutebrowser")
(string-append "Exec=" out "/bin/qutebrowser")))
(install-file "misc/org.qutebrowser.qutebrowser.desktop" app)
#t)))
(add-after 'wrap 'wrap-qt-process-path
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin/qutebrowser"))
(qt-process-path (string-append
(assoc-ref inputs "qtwebengine")
"/lib/qt5/libexec/QtWebEngineProcess")))
(wrap-program bin
`("QTWEBENGINEPROCESS_PATH" ":" prefix (,qt-process-path)))
#t))))))
(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 QtWebKit.")
GUI. It is based on PyQt5 and QtWebEngine.")
(license license:gpl3+)))
(define-public vimb