From patchwork Mon Jul 25 23:07:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 40966 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 B71B127BBEA; Tue, 26 Jul 2022 00:11:27 +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 434A427BBE9 for ; Tue, 26 Jul 2022 00:11:26 +0100 (BST) Received: from localhost ([::1]:34342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oG7ET-0006bm-A0 for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 19:11:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oG7E8-0006aG-2x for guix-patches@gnu.org; Mon, 25 Jul 2022 19:11:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33727) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oG7E6-0005iL-NQ for guix-patches@gnu.org; Mon, 25 Jul 2022 19:11:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oG7E6-0000HF-Jc for guix-patches@gnu.org; Mon, 25 Jul 2022 19:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56771] [PATCH 13/33] gnu: qtquickcontrols: Rename to qtquickcontrols-5. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 23:11:02 +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.1658790614819 (code B ref 56771); Mon, 25 Jul 2022 23:11:02 +0000 Received: (at 56771) by debbugs.gnu.org; 25 Jul 2022 23:10:14 +0000 Received: from localhost ([127.0.0.1]:51670 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oG7DJ-0000D3-Ld for submit@debbugs.gnu.org; Mon, 25 Jul 2022 19:10:14 -0400 Received: from mail-qk1-f170.google.com ([209.85.222.170]:43577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oG7BX-00005F-Iu for 56771@debbugs.gnu.org; Mon, 25 Jul 2022 19:08:25 -0400 Received: by mail-qk1-f170.google.com with SMTP id o21so9834124qkm.10 for <56771@debbugs.gnu.org>; Mon, 25 Jul 2022 16:08:23 -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=3fdDBCy5LkVL61H+BRP2I2KitzJEMNLnPdlmOy/PlSY=; b=gZ9EQH+jQknrjQSB8MSfivpm4K5uMwI7g3t6VXoAbhsI3okpXrzLsL2BBLGPRby0vh /uY6ngipZH42V9dfmPBz61sjoA/WkOSMC9c3WW72Z90D866y2w73LZP2H5ZebT3NX9h3 a+llt0Av7ynMY+Kv7hIEhMWitB/10SMX0Qa+0goFFOxN+rPtovKjU2Fp+3gOkFTV32Pb ErXJ8JcvgvW6BrMWqOX4gf7nyjCROvDBJsF7NimH3gOHBoDkRPMdlAwzJUPXEc2lmbox 6mrWcQXiNQutqyRkigD0GrCOP02IyXzDYduSkUivYa4RTJqN9mVV/XlNON2/G3qFh13l aaNA== 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=3fdDBCy5LkVL61H+BRP2I2KitzJEMNLnPdlmOy/PlSY=; b=4fRVXduzZ6VXP0dnLfrrHrRreMK4OpPY1gXz1AVmIruK9P5oWZydhmjjAKxPUlOpWi a232Wy51Y70YXzOd8M2Ena/jXChwAuPFj4fEIfeWY6QceGvI8xbi+3Do1Ivcog8N0bNV coIDN3UXAYDptzqYiR4A+eZk6xRyNMVgWuOMc2qYjPXCWm4r4grpEpah93GrpVqip3z3 KBPDdSfoSZGMF0H6JEiwHYSLzMqvxzHagvBJBuqhbFBrj0yZY+sLr78u2TaN7EWOSjvo J9M7dWlTJ7LraRXfaluxz21sPZLEHlLW+sWBPptsUgdZMRsWRFwOH8e3E24h+dIt7FZs /msw== X-Gm-Message-State: AJIora+XtJlPzc1vkngkoSAsjLjTYDk1OwMaiIKhzYP03bfHdy11XcYH pzDTfDKrf0v/st2dS8eFs+7hFY0Ug8c= X-Google-Smtp-Source: AGRyM1t7j8otJbrZF1sNI8PaG3jP4HxMwvyg5FHzJ8r9Wg1Zflez5kf8kydJ0HvQx28BwOSBrcXfGw== X-Received: by 2002:a05:620a:4551:b0:6b6:1d51:99a0 with SMTP id u17-20020a05620a455100b006b61d5199a0mr10765859qkp.187.1658790502952; Mon, 25 Jul 2022 16:08:22 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 16:08:22 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 25 Jul 2022 19:07:43 -0400 Message-Id: <20220725230803.10002-13-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 qtquickcontrols | xargs sed 's/\bqtquickcontrols\b/\0-5/g' -i git checkout NEWS --- gnu/packages/audio.scm | 2 +- gnu/packages/display-managers.scm | 2 +- gnu/packages/documentation.scm | 2 +- gnu/packages/education.scm | 2 +- gnu/packages/engineering.scm | 2 +- gnu/packages/finance.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-multimedia.scm | 4 ++-- gnu/packages/kde.scm | 6 +++--- gnu/packages/linphone.scm | 2 +- gnu/packages/messaging.scm | 2 +- gnu/packages/qt.scm | 8 ++++---- gnu/packages/telephony.scm | 2 +- gnu/packages/text-editors.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/vpn.scm | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b041ade63d..107deef3de 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -5459,7 +5459,7 @@ (define-public ableton-link qttools)) (inputs (list jack-1 ;for JACK examples - qtquickcontrols)) ;for Qt examples + qtquickcontrols-5)) ;for Qt examples (propagated-inputs ;; This is because include/ableton/platforms/asio/AsioWrapper.hpp ;; contains '#include '. diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index e19935daa8..7e0218dbb7 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -91,7 +91,7 @@ (define-public sddm ;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to ;; 'wrap-qt-program'. qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5 shadow diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 74356318a1..2f4755de55 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -385,7 +385,7 @@ (define-public zeal ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols-5" ,qtquickcontrols-5) ("qtx11extras" ,qtx11extras) ("xcb-util-keyms" ,xcb-util-keysyms))) (home-page "https://zealdocs.org/") diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 690de4d7de..cb0d71cc54 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -183,7 +183,7 @@ (define-public gcompris-qt qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtsensors qtsvg-5 qtxmlpatterns)) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index c05e4cdf0a..f4308cddd9 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3424,7 +3424,7 @@ (define-public uranium qtbase qtdeclarative-5 qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5)) (arguments diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index e753de7758..fea5fa4e77 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -805,7 +805,7 @@ (define-public monero-gui ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols-5" ,qtquickcontrols-5) ("qtquickcontrols2",qtquickcontrols2) ("qtsvg-5" ,qtsvg-5) ("qtxmlpatterns" ,qtxmlpatterns))) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 181068cc24..8d8d29c0db 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -610,7 +610,7 @@ (define-public jami qtmultimedia-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2)) (home-page "https://jami.net") (synopsis "Qt Jami client") diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 1c79cd16bc..34da2ef3f2 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -175,7 +175,7 @@ (define-public elisa qtdeclarative-5 qtgraphicaleffects ; not listed as dependency qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5 qtx11extras @@ -531,7 +531,7 @@ (define-public kamoso qtbase-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 ; not listed as dependency qtx11extras)) (arguments diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index a0d73b5252..143cb3b6a9 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -289,7 +289,7 @@ (define-public kdenlive qtgraphicaleffects qtmultimedia-5 qtnetworkauth - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtscript qtsvg-5 @@ -346,7 +346,7 @@ (define-public kdevelop ("oxygen-icons" ,oxygen-icons) ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtquickcontrols" ,qtquickcontrols) ;; not checked as requirement + ("qtquickcontrols-5" ,qtquickcontrols-5) ;; not checked as requirement ("qtquickcontrols2" ,qtquickcontrols2) ;; not checked as requirement ("qtwebkit" ,qtwebkit) ("threadweaver" ,threadweaver) @@ -748,7 +748,7 @@ (define-public kdeconnect qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtx11extras)) (home-page "https://community.kde.org/KDEConnect") diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index d30f598c7e..a488fc3244 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -854,7 +854,7 @@ (define-public linphone-desktop qtbase-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5)) (synopsis "Desktop client for the Linphone SIP softphone") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 83615fedfe..fcfe9c2c50 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2499,7 +2499,7 @@ (define-public quaternion qtbase-5 qtdeclarative-5 qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5 qttools diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 7851509513..9a86b252b3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1589,7 +1589,7 @@ (define-public qtlocation (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs - (list perl qtdeclarative-5 qtquickcontrols qtserialport)) + (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport)) (inputs (list icu4c openssl qtbase-5 zlib)) (synopsis "Qt Location and Positioning modules") @@ -1638,7 +1638,7 @@ (define-public qtscript The following guides and references cover aspects of programming with ECMAScript and Qt."))) -(define-public qtquickcontrols +(define-public qtquickcontrols-5 (package (inherit qtsvg-5) (name "qtquickcontrols") (version "5.15.2") @@ -3270,7 +3270,7 @@ (define-public python-pyside-2 qtdeclarative-5 qtlocation qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtscript qtscxml @@ -3319,7 +3319,7 @@ (define-public python-pyside-2 "qtdeclarative-5" "qtlocation" "qtmultimedia-5" - "qtquickcontrols" + "qtquickcontrols-5" "qtquickcontrols2" "qtscript" "qtscxml" diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 5ef93fc3f1..c711c3512f 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -707,7 +707,7 @@ (define-public twinkle libxml2 qtbase-5 qtdeclarative-5 - qtquickcontrols + qtquickcontrols-5 readline speex speexdsp diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 7abf5b6328..6642620155 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -669,7 +669,7 @@ (define-public ghostwriter qtbase-5 qtdeclarative-5 qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtsvg-5 qtwebchannel)) (propagated-inputs ; To get native-search-path diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2a9ee09edf..726ed15e47 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4860,7 +4860,7 @@ (define-public shotcut qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5 qtwebkit diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 7c06fff070..bde96d6a90 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -257,7 +257,7 @@ (define-public bitmask ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols-5" ,qtquickcontrols-5) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg-5" ,qtsvg-5))) (propagated-inputs