From: Pierre Neidhardt <mail@ambrevar.xyz>
To: Mike Rosset <mike.rosset@gmail.com>
Cc: 38148@debbugs.gnu.org
Subject: bug#38148: [PATCH 2/2] gnu: qutebrowser: Update to 1.9.0.
Date: Mon, 13 Jan 2020 15:20:20 +0100 [thread overview]
Message-ID: <87lfqbqvyz.fsf@ambrevar.xyz> (raw)
In-Reply-To: <20200113103304.9093-2-mike.rosset@gmail.com> (Mike Rosset's message of "Mon, 13 Jan 2020 02:33:04 -0800")
Mike Rosset <mike.rosset@gmail.com> writes:
> * gnu/packages/web-browsers.scm (qutebrowser): Update to 1.9.0.
>
> qutebrowser no longer uses qtwebkit by default. It now defaults to qtwebengine.
> ---
> gnu/packages/web-browsers.scm | 40 ++++++++++++++++++++++++-----------
> 1 file changed, 28 insertions(+), 12 deletions(-)
>
> diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
> index 137dccab81..035fdc1dd9 100644
> --- a/gnu/packages/web-browsers.scm
> +++ b/gnu/packages/web-browsers.scm
> @@ -276,7 +276,7 @@ access.")
> (define-public qutebrowser
> (package
> (name "qutebrowser")
> - (version "1.8.3")
> + (version "1.9.0")
> (source
> (origin
> (method url-fetch)
> @@ -285,11 +285,10 @@ access.")
> "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,30 @@ access.")
> ("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)))
> + ;; qtwebengine is not a direct input because it's already provided by
> + ;; python-pyqtwebengine. It's included so we can wrap
> + ;; QTWEBENGINEPROCESS_PATH
The phrasing is a bit confusing. I'd say
"While qtwebengine is already 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
Missing period.
> #: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")
Why are you removing this?
Other than those few nits, looks good to me!
Cheers!
--
Pierre Neidhardt
https://ambrevar.xyz/
next prev parent reply other threads:[~2020-01-13 14:21 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-09 10:05 bug#38148: Guix packages old/broken version of qutebrowser Florian Bruhin
2019-11-09 16:49 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
2019-11-10 2:32 ` Bengt Richter
2020-01-13 10:33 ` bug#38148: [PATCH 1/2] gnu: Add python-pyqtwebengine Mike Rosset
2020-01-13 10:33 ` bug#38148: [PATCH 2/2] gnu: qutebrowser: Update to 1.9.0 Mike Rosset
2020-01-13 14:20 ` Pierre Neidhardt [this message]
2020-01-13 18:54 ` Mike Rosset
2020-01-13 19:02 ` Pierre Neidhardt
2020-01-13 10:45 ` bug#38148: [PATCH 1/2] gnu: Add python-pyqtwebengine Mike Rosset
2020-01-13 14:16 ` Pierre Neidhardt
2020-01-14 0:42 ` Mike Rosset
2020-01-14 9:42 ` Pierre Neidhardt
2020-01-14 10:25 ` Mike Rosset
2020-01-14 11:09 ` Mike Rosset
2020-01-15 15:31 ` Pierre Neidhardt
2020-01-15 17:26 ` Mike Rosset
2020-01-14 0:13 ` bug#38148: [PATCH 3/4] gnu: python-pyqt: Improved qprinter.h substitutition comment Mike Rosset
2020-01-14 0:13 ` bug#38148: [PATCH 4/4] gnu: qutebrowser: Improve comment sections Mike Rosset
2020-01-14 11:04 ` bug#38148: [PATCH 1/5] gnu: python-pyqt: Substitute the full path of <qprinter.h> Mike Rosset
2020-01-14 11:06 ` bug#38148: [PATCH 2/5] gnu: Add python-pyqtwebengine Mike Rosset
2020-01-14 11:06 ` bug#38148: [PATCH 3/5] gnu: qutebrowser: Update to 1.9.0 Mike Rosset
2020-01-14 11:06 ` bug#38148: [PATCH 4/5] gnu: python-pyqt: Improved qprinter.h substitutition comment Mike Rosset
2020-01-14 11:06 ` bug#38148: [PATCH 5/5] gnu: qutebrowser: Improve comment sections Mike Rosset
2020-01-15 20:55 ` bug#38148: Guix packages old/broken version of qutebrowser Ricardo Wurmus
2020-01-16 12:04 ` Florian Bruhin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lfqbqvyz.fsf@ambrevar.xyz \
--to=mail@ambrevar.xyz \
--cc=38148@debbugs.gnu.org \
--cc=mike.rosset@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).