From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mike Rosset Subject: bug#38148: [PATCH 2/2] gnu: qutebrowser: Update to 1.9.0. Date: Mon, 13 Jan 2020 02:33:04 -0800 Message-ID: <20200113103304.9093-2-mike.rosset@gmail.com> References: <20200113103304.9093-1-mike.rosset@gmail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:55036) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iqx2p-0007Lg-Pc for bug-guix@gnu.org; Mon, 13 Jan 2020 05:34:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iqx2o-0006fm-G5 for bug-guix@gnu.org; Mon, 13 Jan 2020 05:34:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52730) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iqx2o-0006fW-Cd for bug-guix@gnu.org; Mon, 13 Jan 2020 05:34:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iqx2o-0006F3-B2 for bug-guix@gnu.org; Mon, 13 Jan 2020 05:34:02 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20200113103304.9093-1-mike.rosset@gmail.com> 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: 38148@debbugs.gnu.org Cc: mike.rosset@gmail.com * 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 + ("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 #: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 +337,21 @@ access.") (("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 -- 2.24.1