From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 0Fe8FpMN5mX3bwEAe85BDQ:P1 (envelope-from ) for ; Mon, 04 Mar 2024 19:06:11 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 0Fe8FpMN5mX3bwEAe85BDQ (envelope-from ) for ; Mon, 04 Mar 2024 19:06:11 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=sarg.org.ru header.s=google header.b=hcCBSW4T; 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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1709575571; 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=Ox+6b3dgqCqIQucGosOEVuA+j/SBcSSG+a8KI2zjUWE=; b=qSFJKWOkTHa8vgzud/fQ+k6vQBBIZVBMtSW5f4Qhg3Af3CdaRpbMqylD19TjB2QIL39I2K IZSasKBh30+sdHWLdtAAPzkE/yVuk2wYpO7RuGiafNCXWwlbmz9LkzhFnwFb8oov4THA+Z ItSHtOxB3UOrhSQoscqE/UB6fhyBnMAHz4ZcstkS2/Nss5KFz5LtuwLnmYJ6GWYKR4ph3k CWid21QF1Tf7iGAZrdMREh+VJdl/F4j8OkaP7NT5Xq1v2XIHtFsK4JM6iQoJ1UVWX1D9r6 FNlXhOdeA/uGDYNCJp4xMRrNHXMu6nsLYp2EJCNkEQR9n2BN6qdMk9GB3ViZDg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=sarg.org.ru header.s=google header.b=hcCBSW4T; 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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1709575571; a=rsa-sha256; cv=none; b=RdfXlYswnT+RQwKVU1iGBa3xfUlNJ1ODE1oQSz9to5IVFDXaUegMZEVli/veMDNINX2L9d ih12GVByKjawE1+ZhvU6e72dbpvMuP8DHATgHpkjZl02C6K0CPAtGqPp/GAn5dNMpDxJzv BLUdi7oeyHgZRx5TZpO7b1DUpl6WqOcLf/jJnG0M5QcZwHSUYGM4d6wb0TKrtQM1KKU7Tu 0eGVblGyoL12+amiEMM8jzcfxj0ljodIx6P4hsBPPMRcrY/KhQ5is5AqEDQQAqmITiMmGV nu/i6Zs9g0LZfG6F/zAPkq0J6H5nbK9TVUPlSaJ4svUdHOVCii3ZnYUclXowDQ== 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 D232FAD45 for ; Mon, 4 Mar 2024 19:06:10 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhCh2-0002MN-D7; Mon, 04 Mar 2024 13:05:40 -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 1rhCgz-0002Lm-2u for guix-patches@gnu.org; Mon, 04 Mar 2024 13:05:38 -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 1rhCgy-00076A-RF for guix-patches@gnu.org; Mon, 04 Mar 2024 13:05:36 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rhChN-0005XO-LM; Mon, 04 Mar 2024 13:06:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68500] [PATCH v2 1/2] gnu: qtscxml: Update to 6.5.2. References: In-Reply-To: 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: Mon, 04 Mar 2024 18:06:01 +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?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Sergey Trofimov , Maxim Cournoyer , Andreas Enge , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 68500-submit@debbugs.gnu.org id=B68500.170957552021225 (code B ref 68500); Mon, 04 Mar 2024 18:06:01 +0000 Received: (at 68500) by debbugs.gnu.org; 4 Mar 2024 18:05:20 +0000 Received: from localhost ([127.0.0.1]:44843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhCgi-0005WG-0Q for submit@debbugs.gnu.org; Mon, 04 Mar 2024 13:05:20 -0500 Received: from mail-wm1-f49.google.com ([209.85.128.49]:57512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhCgf-0005W1-8d for 68500@debbugs.gnu.org; Mon, 04 Mar 2024 13:05:19 -0500 Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-412e4426e32so8350485e9.2 for <68500@debbugs.gnu.org>; Mon, 04 Mar 2024 10:04:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1709575421; x=1710180221; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Ox+6b3dgqCqIQucGosOEVuA+j/SBcSSG+a8KI2zjUWE=; b=hcCBSW4TutAxDutqBbOfvIlRV9RyKNMYrVmsBxAaI5KS/rnWM1vCRSjNuQAE6M1HaV 7Q96HHvUxPpLEolz40poKpkqYoJyAK+5P3VlBzhVhtxE7zEOqV2V5X0eygq1/Qoqxul5 e/1FqTylHMEzem+bVirtX+0ScT53xdR2Pah+Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709575421; x=1710180221; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Ox+6b3dgqCqIQucGosOEVuA+j/SBcSSG+a8KI2zjUWE=; b=TRr+SYBySexzY3j7T99p8DerumP8nIPI0KjGCXnV5Vj9iMviDlTBiaLLk4p3xvh7LG uT6sBdqMwddSmm67gI+XfnmE/jKcTq5ju+Y/uip8FQTfOYjthWH9UMNt4E9eXZ6aBMET IPQsMuJ+ABGHpYnwDOJKYCLc+v7QcDp5EYWtS9znCr0gCB7k/QnjaWKXe2cd5p3/cFJd uuAtHzbLSmbd0egM+sg+Fe2MnIfVulpzDVYjlFKZ/0+d4MlX6UXKaS7GAIhe5GTqeHwP 1tF33Zs0BTcJ3RuFjHdz/NrhriDFZaawQ9phiiwLFCiEpw5tzYAMcIAPtuCV5fyO9YmW wtnw== X-Gm-Message-State: AOJu0YxOTpHPT0OVfxJmyIbIyxDxSTYWYwgsuduMjGhsM+lbS7kVwRdf fzeZURDyTrm9xJKFdc95/YwPusdmLs8FsK39WneSL8UFPVQXNT5UyX2rdqRkv34xd6bNU6DJl4w N X-Google-Smtp-Source: AGHT+IEXekBiUlPBC1zfYE41pkXDJ72r9WooPHYFM6ViLJhz6w5d8wKLyCMwX1VYII0ZFQR5buzvBw== X-Received: by 2002:a5d:6b82:0:b0:33d:3695:5880 with SMTP id n2-20020a5d6b82000000b0033d36955880mr5942106wrx.48.1709575421395; Mon, 04 Mar 2024 10:03:41 -0800 (PST) Received: from localhost ([2a02:2454:a09d:d000:3f1e:a87:ccd2:4aec]) by smtp.gmail.com with ESMTPSA id cr11-20020a05600004eb00b0033dd2c3131fsm12652642wrb.65.2024.03.04.10.03.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 10:03:40 -0800 (PST) From: Sergey Trofimov Date: Mon, 4 Mar 2024 19:03:30 +0100 Message-ID: <5bfa707ec1a839e9329c1320a0f152eee8abff30.1709575388.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.41.0 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: 1.09 X-Spam-Score: 1.09 X-Migadu-Queue-Id: D232FAD45 X-TUID: yqkc5w30ibJi * 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 761d12e31f..8a521be3c0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2349,7 +2349,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") @@ -2377,6 +2377,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") @@ -4486,7 +4525,7 @@ (define-public python-pyside-2 qtquickcontrols-5 qtquickcontrols2-5 qtscript - qtscxml + qtscxml-5 qtsensors qtspeech qtsvg-5 base-commit: 3da49b1472919a62df1fe399638f23a246aa325d prerequisite-patch-id: 4b5032a22b70bff803b7bbd0693b00984f53a25e prerequisite-patch-id: 68eb78a4650b2e0880ad3735fbd1f0296adc7de7 prerequisite-patch-id: bb61e272c86d80072ad9dc79c17ecde91127999b prerequisite-patch-id: 7f3cf0da78d3a019888053ba63cd03c3abd6bf2e prerequisite-patch-id: f9cc903b8048c8c6fde576fbf38ab110263020e3 prerequisite-patch-id: aba438a3c32ef44149bbc749c1e0b89d00006b3e prerequisite-patch-id: 51199b8d0dc0c9fd45bca2f8743d83565255ea80 -- 2.41.0