From patchwork Wed Jan 17 20:36:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 59047 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 6EDDA27BBE9; Wed, 17 Jan 2024 20:38:24 +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=-3.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A 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 62DCE27BBE2 for ; Wed, 17 Jan 2024 20:38:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQCfl-0007iI-NK; Wed, 17 Jan 2024 15:38:05 -0500 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 1rQCfj-0007bB-LN for guix-patches@gnu.org; Wed, 17 Jan 2024 15:38:04 -0500 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 1rQCfj-0007NL-Cp for guix-patches@gnu.org; Wed, 17 Jan 2024 15:38:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQCfi-0002bK-Ce; Wed, 17 Jan 2024 15:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68500] [PATCH v1 1/2] gnu: qtscxml: Update to 6.5.2. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: sarg@sarg.org.ru, maxim.cournoyer@gmail.com, andreas@enge.fr, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 17 Jan 2024 20:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68500 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 68500@debbugs.gnu.org Cc: Sergey Trofimov , Sergey Trofimov , Maxim Cournoyer , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Sergey Trofimov , Maxim Cournoyer , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 68500-submit@debbugs.gnu.org id=B68500.17055238289908 (code B ref 68500); Wed, 17 Jan 2024 20:38:02 +0000 Received: (at 68500) by debbugs.gnu.org; 17 Jan 2024 20:37:08 +0000 Received: from localhost ([127.0.0.1]:53620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQCep-0002Zj-GC for submit@debbugs.gnu.org; Wed, 17 Jan 2024 15:37:07 -0500 Received: from mail-lj1-x231.google.com ([2a00:1450:4864:20::231]:55471) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQCel-0002Ys-Ag for 68500@debbugs.gnu.org; Wed, 17 Jan 2024 15:37:03 -0500 Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2cd8b64a52dso73982751fa.2 for <68500@debbugs.gnu.org>; Wed, 17 Jan 2024 12:37:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1705523815; x=1706128615; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=b/cVKTB1cPTAxwNUEMSQGHjlVdj0SouaFhIkA7PuL5s=; b=IjRqjZSKxl9h6ZbSZWJmo8X0zHz7jIqlgb+RKK7UxpIZAD5XnDV+ANJZSVOGipttCu FMU4b9ATJYwjMuzQgVXVIfUZBPEr4X607HYFZ2gtxRYIIC7hX7EJnmRe98TsYsZPMilV 9nAwwcFqZsm00gC0mX6aLdTy9e0jXb84aJNug= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705523815; x=1706128615; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b/cVKTB1cPTAxwNUEMSQGHjlVdj0SouaFhIkA7PuL5s=; b=qrSYxWhCFbn4KDTqTVx2RvTM2i/M1kQmRkMRE0ServgTRk7Kd76ckKvo5HXQTZn2QB t9z3DSIt+IpZRr37XUNM1MNrytJXfPmOXnal5TBUrO75JkCNKWZcA/b2oE+DoYtiBZzz L5V02pDnMgm2ZmM2KC7zepqHG5J6WcweIt/LZ7zjf//SbhCfieUPXCl1m29Vt9lTL+dL W3KoFdGgtW7qJGbYwD2fAiJlM127fRgYu05g71ZcNKzJ4gRfxvcRpM9Q3x084LX3gzPX IAgDAgbjBw/nGImkmGc2Qg//q0mttw3ce1ecH2q8mhENkTM+6gxI7lCeIMDCx+sW3VEv JvGQ== X-Gm-Message-State: AOJu0Yxtq0PCKf3RGBCZZv6IrD9XI4V3D2t2h0zWdU06DI4cchvd0hI8 G331FuZmF0sud88TEn5pucOODJYnH9zyGhJN8eAKXmU+DuOEgg== X-Google-Smtp-Source: AGHT+IHpuz9qIOtnmGiBQDJatanFkAR0ZHC/STHv5H8E+GLnj7WkCtAI/JVMrAcaucUPZdAAF57OsA== X-Received: by 2002:a2e:5c03:0:b0:2cd:613a:8cd4 with SMTP id q3-20020a2e5c03000000b002cd613a8cd4mr4441568ljb.5.1705523815437; Wed, 17 Jan 2024 12:36:55 -0800 (PST) Received: from localhost ([2a02:2454:a09d:d000:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id p11-20020a056402500b00b005598ec568dbsm2472803eda.59.2024.01.17.12.36.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jan 2024 12:36:55 -0800 (PST) From: Sergey Trofimov Date: Wed, 17 Jan 2024 21:36:44 +0100 Message-ID: <9b0b983a7d860ae24e0d3bf9eff0e62a301573a1.1705523575.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/qt.scm (qtscxml): Update to 6.5.2. (qtscxml-5): Add qt5 variant. (python-pyside-2)[inputs]: Use qtscxml-5. --- gnu/packages/qt.scm | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2b89e7e738..febffff90e 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2316,7 +2316,7 @@ (define-public qtgamepad primary target audience are embedded devices with fullscreen user interfaces, and mobile applications targeting TV-like form factors."))) -(define-public qtscxml +(define-public qtscxml-5 (package (inherit qtsvg-5) (name "qtscxml") @@ -2344,6 +2344,45 @@ (define-public qtscxml generating a C++ file that has a class implementing the state machine. It also contains functionality to support data models and executable content."))) +(define-public qtscxml + (package + (name "qtscxml") + (version "6.5.2") + (source (origin + (method url-fetch) + (uri (qt-url name version)) + (sha256 + (base32 + "1jxx9p7zi40r990ky991xd43mv6i8hdpnj2fhl7sf4q9fpng4c58")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "tests/3rdparty"))))) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (delete 'check) ;move after the install phase + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-before 'check 'check-setup + (lambda _ + (setenv "ARGS" "-E tst_scion") + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "QML2_IMPORT_PATH" + (string-append #$output "/lib/qt6/qml:" + (getenv "QML2_IMPORT_PATH")))))))) + (build-system cmake-build-system) + (inputs (list qtbase qtdeclarative libxkbcommon)) + (synopsis "Qt SCXML module") + (description "The Qt SCXML module provides functionality to create state +machines from SCXML files. This includes both dynamically creating state +machines (loading the SCXML file and instantiating states and transitions) and +generating a C++ file that has a class implementing the state machine. It +also contains functionality to support data models and executable content.") + (home-page (package-home-page qtbase)) + (license (package-license qtbase)))) + (define-public qtpositioning (package (name "qtpositioning") @@ -4453,7 +4492,7 @@ (define-public python-pyside-2 qtquickcontrols-5 qtquickcontrols2-5 qtscript - qtscxml + qtscxml-5 qtsensors qtspeech qtsvg-5