From patchwork Mon Jul 25 23:07:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 40977 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 BF70427BBEA; Tue, 26 Jul 2022 00:13:37 +0100 (BST) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 2726727BBEB for ; Tue, 26 Jul 2022 00:13:35 +0100 (BST) Received: from localhost ([::1]:36888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oG7GY-0008VL-2i for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 19:13:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oG7EB-0006bl-Fv for guix-patches@gnu.org; Mon, 25 Jul 2022 19:11:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33739) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oG7EB-0005k2-7G for guix-patches@gnu.org; Mon, 25 Jul 2022 19:11:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oG7EB-0000Im-3E for guix-patches@gnu.org; Mon, 25 Jul 2022 19:11:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56771] [PATCH 18/33] gnu: qtwebchannel: Rename to qtwebchannel-5. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 23:11:07 +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.1658790626940 (code B ref 56771); Mon, 25 Jul 2022 23:11:07 +0000 Received: (at 56771) by debbugs.gnu.org; 25 Jul 2022 23:10:26 +0000 Received: from localhost ([127.0.0.1]:51694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oG7DV-0000Ez-Fb for submit@debbugs.gnu.org; Mon, 25 Jul 2022 19:10:26 -0400 Received: from mail-qk1-f173.google.com ([209.85.222.173]:44701) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oG7Bg-000076-Ha for 56771@debbugs.gnu.org; Mon, 25 Jul 2022 19:08:33 -0400 Received: by mail-qk1-f173.google.com with SMTP id b25so9834715qka.11 for <56771@debbugs.gnu.org>; Mon, 25 Jul 2022 16:08:32 -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=tUbx7Wn++yNxTA1KZx0kmCHAcCGbvz1f3Vdg5iT1jS4=; b=UXrGP7t7G80M0Bxw3adzrox1NZyRdNlW3KM4lbk5TvhFhSzxQsaZ9ZXct/z04UMjOp i7Pl7vfvBeeu0s18sJlSmPNAjVvVyd7e5Q/eXMFOhxI2Tl7IYJTKiHSjgF8GG5RfStDX 4AeuwVERuzi6QSqccA5eqHvnIAPAL2f9zX5TwQZhu57TUEGngBhZshF8vPYokPqlYV3r 4rA/iZumG/Gmj6wC23hIdkiXdPHuJLE8D+Yk1uMjZo1JZCrZEca/qWAIeYPU+vK5dy16 JfMCB/rvYbxJsYH0vt7phUAFLLEGfGfO4tvZVrubqVyAmYdBJkES/XXIaBJO1tObeqhC 3Bzw== 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=tUbx7Wn++yNxTA1KZx0kmCHAcCGbvz1f3Vdg5iT1jS4=; b=kZ0UYnwjT+MG8fidHTjWyIgfBqfZzG0srahkaBVjikFP9YbXZjeqH+jwO3GxWzZWHm xSVODNoC+MEZxl9kauVwlqopYYFu3mDsJDf7gWdcsfXgjQenJTVhfpfvRvFly7IZS74s a8kMgb4v8V97pHjXtYz8kgMZEHUxw74/bX4TjlsluCAR49qZ+qGOVcVyGZk8iQlIcEC3 fsw1ugkJToCQqy2NEdH0epKMVBxSgct4FvOaIw+8GIPNw/sSPK42KauZRS2VAWNeDEVJ Y2lLmEtjgM3r+qfvbd5wVBXhswirDAAvDorvkqofgoEaBPmPXnX7vPNYacsRIk/8efT0 Kptg== X-Gm-Message-State: AJIora/Ig3uXdBn4hHuYQiVT3JcIu0yG6RFHiSLqonnZSzN0DjSwbWTG U3JJP+PwEhLispbTr60A7q1ZuJ9a60c= X-Google-Smtp-Source: AGRyM1vMH9rAfMM+OWtnISLvaF8gaHjKQ0/JZZ6faMGRUZBR20v1gGGc8lfmNVcpk3zAvUid0dGuZQ== X-Received: by 2002:a05:620a:4505:b0:6b3:7c51:537c with SMTP id t5-20020a05620a450500b006b37c51537cmr11005282qkp.69.1658790506864; Mon, 25 Jul 2022 16:08:26 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 16:08:26 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 25 Jul 2022 19:07:48 -0400 Message-Id: <20220725230803.10002-18-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 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" X-getmail-retrieved-from-mailbox: Patches Automated via: git grep -l qtwebchannel | xargs sed 's/\bqtwebchannel\b/\0-5/g' -i git checkout NEWS --- gnu/packages/audio.scm | 2 +- gnu/packages/documentation.scm | 2 +- gnu/packages/education.scm | 4 ++-- gnu/packages/engineering.scm | 2 +- gnu/packages/fcitx5.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/image-viewers.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-pim.scm | 10 +++++----- gnu/packages/kde.scm | 4 ++-- gnu/packages/messaging.scm | 2 +- gnu/packages/qt.scm | 14 +++++++------- gnu/packages/sync.scm | 2 +- gnu/packages/text-editors.scm | 2 +- gnu/packages/web.scm | 2 +- 15 files changed, 27 insertions(+), 27 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 4a8c2f0fba..dc6fc94845 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3234,7 +3234,7 @@ (define-public supercollider qtbase-5 qtdeclarative-5 qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebsockets-5)) (propagated-inputs ;to get native-search-path (list qtwebengine)) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 2f4755de55..32dc26868d 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -383,7 +383,7 @@ (define-public zeal ("sqlite" ,sqlite) ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel-5" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine) ("qtquickcontrols-5" ,qtquickcontrols-5) ("qtx11extras" ,qtx11extras) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 6a9de32ffb..5551fd0594 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -561,7 +561,7 @@ (define-public openboard qtdeclarative-5 qtmultimedia-5 qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebengine qtxmlpatterns quazip-0 @@ -998,7 +998,7 @@ (define-public qolibri qtmultimedia-5 qtquickcontrols2-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine zlib)) (synopsis "EPWING dictionary reader") diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3b16ceac6b..463b90cd97 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2492,7 +2492,7 @@ (define-public freecad qtbase-5 qtdeclarative-5 qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebengine qtx11extras qtxmlpatterns diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 749c170fc7..ea7f1be752 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -393,7 +393,7 @@ (define-public fcitx5-chinese-addons ("qtbase" ,qtbase-5) ("fcitx5-qt" ,fcitx5-qt) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel-5" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine))) (native-inputs (list extra-cmake-modules pkg-config)) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0eaa64375d..324178181c 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1960,7 +1960,7 @@ (define-public qmapshack qtbase-5 qtdeclarative-5 qtlocation - qtwebchannel + qtwebchannel-5 qtwebengine quazip routino diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 2a472fb633..81b097df07 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -533,7 +533,7 @@ (define-public luminance-hdr openexr-2 qtwebengine qtdeclarative-5 - qtwebchannel + qtwebchannel-5 fftwf gsl libtiff)) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 97475063dc..2583a59a26 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -606,7 +606,7 @@ (define-public jami qrencode qtsvg-5 qtwebengine - qtwebchannel + qtwebchannel-5 qtmultimedia-5 qtdeclarative-5 qtgraphicaleffects diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 06da6db29a..b78c4b8c45 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -727,7 +727,7 @@ (define-public kdepim-runtime qtdeclarative-5 qtnetworkauth qtspeech - qtwebchannel + qtwebchannel-5 qtwebengine qtxmlpatterns)) (arguments @@ -1071,7 +1071,7 @@ (define-public kmail qgpgme qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine sonnet)) (arguments @@ -1323,7 +1323,7 @@ (define-public kmessagelib qgpgme qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine qtwebkit sonnet)) @@ -1849,7 +1849,7 @@ (define-public libkgapi kwindowsystem qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine)) (arguments `(#:tests? #f)) ;; TODO 6/48 tests fail @@ -1932,7 +1932,7 @@ (define-public libksieve libkdepim qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine)) (arguments `(#:phases diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index f11419afb9..6e9d9d125f 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -206,7 +206,7 @@ (define-public akregator qgpgme qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine syndication)) (home-page "https://apps.kde.org/en/akregator") @@ -1028,7 +1028,7 @@ (define-public marble-qt qtlocation qtserialport qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebengine shapelib shared-mime-info diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index bd2af2e732..c7457022c0 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2910,7 +2910,7 @@ (define-public movim-desktop "\"../build")) #t))))) (inputs - (list qtbase-5 qtdeclarative-5 qtwebchannel)) + (list qtbase-5 qtdeclarative-5 qtwebchannel-5)) (propagated-inputs (list qtwebengine)) (home-page "https://movim.eu/") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d0b9e8ea9c..a16b1285b4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1544,7 +1544,7 @@ (define-public qtserialbus access the various industrial serial buses and protocols, such as CAN, ModBus, and others."))) -(define-public qtwebchannel +(define-public qtwebchannel-5 (package (inherit qtsvg-5) (name "qtwebchannel") (version "5.15.2") @@ -2264,7 +2264,7 @@ (define (delete-unwanted-files child stat flag base level) qtbase-5 qtdeclarative-5 qtmultimedia-5 - qtwebchannel + qtwebchannel-5 re2 snappy eudev @@ -2507,7 +2507,7 @@ (define-public python-pyqt ("qtserialport" ,qtserialport) ("qtsvg-5" ,qtsvg-5) ("qttools" ,qttools) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel-5" ,qtwebchannel-5) ("qtwebkit" ,qtwebkit) ("qtwebsockets-5" ,qtwebsockets-5) ("qtx11extras" ,qtx11extras) @@ -2611,7 +2611,7 @@ (define-public python-pyqtwebengine ("qtbase" ,qtbase-5) ("qtsvg-5" ,qtsvg-5) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel-5" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine))) (arguments `(#:modules ((srfi srfi-1) @@ -3085,7 +3085,7 @@ (define-public qtwebkit ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel-5" ,qtwebchannel-5) ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("libx11" ,libx11) @@ -3322,7 +3322,7 @@ (define-public python-pyside-2 qtsensors qtspeech qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebengine qtwebsockets-5 qtx11extras @@ -3372,7 +3372,7 @@ (define-public python-pyside-2 "qtspeech" "qtsvg-5" "qttools" - "qtwebchannel" + "qtwebchannel-5" "qtwebengine" "qtwebsockets-5" "qtx11extras" diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 40385124fd..10aef0c83a 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -195,7 +195,7 @@ (define-public nextcloud-client qtquickcontrols2-5 qtsolutions qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebsockets-5 sqlite xdg-utils diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 6642620155..acf0400b75 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -671,7 +671,7 @@ (define-public ghostwriter qtmultimedia-5 qtquickcontrols-5 qtsvg-5 - qtwebchannel)) + qtwebchannel-5)) (propagated-inputs ; To get native-search-path (list qtwebengine)) (arguments diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8892281f0d..5f68d401ac 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8092,7 +8092,7 @@ (define-public kiwix-desktop pugixml qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine xapian zlib