From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id IIK7EH0j32K4rQAAbAwnHQ (envelope-from ) for ; Tue, 26 Jul 2022 01:13:01 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 8B3NEH0j32I4qAAAauVa8A (envelope-from ) for ; Tue, 26 Jul 2022 01:13:01 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DCFFA2F807 for ; Tue, 26 Jul 2022 01:13:00 +0200 (CEST) Received: from localhost ([::1]:36872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oG7Fz-0008V1-WE for larch@yhetil.org; Mon, 25 Jul 2022 19:13:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oG7EA-0006bJ-Lt for guix-patches@gnu.org; Mon, 25 Jul 2022 19:11:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33737) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oG7EA-0005jk-DX for guix-patches@gnu.org; Mon, 25 Jul 2022 19:11:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oG7EA-0000IX-9T for guix-patches@gnu.org; Mon, 25 Jul 2022 19:11:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56771] [PATCH 16/33] gnu: qtwebsockets: Rename to qtwebsockets-5. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 23:11:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56771 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56771@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 56771-submit@debbugs.gnu.org id=B56771.1658790625925 (code B ref 56771); Mon, 25 Jul 2022 23:11:06 +0000 Received: (at 56771) by debbugs.gnu.org; 25 Jul 2022 23:10:25 +0000 Received: from localhost ([127.0.0.1]:51690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oG7DU-0000Ek-Fu for submit@debbugs.gnu.org; Mon, 25 Jul 2022 19:10:25 -0400 Received: from mail-qk1-f180.google.com ([209.85.222.180]:39909) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oG7Be-00006o-Tg for 56771@debbugs.gnu.org; Mon, 25 Jul 2022 19:08:32 -0400 Received: by mail-qk1-f180.google.com with SMTP id m7so9849075qkk.6 for <56771@debbugs.gnu.org>; Mon, 25 Jul 2022 16:08:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EWk/rkXtOrSiWm/uuG9gERDIttnKc18ReG87kI/oOLY=; b=kbDsF6JRzPRoAkYog+INEZr4PWAlr19+sb3foHXJky9gud2z7dl1szgUi82M8yyke+ JpJCqK5tvJpOgG27ijH5GHx7gFbWUkdGNr6A7WRRIv4N5o13IO/FQNnvAFmAGzFdMyRN FLQQX+i72zcpIe4cKWq5UB/dslGuooFjjH9LrC8MHJD3LsBUZPZQeeeNW6MwWMIm1Rr9 KCVdcRc5vhZ5UOv9/Z1m8VGXqrC0rJAK4ZwygJfOgkwkCo3yzO6T1OZoQNgs7Eyn8Yb7 ubMSx/9iII/VCAqQuKBZyM/ZomV3QI+7vAiTt2TB/F2Jx4tpv6noN4ESG68e1bhyC3dD byEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EWk/rkXtOrSiWm/uuG9gERDIttnKc18ReG87kI/oOLY=; b=WXbyWb3Lnp7CSXHc+qq6Au+PJToD+oeOtB0e0RWRtXaQX/vAZ8YtTzNXORbRKARlV3 IHhqy09LsN30SZmK3FcNapxQ7EHqMckRTatbeJFvrMZV5fuNEDkKl+cAnuXP+09vcq+N 6EcIBrGSC2uJ/R6JPKICGO1v6uAUbQ0Zid6UqDwyWAjxOUAcJr7VqCiOU5TbeJ4fELJZ 2/pgxClqglj7AVGku2u7n+dLL+g1FwvX/GFsZlubDs+/OSk6sMDOKXm82kIGA0YMO5e4 uOfKkdwwkCDH8Nj6BuR4cvgRBlQ2hNiiZb+Cjow3dCVn5RDeE0PVLyeSphyeC3YU90GA LDCw== X-Gm-Message-State: AJIora/JPf3iS2+w+Fk5cE0ZTF/nO0i+nxaUr7PtvTmdTHmuGMiCx464 fsIkhtDOw3bwA9axxrcC0miAk/mBaQ8= X-Google-Smtp-Source: AGRyM1tYtQvXvy9t3tJQa3fHCmPradw1q/WxI8sIIedLdYUzTPVuQPH4RZYu1LKRjz1gJCCcvXjTBA== X-Received: by 2002:a37:4141:0:b0:67e:933e:54b6 with SMTP id o62-20020a374141000000b0067e933e54b6mr10694790qka.428.1658790505267; Mon, 25 Jul 2022 16:08:25 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-125-69.b2b2c.ca. [205.233.125.69]) by smtp.gmail.com with ESMTPSA id c15-20020ac8008f000000b0031ee9afafccsm8110580qtg.14.2022.07.25.16.08.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 16:08:24 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 25 Jul 2022 19:07:46 -0400 Message-Id: <20220725230803.10002-16-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220725230803.10002-1-maxim.cournoyer@gmail.com> References: <20220725230803.10002-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1658790781; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=EWk/rkXtOrSiWm/uuG9gERDIttnKc18ReG87kI/oOLY=; b=OxTQZPqbp7KAh7NxoNDseETLFJi/Hrh0eK7sBvBd4qERXX6TkeuNJx2tU+vQutA0dtwcXr RDS9sbHSevVwguTfnbkTra1ameGxW2MgGLZ2uuXy4su4c+vZPh66urMjQwGpOxhyxhC/+w Jl9qGJnF/p5GmmbaZPy72HsJr6a+3+Ld/2mzQ84OgxzKQtuvj0bGQl9La0ouoi/Q+/N0uX NqufZQ+b7dtnKmeXTbEIEuj29+myuJJjfcgjpmPaby4lyqHWjO2d2gimMyAwiMn/u2lEUL 6ZJipQOS7cbACqZJhaaVdrJl01NvL+T9vCgosNQfm/LFkCc3KDSSadu7R90L6w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1658790781; a=rsa-sha256; cv=none; b=FlGzB7zWtZ65D+865iiYY/T0ULPld20BRN1h082fSBaTDXknll50CDOUnzNSnmLO5d9NEj jQH3UfqBCnnXKNPu05CAWC2VNwzqp/w1UE+lw/HdheRnujo02pOJxfKan/t6TPJ3Ng5z5i Yr3kYIs2PeYFHIXuIf5GNCNDfK+DpeRO9GH88g/pWHoZXLFCkz6RH4cozAH8pUBsfuEUWw IjdbyGnnCHzlvph0QXG1GfZ/7iIVRIExk3TZHVPRNwM04jKynWikeojPPFgdj1drhLYhD9 xwD3F8uR8uVk/zxBJKeRY6NeK287CMjfxIo1afJ4i802DYSNpyc2SjW/Jqhepw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=kbDsF6JR; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=kbDsF6JR; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: DCFFA2F807 X-Spam-Score: 5.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: iNDjCvCeI1Ul Automated via: git grep -l qtwebsockets | xargs sed 's/\bqtwebsockets\b/\0-5/g' -i git checkout NEWS --- gnu/packages/audio.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/qt.scm | 12 ++++++------ gnu/packages/radio.scm | 4 ++-- gnu/packages/security-token.scm | 2 +- gnu/packages/sync.scm | 2 +- gnu/packages/video.scm | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 107deef3de..4a8c2f0fba 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3235,7 +3235,7 @@ (define-public supercollider qtdeclarative-5 qtsvg-5 qtwebchannel - qtwebsockets)) + qtwebsockets-5)) (propagated-inputs ;to get native-search-path (list qtwebengine)) (home-page "https://github.com/supercollider/supercollider") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 51dec55bd7..a851a6853a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -996,7 +996,7 @@ (define-public cockatrice qtmultimedia-5 qtsvg-5 qttools - qtwebsockets + qtwebsockets-5 xz zlib)) (home-page "https://cockatrice.github.io") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c238d09486..bd43830391 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1204,7 +1204,7 @@ (define-public qtconnectivity (description "The Qt Connectivity modules provides modules for interacting with Bluetooth and NFC."))) -(define-public qtwebsockets +(define-public qtwebsockets-5 (package (inherit qtsvg-5) (name "qtwebsockets") (version "5.15.2") @@ -1516,7 +1516,7 @@ (define-public qtwebchannel (base32 "1h9y634phvvk557mhmf9z4lmxr41rl8x9mqy2lzp31mk8ffffzqj")))) (native-inputs - (list perl qtdeclarative-5 qtwebsockets)) + (list perl qtdeclarative-5 qtwebsockets-5)) (inputs (list qtbase-5)) (synopsis "Web communication library for Qt") (description "The Qt WebChannel module enables peer-to-peer communication @@ -1544,7 +1544,7 @@ (define-public qtwebglplugin #t)))))) (native-inputs '()) (inputs - (list mesa qtbase-5 qtdeclarative-5 qtwebsockets zlib)) + (list mesa qtbase-5 qtdeclarative-5 qtwebsockets-5 zlib)) (synopsis "QPA plugin for running an application via a browser using streamed WebGL commands") (description "Qt back end that uses WebGL for rendering. It allows Qt @@ -2470,7 +2470,7 @@ (define-public python-pyqt ("qttools" ,qttools) ("qtwebchannel" ,qtwebchannel) ("qtwebkit" ,qtwebkit) - ("qtwebsockets" ,qtwebsockets) + ("qtwebsockets-5" ,qtwebsockets-5) ("qtx11extras" ,qtx11extras) ("qtxmlpatterns" ,qtxmlpatterns))) (arguments @@ -3285,7 +3285,7 @@ (define-public python-pyside-2 qtsvg-5 qtwebchannel qtwebengine - qtwebsockets + qtwebsockets-5 qtx11extras qtxmlpatterns)) (propagated-inputs @@ -3335,7 +3335,7 @@ (define-public python-pyside-2 "qttools" "qtwebchannel" "qtwebengine" - "qtwebsockets" + "qtwebsockets-5" "qtx11extras" "qtxmlpatterns")))) (substitute* "cmake/Macros/PySideModules.cmake" diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 989d5670f4..5f9767c896 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1336,7 +1336,7 @@ (define-public jtdx jtdx-hamlib libusb qtbase-5 - qtwebsockets + qtwebsockets-5 qtmultimedia-5 qtserialport)) (arguments @@ -2165,7 +2165,7 @@ (define-public sdrangel qtquickcontrols2-5 qtserialport qtspeech - qtwebsockets + qtwebsockets-5 rtl-sdr serialdv soapysdr diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 41207318a1..c8fe460a26 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -861,7 +861,7 @@ (define-public ausweisapp2 (list qtbase-5 qtsvg-5 qtdeclarative-5 - qtwebsockets + qtwebsockets-5 qtgraphicaleffects qtquickcontrols2-5 pcsc-lite diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index f364195341..40385124fd 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -196,7 +196,7 @@ (define-public nextcloud-client qtsolutions qtsvg-5 qtwebchannel - qtwebsockets + qtwebsockets-5 sqlite xdg-utils zlib)) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ed8ba06779..fd0c7897dd 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4864,7 +4864,7 @@ (define-public shotcut qtquickcontrols2-5 qtsvg-5 qtwebkit - qtwebsockets + qtwebsockets-5 qtx11extras sdl2)) (home-page "https://www.shotcut.org/") -- 2.36.1