From d7c58c3e5449d9fb96a15928cc65f12f111d0569 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Tue, 24 Dec 2019 14:32:23 -0600 Subject: gnu: qutebrowser: Update to 1.8.3. * gnu/packages/web-browsers.scm (qutebrowser): Update to 1.8.3. [arguments]: Update how .desktop attribute gets installed. --- gnu/packages/web-browsers.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/web-browsers.scm') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 29fbe17513..531c0e2f6d 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018 Timo Eisenmann ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Clément Lassieur +;;; Copyright © 2019 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -275,7 +276,7 @@ (define-public lynx (define-public qutebrowser (package (name "qutebrowser") - (version "0.11.0") + (version "1.8.3") (source (origin (method url-fetch) @@ -284,10 +285,11 @@ (define-public qutebrowser "qutebrowser-" version ".tar.gz")) (sha256 (base32 - "13ihx66jm1dd6vx8px7pm0kbzf2sf9x43hhivc1rp17kahnxxdyv")))) + "055zmzk3q0m3hx1742nfy2mdawfllrkvijnbzp1hiv01dj1bxaf8")))) (build-system python-build-system) (native-inputs - `(("asciidoc" ,asciidoc))) + `(("asciidoc" ,asciidoc) + ("python-attrs" ,python-attrs))) ; for tests (inputs `(("python-colorama" ,python-colorama) ("python-cssutils" ,python-cssutils) @@ -321,11 +323,10 @@ (define-public qutebrowser '(16 24 32 48 64 128 256 512)) (install-file "icons/qutebrowser.svg" (string-append hicolor "/scalable/apps")) - - (substitute* "qutebrowser.desktop" + (substitute* "misc/org.qutebrowser.qutebrowser.desktop" (("Exec=qutebrowser") (string-append "Exec=" out "/bin/qutebrowser"))) - (install-file "qutebrowser.desktop" app) + (install-file "misc/org.qutebrowser.qutebrowser.desktop" app) #t)))))) (home-page "https://qutebrowser.org/") (synopsis "Minimal, keyboard-focused, vim-like web browser") -- cgit v1.2.3 From 7e232d02ea574ba027b1c8a964d29b23b455fca7 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Tue, 24 Dec 2019 14:35:52 -0600 Subject: gnu: qutebrowser: Add comment about tests. * gnu/packages/web-browsers.scm (qutebrowser)[arguments]: Indicate that tests have been added, but to wait on fixing or working-around the failing test case for QtWebEngine until it is determined whether a liberated QtWebEngine can be made available or not. --- gnu/packages/web-browsers.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web-browsers.scm') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 531c0e2f6d..7586011755 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -301,7 +301,12 @@ (define-public qutebrowser ("python-pyqt" ,python-pyqt) ("qtwebkit" ,qtwebkit))) (arguments - `(#:tests? #f ;no tests + `(;; 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 . + #:tests? #f #:phases (modify-phases %standard-phases (add-after 'install 'install-more @@ -312,7 +317,6 @@ (define-public qutebrowser (invoke "a2x" "-f" "manpage" "doc/qutebrowser.1.asciidoc") (install-file "doc/qutebrowser.1" (string-append out "/share/man/man1")) - (for-each (lambda (i) (let ((src (format #f "icons/qutebrowser-~dx~d.png" i i)) -- cgit v1.2.3 From a066e289ab8ea971336515b53dd5340cbdf90904 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Tue, 24 Dec 2019 14:36:47 -0600 Subject: gnu: qutebrowser: Update source URI. * gnu/packages/web-browsers.scm (qutebrowser)[source]: Github redirects to this updated URI. --- gnu/packages/web-browsers.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/web-browsers.scm') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 7586011755..4fdf5f5419 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -280,7 +280,7 @@ (define-public qutebrowser (source (origin (method url-fetch) - (uri (string-append "https://github.com/The-Compiler/" + (uri (string-append "https://github.com/qutebrowser/" "qutebrowser/releases/download/v" version "/" "qutebrowser-" version ".tar.gz")) (sha256 -- cgit v1.2.3