From patchwork Sun Nov 19 20:35:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 56648 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 DAA8D27BBE9; Sun, 19 Nov 2023 20:39:25 +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=unavailable 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 9ED8F27BBE2 for ; Sun, 19 Nov 2023 20:39:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r4oZK-0007zf-Kh; Sun, 19 Nov 2023 15:39:02 -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 1r4oZJ-0007zH-3m for guix-patches@gnu.org; Sun, 19 Nov 2023 15:39:01 -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 1r4oZI-0002C4-Ry for guix-patches@gnu.org; Sun, 19 Nov 2023 15:39:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r4oZK-00069G-6j for guix-patches@gnu.org; Sun, 19 Nov 2023 15:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67289] [PATCH] gnu: qutebrowser: Update to 3.0.2. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Nov 2023 20:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67289 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67289@debbugs.gnu.org Cc: Herman Rimm X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170042631223582 (code B ref -1); Sun, 19 Nov 2023 20:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Nov 2023 20:38:32 +0000 Received: from localhost ([127.0.0.1]:52174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4oYq-00068I-CK for submit@debbugs.gnu.org; Sun, 19 Nov 2023 15:38:32 -0500 Received: from lists.gnu.org ([2001:470:142::17]:58552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4oYl-00067u-H0 for submit@debbugs.gnu.org; Sun, 19 Nov 2023 15:38:30 -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 1r4oYe-0007xa-8R for guix-patches@gnu.org; Sun, 19 Nov 2023 15:38:20 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117] helo=email.rimm.ee) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1r4oYb-0001Ta-Ge for guix-patches@gnu.org; Sun, 19 Nov 2023 15:38:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1700426283; 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=rVxIDedcXkGy0ZxI9RlcPWPNYfYWeydQQG5HD/0wsXY=; b=Skvdk+x90gIPsZz26b3D7KDI9N018yKQdt7aRMJ78LczIFtGP/29z4vEOABiZatcGrgb92 amBpP+IJB5rdaEv6smodZ0b8ypOEjvANCAVOz6K94KkYVjF7XJ8Xf/mCmTnbWzCNhLo6rq f6t6ZHXEMbx9HTjUZTX+mpSWAWLKTMK4uBRbBTakeyOPQKvBWMdxdeldcfB0xvK1pjRzXv TqYJmExD3vb1P01cUJrTITMnwBvimOpkl89KPg/gz+go1bSwR3lOLkHQxB36ABp+hEWjAx m1Ezj57MvrYvvxSah7Mo6tQyPaFnnpLk5K6MV/rnS9pH+xDpL8glPrdtNPxQHA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id bcff5a92 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 19 Nov 2023 20:38:03 +0000 (UTC) Date: Sun, 19 Nov 2023 21:35:52 +0100 Message-ID: <3514f2342b3788d19c49aa6e9e2971f3d31c892c.1700426152.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@rimm.ee; helo=email.rimm.ee X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_PBL=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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.0.2. [source]: Bump version and recompute hash. [inputs]: Use PyQt6, placed before PyQtWebengine. [arguments]: Replace qt5 path with qt6 path. [description]: Replace PyQt5 with PyQt6. --- gnu/packages/web-browsers.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) base-commit: 761810d32a0550912b5bb36a0c9f60141bcb7d20 prerequisite-patch-id: 8ae6d4a62bd979a3fe4758d95ed7fc0749063e9b prerequisite-patch-id: 83df61ed11d3c78120bb78ef098bc182b7f2b300 prerequisite-patch-id: 889819768a466a7f2ccd7ca2ab21f0972563b8b0 diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index d38882046d..9257d541a8 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. ;;; @@ -459,7 +460,7 @@ (define-public kristall (define-public qutebrowser (package (name "qutebrowser") - (version "2.5.4") + (version "3.0.2") (source (origin (method url-fetch) @@ -467,7 +468,7 @@ (define-public qutebrowser "qutebrowser/releases/download/v" version "/" "qutebrowser-" version ".tar.gz")) (sha256 - (base32 "1c8skkc5vjbvbslz65hzrj9d05v4zbcjbli61ikjmr174lhb4q54")))) + (base32 "0ldwslgakpcv3v47hli8lm68zndjsb7bj8rpp2pijd8j9bg96655")))) (build-system python-build-system) (native-inputs (list python-attrs)) ; for tests @@ -480,15 +481,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 @@ -540,11 +539,11 @@ (define-public qutebrowser (wrap-program (search-input-file outputs "bin/qutebrowser") `("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