From patchwork Wed Feb 15 18:41:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 46958 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 7BFC41687D; Wed, 15 Feb 2023 18:43:27 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 9926916866 for ; Wed, 15 Feb 2023 18:43:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pSMkB-00065G-IL; Wed, 15 Feb 2023 13:43:03 -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 1pSMkA-000658-Cy for guix-patches@gnu.org; Wed, 15 Feb 2023 13:43:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pSMkA-0000ha-4b for guix-patches@gnu.org; Wed, 15 Feb 2023 13:43:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pSMkA-00076g-0e for guix-patches@gnu.org; Wed, 15 Feb 2023 13:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61536] [PATCH] gnu: Make nothing depend on QtWebKit. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Feb 2023 18:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61536 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61536@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167648652227250 (code B ref -1); Wed, 15 Feb 2023 18:43:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Feb 2023 18:42:02 +0000 Received: from localhost ([127.0.0.1]:34005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSMjB-00075G-EU for submit@debbugs.gnu.org; Wed, 15 Feb 2023 13:42:02 -0500 Received: from lists.gnu.org ([209.51.188.17]:35724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSMj7-00074z-MD for submit@debbugs.gnu.org; Wed, 15 Feb 2023 13:42:00 -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 1pSMj4-0005SE-Tr for guix-patches@gnu.org; Wed, 15 Feb 2023 13:41:56 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pSMj1-0000VQ-9h for guix-patches@gnu.org; Wed, 15 Feb 2023 13:41:54 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 2FB27320090D; Wed, 15 Feb 2023 13:41:48 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Wed, 15 Feb 2023 13:41:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=mesmtp; t=1676486507; x=1676572907; bh=ettp3VEUlTWsZFXoA7GU1O t8sXoRP7ilsoP3+/C/r6Y=; b=T/ZmtzA4jrU7IQtmqwX0o5FY5OMVjRn3nZqMho RG/vTIuwegpgxJn1H3uOChnaP0na6u7rDcqXEOzlFO91UtDdvYU67iIvHtYyzHAW OL4UJ0EWtOwPw95F0ErN2rvrcZWdyxTVqkxx7Vq9SfWfjYQwl4+PcZhB1XbuCZXj O0vzs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1676486507; x=1676572907; bh=ettp3VEUlTWsZFXoA7GU1Ot8sXoRP7ilsoP 3+/C/r6Y=; b=kbFxsoZxdGKmKyFgt1s38kcWxxq/iZ/o+h5yjaA48LxPLC4D65Q 8BxdxIRpTYbVXUoEYImmFKHXesbw6p3NTH5K93XWWwdkBSLuuLUtij1qDauLgTK6 gXR2eAcllFD6B58kk1nIo17UtTKJPPD94W8bs3Cv9KndD+MtJJF2DL3EgxzTspW+ vnHhfxOm+ShLsSFXdsKTQtRxDuqFuY0nz78iKYPTNDAXYpAxWh+u6OHipxJkO7s2 GVpoNQC2fE/RIIhx4Jd4wnTNS+iT9W591k0GWw4qEHPaN8gIwH9VcPkNuDUYPLUF rS2vwkBMTuq2xMweAgmFY/yVbDcjIK05jrA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudeihedguddtlecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghr ihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeefgfefffehvdehudeijeelgeefhedvvd ehtdetkeegfeefleevjefhtdevueekfeenucffohhmrghinhepghhnuhdrohhrghdpfhhr vghstghosggrlhguihdrohhrghdptghrrgiihidqtghomhhpihhlvghrshdrtghomhdpph ihphhirdhorhhgpdhgihhthhhusgdrtghomhdpphihqhhtghhrrghphhdrohhrghenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrg hmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Wed, 15 Feb 2023 13:41:47 -0500 (EST) From: Leo Famulari Date: Wed, 15 Feb 2023 13:41:44 -0500 Message-Id: X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.25; envelope-from=leo@famulari.name; helo=wout2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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: , 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 This is required for . Commit message to be written properly later. This should be self-explanatory for now. * gnu/packages/qt.scm (python-pyqt)[inputs]: Remove qtwebkit. (python-pyqt-without-qtwebkit): Remove variable. [...]: Adjust accordingly. --- gnu/packages/backup.scm | 2 +- gnu/packages/ebook.scm | 4 ++-- gnu/packages/education.scm | 2 +- gnu/packages/kde-games.scm | 2 +- gnu/packages/maths.scm | 2 +- gnu/packages/music.scm | 4 ++-- gnu/packages/orange.scm | 2 +- gnu/packages/pdf.scm | 6 +++--- gnu/packages/python-check.scm | 2 +- gnu/packages/python-xyz.scm | 4 ++-- gnu/packages/qt.scm | 14 +------------- gnu/packages/radio.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/vpn.scm | 2 +- gnu/packages/web-browsers.scm | 2 +- 15 files changed, 20 insertions(+), 32 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 6815b0e337..d92811bf3c 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1344,7 +1344,7 @@ (define-public vorta python-paramiko python-peewee python-psutil - python-pyqt-without-qtwebkit + python-pyqt python-secretstorage ;; This is included so that the qt-wrap phase picks it up. qtsvg-5)) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index b21fcfdc9a..6d645fba38 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -200,7 +200,7 @@ (define-public calibre python-pychm python-pycryptodome python-pygments - python-pyqt-without-qtwebkit + python-pyqt python-pyqtwebengine python-regex speech-dispatcher @@ -246,7 +246,7 @@ (define-public calibre (string-append "[tool.sip.project] sip-include-dirs = [\"" #$(this-package-input - "python-pyqt-without-qtwebkit") + "python-pyqt") "/share/sip\"]"))) (substitute* "src/calibre/ebooks/pdf/pdftohtml.py" (("PDFTOHTML = 'pdftohtml'") diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 62c4d2352d..53710f424e 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -805,7 +805,7 @@ (define-public anki ("python-pyaudio" ,python-pyaudio) ;; `python-pyqtwebengine' must precede `python-pyqt' in PYTHONPATH. ("python-pyqtwebengine" ,python-pyqtwebengine) - ("python-pyqt" ,python-pyqt-without-qtwebkit) + ("python-pyqt" ,python-pyqt) ("python-requests" ,python-requests) ("python-send2trash" ,python-send2trash) ("python-sip" ,python-sip) diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm index b0df2cf3d2..9be889f6aa 100644 --- a/gnu/packages/kde-games.scm +++ b/gnu/packages/kde-games.scm @@ -322,7 +322,7 @@ (define-public kajongg ki18n libkmahjongg python - python-pyqt-without-qtwebkit + python-pyqt python-twisted python-qtpy python-zope-interface diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0da47943fd..ceb2f14a80 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3184,7 +3184,7 @@ (define-public veusz (list ghostscript ;optional, for EPS/PS output python-dbus python-h5py ;optional, for HDF5 data - python-pyqt-without-qtwebkit + python-pyqt qtbase-5 qtsvg-5)) (propagated-inputs diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6fb2824483..59f295cc14 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2967,7 +2967,7 @@ (define-public frescobaldi python-ly python-poppler-qt5 python-pyportmidi - python-pyqt-without-qtwebkit + python-pyqt python-sip)) (home-page "https://www.frescobaldi.org/") (synopsis "LilyPond sheet music text editor") @@ -3709,7 +3709,7 @@ (define-public picard (inputs (list chromaprint python-discid - python-pyqt-without-qtwebkit + python-pyqt python-mutagen python-fasteners python-pyyaml diff --git a/gnu/packages/orange.scm b/gnu/packages/orange.scm index 0b8a642014..2a66fe429e 100644 --- a/gnu/packages/orange.scm +++ b/gnu/packages/orange.scm @@ -160,7 +160,7 @@ (define-public orange python-orange-widget-base python-pandas python-pygments - python-pyqt-without-qtwebkit + python-pyqt python-pyqtgraph python-pyqtwebengine python-pyyaml diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 478977d8c5..21ad317981 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -186,7 +186,7 @@ (define-public flyer-composer (inputs (list python-poppler-qt5 python-pypdf2 - python-pyqt-without-qtwebkit + python-pyqt qtbase-5)) (home-page "http://crazy-compilers.com/flyer-composer") (synopsis "Rearrange PDF pages to print as flyers on one sheet") @@ -373,12 +373,12 @@ (define-public python-poppler-qt5 ;; installation phase. ((@@ (guix build python-build-system) call-setuppy) "build_ext" (list (string-append "--pyqt-sip-dir=" - (assoc-ref inputs "python-pyqt-without-qtwebkit") + (assoc-ref inputs "python-pyqt") "/share/sip")) #t)))))) (native-inputs (list pkg-config)) (inputs - (list python-sip-4 python-pyqt-without-qtwebkit poppler-qt5 qtbase-5)) + (list python-sip-4 python-pyqt poppler-qt5 qtbase-5)) (home-page "https://pypi.org/project/python-poppler-qt5/") (synopsis "Python bindings for Poppler-Qt5") (description diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 41ed6e9a73..04c369b482 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1678,7 +1678,7 @@ (define-public python-pytest-qt (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) (propagated-inputs - (list python-pyqt-without-qtwebkit)) + (list python-pyqt)) (native-inputs (list python-pytest python-pytest-runner python-setuptools-scm)) (home-page "https://github.com/pytest-dev/pytest-qt") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 445f5a787d..10d4c84e80 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14195,7 +14195,7 @@ (define-public python-qtconsole (("def test_other_output") "def _test_other_output"))))))) (propagated-inputs (list python-ipykernel python-ipython-genutils python-jupyter-client - python-jupyter-core python-pygments python-pyqt-without-qtwebkit + python-jupyter-core python-pygments python-pyqt python-pyzmq python-qtpy python-traitlets)) (native-inputs (list python-flaky python-pytest python-pytest-qt)) @@ -16166,7 +16166,7 @@ (define-public python-pyqtgraph (list qtbase-5)) (propagated-inputs (list python-h5py python-numpy python-pyopengl python-scipy - python-pyqt-without-qtwebkit)) + python-pyqt)) (home-page "https://www.pyqtgraph.org") (synopsis "Scientific graphics and GUI library for Python") (description diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index da18395efc..cad07ea19d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3270,7 +3270,6 @@ (define-public python-pyqt ("qtsvg-5" ,qtsvg-5) ("qttools-5" ,qttools-5) ("qtwebchannel-5" ,qtwebchannel-5) - ("qtwebkit" ,qtwebkit) ("qtwebsockets-5" ,qtwebsockets-5) ("qtx11extras" ,qtx11extras) ("qtxmlpatterns" ,qtxmlpatterns))) @@ -3367,7 +3366,7 @@ (define-public python-pyqtwebengine (inputs `(("python" ,python-wrapper) ("python-sip" ,python-sip) - ("python-pyqt" ,python-pyqt-without-qtwebkit) + ("python-pyqt" ,python-pyqt) ("qtbase" ,qtbase-5) ("qtsvg-5" ,qtsvg-5) ("qtdeclarative-5" ,qtdeclarative-5) @@ -3425,17 +3424,6 @@ (define-public python-pyqtwebengine itself.") (license license:gpl3))) -;; XXX: This is useful for removing qtwebkit from other packages' dependency -;; graphs, as well as for preventing python-pyqtwebengine from transitively -;; depending on qtwebkit. -;; Ultimately, it would be nicer to have a more modular set of python-pyqt-* -;; packages that could be used together. -(define-public python-pyqt-without-qtwebkit - (package/inherit python-pyqt - (name "python-pyqt-without-qtwebkit") - (inputs - (alist-delete "qtwebkit" (package-inputs python-pyqt))))) - (define-public python-pyqt-builder (package (name "python-pyqt-builder") diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 06011b03de..b9612ffd56 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -687,7 +687,7 @@ (define-public gnuradio python-numpy python-pycairo python-pygobject - python-pyqt-without-qtwebkit + python-pyqt python-pyqtgraph python-pyyaml qtbase-5 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index df70ed6473..0697b18f3b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4872,7 +4872,7 @@ (define-public openshot font-dejavu libopenshot python - python-pyqt-without-qtwebkit + python-pyqt python-pyqtwebengine python-pyzmq python-requests diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index f38fd28cea..500461fecf 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -750,7 +750,7 @@ (define-public openconnect-sso python-lxml python-prompt-toolkit python-requests - python-pyqt-without-qtwebkit + python-pyqt python-pyqtwebengine python-pysocks python-pyxdg diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index b898311c51..45eb3b1cb8 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -492,7 +492,7 @@ (define-public qutebrowser ;; FIXME: python-pyqtwebengine needs to come before python-pyqt so ;; that it's __init__.py is used first. python-pyqtwebengine - python-pyqt-without-qtwebkit + python-pyqt ;; While qtwebengine-5 is provided by python-pyqtwebengine, it's ;; included here so we can wrap QTWEBENGINEPROCESS_PATH. qtwebengine-5))