From patchwork Wed Mar 13 08:58:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 61754 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 8E92E27BBE2; Wed, 13 Mar 2024 09:00:56 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 A0A6E27BBEA for ; Wed, 13 Mar 2024 09:00:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkKSq-0001hr-DP; Wed, 13 Mar 2024 04:59:56 -0400 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 1rkKSc-00016O-DG for guix-patches@gnu.org; Wed, 13 Mar 2024 04:59:47 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkKSc-0002PR-2p for guix-patches@gnu.org; Wed, 13 Mar 2024 04:59:42 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rkKT4-0001Lv-VF; Wed, 13 Mar 2024 05:00:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69628] [PATCH qt-team v4 20/24] gnu: qtsensors: Rename package to qtsensors-5. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, maxim.cournoyer@gmail.com, sharlatanus@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 13 Mar 2024 09:00:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69628 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69628@debbugs.gnu.org Cc: Andreas Enge , Eric Bavier , Maxim Cournoyer , Sharlatan Hellseher , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Maxim Cournoyer , Sharlatan Hellseher , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 69628-submit@debbugs.gnu.org id=B69628.17103203894994 (code B ref 69628); Wed, 13 Mar 2024 09:00:10 +0000 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:49 +0000 Received: from localhost ([127.0.0.1]:44563 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSj-0001IP-3z for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:49 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34962 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSb-0001F2-Lm for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:43 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S22; Wed, 13 Mar 2024 16:58:54 +0800 (CST) From: Zheng Junjie Date: Wed, 13 Mar 2024 16:58:14 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S22 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUOz7k0a2IF6F4UM7kC6x804xWl14x267AK xVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26r4j6ryUM28l Y4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr 1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Cr1j 6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv04 87M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY 67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y4 8IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMxC20s02 6xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_Jr 0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v2 6ryj6F1UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj4 0_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8 JrUvcSsGvfC2KfnxnUUI43ZEXa7IU0jXdUUUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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 * gnu/packages/qt.scm (qtsensors): Rename to qtsensors-5 * gnu/packages/qt.scm (python-pyqt, python-pyside-2) * gnu/packages/geo.scm (openorienteering-mapper) * gnu/packages/kde-plasma.scm (kscreen) * gnu/packages/education.scm (gcompris-qt) Adjust inputs. Change-Id: Ie18fdf82881e508ecc25c535088672d1a89f19ba --- gnu/packages/education.scm | 3 ++- gnu/packages/geo.scm | 3 ++- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/qt.scm | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 698f15678b..fb432ee844 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2021 Nicolò Balzarotti ;;; Copyright © 2022 Luis Felipe López Acevedo ;;; Copyright © 2023 Maxim Cournoyer +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -192,7 +193,7 @@ (define-public gcompris-qt qtgraphicaleffects qtmultimedia-5 qtquickcontrols2-5 - qtsensors + qtsensors-5 qtsvg-5)) (home-page "https://gcompris.net/index-en.html") (synopsis "Educational games for small children") diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 687effcace..2a1bf2b935 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2022 Roman Scherer ;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; Copyright © 2022 Denis 'GNUtoo' Carikli +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2575,7 +2576,7 @@ (define-public openorienteering-mapper qtbase-5 qtimageformats-5 qtlocation - qtsensors + qtsensors-5 zlib)) (native-inputs (list doxygen diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index cf45fa59f7..1d41d35a56 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -793,7 +793,7 @@ (define-public kscreen libkscreen libxi plasma-wayland-protocols - qtsensors + qtsensors-5 qtbase-5 qtx11extras xcb-util)) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6b58fe2211..5a24b7da25 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1664,7 +1664,7 @@ (define-public qtwebsockets (home-page (package-home-page qtbase)) (license (package-license qtbase)))) -(define-public qtsensors +(define-public qtsensors-5 (package (inherit qtsvg-5) (name "qtsensors") @@ -3730,7 +3730,7 @@ (define-public python-pyqt ("qtdeclarative-5" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) - ("qtsensors" ,qtsensors) + ("qtsensors" ,qtsensors-5) ("qtserialport" ,qtserialport) ("qtsvg-5" ,qtsvg-5) ("qttools-5" ,qttools-5) @@ -4545,7 +4545,7 @@ (define-public python-pyside-2 qtquickcontrols2-5 qtscript qtscxml - qtsensors + qtsensors-5 qtspeech qtsvg-5 qttools-5