From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id OCcmDEAj32LrbwEAbAwnHQ (envelope-from ) for ; Tue, 26 Jul 2022 01:12:00 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id YFs4DEAj32JXWAEAauVa8A (envelope-from ) for ; Tue, 26 Jul 2022 01:12:00 +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 C915B39014 for ; Tue, 26 Jul 2022 01:11:59 +0200 (CEST) Received: from localhost ([::1]:36080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oG7F0-0007v3-0E for larch@yhetil.org; Mon, 25 Jul 2022 19:11:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oG7E9-0006aS-8E for guix-patches@gnu.org; Mon, 25 Jul 2022 19:11:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33733) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oG7E9-0005iw-0E for guix-patches@gnu.org; Mon, 25 Jul 2022 19:11:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oG7E8-0000I2-SM for guix-patches@gnu.org; Mon, 25 Jul 2022 19:11:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56771] [PATCH 14/33] gnu: qtquickcontrols2: Rename to qtquickcontrols2-5. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 23:11:04 +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.1658790621876 (code B ref 56771); Mon, 25 Jul 2022 23:11:04 +0000 Received: (at 56771) by debbugs.gnu.org; 25 Jul 2022 23:10:21 +0000 Received: from localhost ([127.0.0.1]:51682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oG7DQ-0000Dv-0h for submit@debbugs.gnu.org; Mon, 25 Jul 2022 19:10:20 -0400 Received: from mail-qk1-f171.google.com ([209.85.222.171]:37871) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oG7Bd-00006H-Hy for 56771@debbugs.gnu.org; Mon, 25 Jul 2022 19:08:30 -0400 Received: by mail-qk1-f171.google.com with SMTP id c24so9842000qkm.4 for <56771@debbugs.gnu.org>; Mon, 25 Jul 2022 16:08:29 -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=C8RIHooQ97c3GYkhGa6wL4GcKBykP7TAhTJtu1T3+60=; b=bLClg2bL68d9RpptGm184+Q/nd50gI5rerSK/P03/qlPNs4xDPo/LI6wA8Y3/kg28j X3EJYwLai4BRjQZR4n2vwgwuK+Pmqem37yBPMDpEab2MbKfU81tEFC0stloU/FnEQgCG cXaWQ5iPUH5K+n+FI4FjfryKLZa5LquCknwRFxNPpXnw67KAdr9SGhdola66/k4Eupa5 FsIkcC2/38KtLZtMoRJZBUFjsS6j+r+WJom8wzWVSf/BWgelRigM2cltTX2Jq8oAi+0N oU5btTFKNj6RToIVr2bSn0iDtcdrpa20doFIM62Ui+5SpwZF3Jiu3NFiZojxNcpt14MJ vIsw== 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=C8RIHooQ97c3GYkhGa6wL4GcKBykP7TAhTJtu1T3+60=; b=EUWAQcKgZxlsSAVDtLqTXL7y68zp5+7zVv/kkAVJe+wmosn3jtJD/MHq4M/KJ4GLp6 8D3ly+FgOpNSVK7V5AeflMgS+fVk5LLnuqaz6TkkEGcY4ZJLd3bzamqbetkhXGYnTIff aqWLmk8jDaHVEJGvlQw9anOVmin2wkBjnC8dpe8B7tpckDxDCxUK5IZMIiuHiyeXSkRu JrADFSSwzzcjtiO5/PvUHJkQ6cNMQ1CpkKnQBX2Rb+n7QdvRSNGj+lP5vSDtvWDFcQi+ f95zZx3nEz5/Zib5rBPgQCwkFr/AcJjTf+bB3nIX8GNtmgHSOp/Ax5d6K2IPr8rkrJBH 1qng== X-Gm-Message-State: AJIora8yic6ssMAhQxUfI29U5aQ+OT1Xk/PHyAetd1B1PEXCunxUwc6y zYLqIV0wwLwInsFXBOU+JIBLdRu/JS0= X-Google-Smtp-Source: AGRyM1s+Oxn9GN4Ok03weO9oqShwk3Mm/mMaop0zr10+1EobIxIo5YVca3Dn0zyqizwnBx6OfrDEGw== X-Received: by 2002:a05:620a:2615:b0:6b6:48cc:bd4d with SMTP id z21-20020a05620a261500b006b648ccbd4dmr8808148qko.102.1658790503778; Mon, 25 Jul 2022 16:08:23 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 16:08:23 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 25 Jul 2022 19:07:44 -0400 Message-Id: <20220725230803.10002-14-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=1658790720; 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=C8RIHooQ97c3GYkhGa6wL4GcKBykP7TAhTJtu1T3+60=; b=cTxr3Pk3e0U1iwav37ILZrdQ/9nuQwPRdFEKLnRtslZTwCNZ6chegsDBwa19b4fn+VbzI7 qAyu0GsA4HBbUak5At4Xqs35xozQQm0SFeN4kcP6Grb/GZhO9jn/TfNlDvS4IZE0Yx6QQg ArV69DQsc06uY0wVp9iuUoKo8yBZHDwyy3xSooW6DXNMy8Y2RG3p5oDRF/IK/s/SwF+JDW vfTehIcVzWnETZtKGEiWCGYbcRA5NB589RXLIJK5Zb70ZZeAVXjXCg+YRYjwgvYp3fg8ub JRt+A414YwoMh1OdKYiSBpcnlrnaEOn7qH5wYj0Oy3VpilLeZ14N5BaWCkRfOg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1658790720; a=rsa-sha256; cv=none; b=BBuT/L3Fq9be504Ozr8e+DlYbFvxmoUNkZbbjEeMisV1NBPg4PnoWx9eMasRswscTqDvdo haotCB0dWhjIKsvZs39aDZhsbZCgwtSh3MokSHpSFRn689pV8ds+5w8GQyItQFbR2VXiPa rPrt//+FRezZJeBY/9I8t8HXTkuM26+syd+djBpM6RMA3t33eKb2990MJ2UPy2jjTidN9c alpFwLVTT5mIg7QWoEEsnvAaTJZm+9ygHm3iJl0qR8PTXX5k54Za0Ko3Z6NZK2ZtyeclD3 TryvJW0lEvwgjMMRsPgfbSHmTAr60nhVhpKnCbZs4DcGggOCVDg1ccrtwKqNbA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=bLClg2bL; 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=bLClg2bL; 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: C915B39014 X-Spam-Score: 5.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: MYvrujy7PzF1 Automated via: git grep -l qtquickcontrols2 | xargs sed 's/\bqtquickcontrols2\b/\0-5/g' -i git checkout NEWS --- gnu/packages/display-managers.scm | 2 +- gnu/packages/education.scm | 4 ++-- gnu/packages/engineering.scm | 2 +- gnu/packages/finance.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-frameworks.scm | 6 +++--- gnu/packages/kde-multimedia.scm | 4 ++-- gnu/packages/kde.scm | 6 +++--- gnu/packages/linphone.scm | 2 +- gnu/packages/messaging.scm | 6 +++--- gnu/packages/music.scm | 2 +- gnu/packages/qt.scm | 6 +++--- gnu/packages/radio.scm | 4 ++-- gnu/packages/security-token.scm | 2 +- gnu/packages/sync.scm | 2 +- gnu/packages/terminals.scm | 4 ++-- gnu/packages/video.scm | 2 +- gnu/packages/vpn.scm | 2 +- 18 files changed, 30 insertions(+), 30 deletions(-) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 7e0218dbb7..32ec5c3141 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -92,7 +92,7 @@ (define-public sddm ;; 'wrap-qt-program'. qtgraphicaleffects qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 shadow wayland)) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index cb0d71cc54..6a9de32ffb 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -674,7 +674,7 @@ (define-public ktouch qtbase-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols2 + qtquickcontrols2-5 qtx11extras qtxmlpatterns)) (home-page "https://edu.kde.org/ktouch/") @@ -996,7 +996,7 @@ (define-public qolibri (list libeb qtbase-5 qtmultimedia-5 - qtquickcontrols2 + qtquickcontrols2-5 qtdeclarative-5 qtwebchannel qtwebengine diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f4308cddd9..3b16ceac6b 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3425,7 +3425,7 @@ (define-public uranium qtdeclarative-5 qtgraphicaleffects qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5)) (arguments `(;; FIXME: tests are disabled, because they cause an infinite loop. diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index fea5fa4e77..f1f568fcb2 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -806,7 +806,7 @@ (define-public monero-gui ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols-5" ,qtquickcontrols-5) - ("qtquickcontrols2",qtquickcontrols2) + ("qtquickcontrols2-5",qtquickcontrols2-5) ("qtsvg-5" ,qtsvg-5) ("qtxmlpatterns" ,qtxmlpatterns))) (arguments diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 8d8d29c0db..97475063dc 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -611,7 +611,7 @@ (define-public jami qtdeclarative-5 qtgraphicaleffects qtquickcontrols-5 - qtquickcontrols2)) + qtquickcontrols2-5)) (home-page "https://jami.net") (synopsis "Qt Jami client") (description "This package provides the Jami Qt client. Jami is a secure diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 1c10183f29..6fc0b5f10c 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -876,7 +876,7 @@ (define-public kirigami ;;("plasma-frameworks" ,plasma-framework) ;; Tier 3! qtbase-5 qtdeclarative-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 ;; Run-time dependency qtgraphicaleffects)) @@ -1342,7 +1342,7 @@ (define-public qqc2-desktop-style kirigami qtbase-5 qtdeclarative-5 - qtquickcontrols2)) + qtquickcontrols2-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "QtQuickControls2 style that integrates with the desktop") (description "This is a style for QtQuickControls2 which is using @@ -3338,7 +3338,7 @@ (define-public plasma-framework ("phonon" ,phonon) ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2-5" ,qtquickcontrols2-5) ("qtsvg-5" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("solid" ,solid))) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 34da2ef3f2..ac86489a95 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -176,7 +176,7 @@ (define-public elisa qtgraphicaleffects ; not listed as dependency qtmultimedia-5 qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 qtx11extras ;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt @@ -532,7 +532,7 @@ (define-public kamoso qtdeclarative-5 qtgraphicaleffects qtquickcontrols-5 - qtquickcontrols2 ; not listed as dependency + qtquickcontrols2-5 ; not listed as dependency qtx11extras)) (arguments (list #:tests? #f ; test program gets built, but is not found diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 143cb3b6a9..f11419afb9 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -290,7 +290,7 @@ (define-public kdenlive qtmultimedia-5 qtnetworkauth qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtscript qtsvg-5 shared-mime-info)) @@ -347,7 +347,7 @@ (define-public kdevelop ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) ("qtquickcontrols-5" ,qtquickcontrols-5) ;; not checked as requirement - ("qtquickcontrols2" ,qtquickcontrols2) ;; not checked as requirement + ("qtquickcontrols2-5" ,qtquickcontrols2-5) ;; not checked as requirement ("qtwebkit" ,qtwebkit) ("threadweaver" ,threadweaver) @@ -749,7 +749,7 @@ (define-public kdeconnect qtgraphicaleffects qtmultimedia-5 qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtx11extras)) (home-page "https://community.kde.org/KDEConnect") (synopsis "Enable your devices to communicate with each other") diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index a488fc3244..47fb94dc68 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -855,7 +855,7 @@ (define-public linphone-desktop qtdeclarative-5 qtgraphicaleffects qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5)) (synopsis "Desktop client for the Linphone SIP softphone") (description "Linphone is a SIP softphone for voice and video over IP calling diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index fcfe9c2c50..bd2af2e732 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1478,7 +1478,7 @@ (define-public kaidan qtdeclarative-5 qtgraphicaleffects qtlocation - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 qtmultimedia-5 qtxmlpatterns @@ -2461,7 +2461,7 @@ (define-public nheko qtkeychain qtgraphicaleffects qtmultimedia-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 spdlog single-application-qt5 @@ -2500,7 +2500,7 @@ (define-public quaternion qtdeclarative-5 qtmultimedia-5 qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 qttools xdg-utils)) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5c04382209..f7a2483b65 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4758,7 +4758,7 @@ (define-public musescore qtbase-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols2 + qtquickcontrols2-5 qtscript qtsvg-5 qtxmlpatterns)) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 9a86b252b3..6851dd22b6 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1658,7 +1658,7 @@ (define-public qtquickcontrols-5 applications scriptable. This module provides a set of extra components that can be used to build complete interfaces in Qt Quick."))) -(define-public qtquickcontrols2 +(define-public qtquickcontrols2-5 (package (inherit qtsvg-5) (name "qtquickcontrols2") (version "5.15.2") @@ -3271,7 +3271,7 @@ (define-public python-pyside-2 qtlocation qtmultimedia-5 qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtscript qtscxml qtsensors @@ -3320,7 +3320,7 @@ (define-public python-pyside-2 "qtlocation" "qtmultimedia-5" "qtquickcontrols-5" - "qtquickcontrols2" + "qtquickcontrols2-5" "qtscript" "qtscxml" "qtsensors" diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 1438d4fd7d..989d5670f4 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1931,7 +1931,7 @@ (define-public welle-io qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 - qtquickcontrols2 + qtquickcontrols2-5 soapysdr)) (arguments `(#:configure-flags '("-DRTLSDR=ON" @@ -2162,7 +2162,7 @@ (define-public sdrangel qtdeclarative-5 qtlocation qtmultimedia-5 - qtquickcontrols2 + qtquickcontrols2-5 qtserialport qtspeech qtwebsockets diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index a93278e016..41207318a1 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -863,7 +863,7 @@ (define-public ausweisapp2 qtdeclarative-5 qtwebsockets qtgraphicaleffects - qtquickcontrols2 + qtquickcontrols2-5 pcsc-lite openssl)) (arguments diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 23294e39f6..f364195341 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -192,7 +192,7 @@ (define-public nextcloud-client qtdeclarative-5 qtgraphicaleffects qtkeychain - qtquickcontrols2 + qtquickcontrols2-5 qtsolutions qtsvg-5 qtwebchannel diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 2d43cfa493..7e5016f08f 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -783,7 +783,7 @@ (define-public cool-retro-term (("COMMODORE_PET") "PROGGY_TINY")))))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtdeclarative-5 qtgraphicaleffects qtquickcontrols2 bash-minimal)) + (list qtbase-5 qtdeclarative-5 qtgraphicaleffects qtquickcontrols2-5 bash-minimal)) (arguments `(#:phases (modify-phases %standard-phases @@ -807,7 +807,7 @@ (define-public cool-retro-term (string-append (assoc-ref inputs i) qml)) '("qtdeclarative-5" "qtgraphicaleffects" - "qtquickcontrols2")))))))) + "qtquickcontrols2-5")))))))) (add-after 'install 'add-alternate-name (lambda* (#:key outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 726ed15e47..ed8ba06779 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4861,7 +4861,7 @@ (define-public shotcut qtgraphicaleffects qtmultimedia-5 qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 qtwebkit qtwebsockets diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index bde96d6a90..ccba5b9968 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -258,7 +258,7 @@ (define-public bitmask ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols-5" ,qtquickcontrols-5) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2-5" ,qtquickcontrols2-5) ("qtsvg-5" ,qtsvg-5))) (propagated-inputs (list go-0xacab-org-leap-shapeshifter -- 2.36.1