From patchwork Wed Mar 13 09:01:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 61767 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 5322D27BBE9; Wed, 13 Mar 2024 09:03:36 +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=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 21BA227BBE2 for ; Wed, 13 Mar 2024 09:03:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkKVc-0007BG-Uc; Wed, 13 Mar 2024 05:02:49 -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 1rkKVK-0006cG-RZ for guix-patches@gnu.org; Wed, 13 Mar 2024 05:02:31 -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 1rkKVK-0003AG-HM for guix-patches@gnu.org; Wed, 13 Mar 2024 05:02:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rkKVr-0001U4-I3; Wed, 13 Mar 2024 05:03:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69628] [PATCH qt-team v4 22/24] gnu: qtspeech: Rename package to qtspeech-5. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 13 Mar 2024 09:03:03 +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: Adam Faiz , Liliana Marie Prikler , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 69628-submit@debbugs.gnu.org id=B69628.17103205785653 (code B ref 69628); Wed, 13 Mar 2024 09:03:03 +0000 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 09:02:58 +0000 Received: from localhost ([127.0.0.1]:44644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKVm-0001T7-2Z for submit@debbugs.gnu.org; Wed, 13 Mar 2024 05:02:58 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:36214 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKVg-0001S2-LV for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 05:02:56 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowADn7nqKa_Fl1U7gBQ--.45251S4; Wed, 13 Mar 2024 17:02:03 +0800 (CST) From: Zheng Junjie Date: Wed, 13 Mar 2024 17:01:54 +0800 Message-ID: <8493b5c163e43a6b1b08dfd029d467e6ad48b8b4.1710320157.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowADn7nqKa_Fl1U7gBQ--.45251S4 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUOY7k0a2IF6F4UM7kC6x804xWl14x267AK xVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2x26xkF7I0E14v26r18M28lY4IEw2II xxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjc xK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28E F7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487M2AExV AIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWU GVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7V AKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCj c4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_Jr0_Jr4lx4 CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26ryj6F1U MIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF 4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsG vfC2KfnxnUUI43ZEXa7IU1_gA7UUUUU== 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 (qtspeech): Rename to qtspeech-5. (python-pyside-2) * gnu/packages/games.scm (chessx) * gnu/packages/kde-frameworks.scm (ktextwidgets) * gnu/packages/kde-pim.scm (kdepim-runtime,kpimtextedit) * gnu/packages/kde-utils.scm (kmouth) * gnu/packages/kde.scm (okular) * gnu/packages/radio.scm (sdrangel): Adjust inputs. Change-Id: I65ae1f4e3601f0caa8304cea6fb12f991f8e52a1 --- gnu/packages/games.scm | 4 ++-- gnu/packages/kde-frameworks.scm | 6 +++--- gnu/packages/kde-pim.scm | 8 ++++---- gnu/packages/kde-utils.scm | 4 ++-- gnu/packages/kde.scm | 2 +- gnu/packages/qt.scm | 4 ++-- gnu/packages/radio.scm | 3 ++- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index db8d8da0a9..b95b089ed5 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -75,7 +75,7 @@ ;;; Copyright © 2022, 2024 Maxim Cournoyer ;;; Copyright © 2022 Hendursaga ;;; Copyright © 2022 Parnikkapore -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Florian Pelz ;;; Copyright © 2023 Ivana Drazovic ;;; Copyright © 2023, 2024 gemmaro @@ -10472,7 +10472,7 @@ (define-public chessx (native-inputs (list qttools-5)) (inputs - (list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib)) + (list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 zlib)) (arguments `(#:tests? #f #:phases diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 64e41b510d..88ce09f59e 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2021 Alexandros Theodotou ;;; Copyright © 2022 Brendan Tildesley ;;; Copyright © 2022 Petr Hodina -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. @@ -1985,7 +1985,7 @@ (define-public knotifications phonon qtdeclarative-5 qtbase-5 - qtspeech + qtspeech-5 qtx11extras)) (arguments (list #:phases #~(modify-phases %standard-phases @@ -3249,7 +3249,7 @@ (define-public ktextwidgets kwidgetsaddons kwindowsystem qtbase-5 - qtspeech)) + qtspeech-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Text editing widgets") (description "KTextWidgets provides widgets for displaying and editing text. diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index e95eac4e2f..c3f7f9a4d6 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -848,13 +848,13 @@ (define-public kdepim-runtime qtdeclarative-5 qtkeychain qtnetworkauth-5 - qtspeech + qtspeech-5 qtwebchannel-5 qtwebengine-5 qtxmlpatterns)) (arguments - ;; TODO: 5/45 tests fail for quite different reasons, even with - ;; "offscreen" and dbus + ;; TODO: 5/45 tests fail for quite different reasons, even with + ;; "offscreen" and dbus `(#:phases (modify-phases %standard-phases (add-after 'set-paths 'extend-CPLUS_INCLUDE_PATH (lambda* (#:key inputs #:allow-other-keys) @@ -1993,7 +1993,7 @@ (define-public kpimtextedit kwidgetsaddons kxmlgui qtbase-5 - qtspeech + qtspeech-5 sonnet)) (arguments `(#:tests? #f)) ;; TODO - test suite hangs diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 4e665da599..351a58687c 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2019 Hartmut Goebel ;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice -;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022 Brendan Tildesley ;;; Copyright © 2022 Petr Hodina ;;; @@ -874,7 +874,7 @@ (define-public kmouth kxmlgui breeze-icons ;; default icon set qtbase-5 - qtspeech)) + qtspeech-5)) (home-page "https://apps.kde.org/kmouth/") (synopsis "Type-and-say frontend for speech synthesizers") (description "KMouth is a program which enables persons that cannot speak diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 8e8bb32fda..385bb42926 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -1557,7 +1557,7 @@ (define-public okular kio kparts kpty - qtspeech + qtspeech-5 kwallet kwindowsystem libkexiv2 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f5c63800c9..22d6e696c0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2611,7 +2611,7 @@ (define-public qtremoteobjects (home-page (package-home-page qtbase)) (license (package-license qtbase)))) -(define-public qtspeech +(define-public qtspeech-5 (package (inherit qtsvg-5) (name "qtspeech") @@ -4565,7 +4565,7 @@ (define-public python-pyside-2 qtscript qtscxml qtsensors-5 - qtspeech + qtspeech-5 qtsvg-5 qttools-5 qtwebchannel-5 diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 9c8225d22b..74a74f9922 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2022 Ryan Tolboom ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2023 Efraim Flashner +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2671,7 +2672,7 @@ (define-public sdrangel qtmultimedia-5 qtquickcontrols2-5 qtserialport - qtspeech + qtspeech-5 qtwebchannel-5 qtwebengine-5 qtwebsockets-5