From patchwork Mon Dec 25 17:22:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 58070 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 52E0127BBEA; Mon, 25 Dec 2023 17:32:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5818D27BBE2 for ; Mon, 25 Dec 2023 17:32:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rHoo1-0001BR-Vi; Mon, 25 Dec 2023 12:31:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rHoo0-0001BJ-49 for guix-patches@gnu.org; Mon, 25 Dec 2023 12:31:56 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rHonz-0001FO-SP for guix-patches@gnu.org; Mon, 25 Dec 2023 12:31:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rHoo6-0005FT-4T for guix-patches@gnu.org; Mon, 25 Dec 2023 12:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67289] [PATCH v2] gnu: qutebrowser: Update to 3.1.0. References: <3514f2342b3788d19c49aa6e9e2971f3d31c892c.1700426152.git.herman@rimm.ee> In-Reply-To: <3514f2342b3788d19c49aa6e9e2971f3d31c892c.1700426152.git.herman@rimm.ee> Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Dec 2023 17:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67289 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67289@debbugs.gnu.org Cc: Herman Rimm Received: via spool by 67289-submit@debbugs.gnu.org id=B67289.170352548920029 (code B ref 67289); Mon, 25 Dec 2023 17:32:02 +0000 Received: (at 67289) by debbugs.gnu.org; 25 Dec 2023 17:31:29 +0000 Received: from localhost ([127.0.0.1]:55261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHonY-0005CK-5H for submit@debbugs.gnu.org; Mon, 25 Dec 2023 12:31:28 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:51103 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHonT-00050M-8C for 67289@debbugs.gnu.org; Mon, 25 Dec 2023 12:31:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1703525466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BEq2Idp0oh3ArsONdt+03HVl0M4ZhH1yZiIY4kHqkv4=; b=X5Aj4W1QAPUxOokp68Cb7Z6V6NF1DIT0TpADNg5BlcUiTAIbs0n747uEPZCpASfJzqYfFw fDR5+wL/zKB0Hzdm7+OoUIGliWtISFxr1vJcWxwq1hlW1aWN58tjKRNZzwKi/6VIQnMWFq pARrJITR3/RKSJfUZNLJdejIafXPcaUW4ljPQU5L6FAfm5+D3Kpavy4Q4B8jNsTWZKYOQM aj89nv2G/IyS3p+2uGJKqnn9vqKU1aEKvE7nWD3zJrz2QficJxi4h7PjHBJVengY+FRSI/ zayB0KNxMFTZY2wjiAe70WN633p2osnWDXssgBw2S9rDemNo7ghWn5uWuLQElw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id eb791914 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 25 Dec 2023 17:31:06 +0000 (UTC) Date: Mon, 25 Dec 2023 18:22:35 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/web-browsers (qutebrowser): Update to 3.1.0. [source]: Bump version and recompute hash. [inputs]: Use PyQt6, placed before PyQtWebengine. [arguments]: Replace qt5 path with qt6 path and wrap program with QTWEBENGINE_RESOURCES_PATH. [description]: Replace PyQt5 with PyQt6. --- Hello, A qutebrowser 3.0.2 and 3.1.0 bug: Start a video (on invidio.us), switch to another workspace in Sway wm, the video stutters for a few seconds and recovers. A workaround is to use mpv or the like to play videos. May be related to #63863 of guix-patches, which implements a pipewire home service. Let me know if you experience it using ALSA/Pulseaudio service. Cheers, Herman Rimm gnu/packages/web-browsers.scm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) base-commit: 0d13d095420861022e68e87ceebd5e037e12a8b3 diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 141917ad42..5477584805 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2021 Alexander Krotov ;;; Copyright © 2020 Hartmut Goebel ;;; Copyright © 2021 Christopher Howard +;;; Copyright © 2023 Herman Rimm ;;; ;;; This file is part of GNU Guix. ;;; @@ -460,7 +461,7 @@ (define-public kristall (define-public qutebrowser (package (name "qutebrowser") - (version "2.5.4") + (version "3.1.0") (source (origin (method url-fetch) @@ -468,7 +469,7 @@ (define-public qutebrowser "qutebrowser/releases/download/v" version "/" "qutebrowser-" version ".tar.gz")) (sha256 - (base32 "1c8skkc5vjbvbslz65hzrj9d05v4zbcjbli61ikjmr174lhb4q54")))) + (base32 "0prf9c7nx4aizfczjb0fpsn3alz210i6wc7s2jwb1mh8r8fcq3ah")))) (build-system python-build-system) (native-inputs (list python-attrs)) ; for tests @@ -481,15 +482,13 @@ (define-public qutebrowser python-pynacl python-pypeg2 python-pyyaml - ;; FIXME: python-pyqtwebengine needs to come before python-pyqt so - ;; that it's __init__.py is used first. - python-pyqtwebengine - python-pyqt - ;; While qtwebengine-5 is provided by python-pyqtwebengine, it's + python-pyqt-6 + python-pyqtwebengine-6 + ;; While qtwebengine is provided by python-pyqtwebengine-6, it's ;; included here so we can wrap QTWEBENGINEPROCESS_PATH. - qtwebengine-5)) + qtwebengine)) (arguments - `(;; FIXME: With the existance of qtwebengine-5, tests can now run. But + `(;; FIXME: With the existence 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 @@ -539,13 +538,16 @@ (define-public qutebrowser (add-after 'wrap 'wrap-qt-process-path (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/qutebrowser") + `("QTWEBENGINE_RESOURCES_PATH" = + (,(search-input-directory + inputs "/share/qt6/resources"))) `("QTWEBENGINEPROCESS_PATH" = (,(search-input-file - inputs "/lib/qt5/libexec/QtWebEngineProcess"))))))))) + inputs "/lib/qt6/libexec/QtWebEngineProcess"))))))))) (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 QtWebEngine.") +GUI. It is based on PyQt6 and QtWebEngine.") (license license:gpl3+))) (define-public vimb