From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pierre Neidhardt Subject: bug#38148: [PATCH 2/2] gnu: qutebrowser: Update to 1.9.0. Date: Mon, 13 Jan 2020 15:20:20 +0100 Message-ID: <87lfqbqvyz.fsf@ambrevar.xyz> References: <20200113103304.9093-1-mike.rosset@gmail.com> <20200113103304.9093-2-mike.rosset@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:34902) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ir0aZ-0007Lq-5h for bug-guix@gnu.org; Mon, 13 Jan 2020 09:21:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ir0aU-0008BQ-0q for bug-guix@gnu.org; Mon, 13 Jan 2020 09:21:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52808) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ir0aT-0008At-TH for bug-guix@gnu.org; Mon, 13 Jan 2020 09:21:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ir0aT-0005e1-P4 for bug-guix@gnu.org; Mon, 13 Jan 2020 09:21:01 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20200113103304.9093-2-mike.rosset@gmail.com> (Mike Rosset's message of "Mon, 13 Jan 2020 02:33:04 -0800") List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane-mx.org@gnu.org Sender: "bug-Guix" To: Mike Rosset Cc: 38148@debbugs.gnu.org Mike Rosset 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 . > + `( ;; 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/