all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Sergey Trofimov <sarg@sarg.org.ru>
To: 68500@debbugs.gnu.org
Cc: "Sergey Trofimov" <sarg@sarg.org.ru>,
	"Sergey Trofimov" <sarg@sarg.org.ru>,
	"Maxim Cournoyer" <maxim.cournoyer@gmail.com>,
	宋文武 <iyzsong@envs.net>
Subject: [bug#68500] [PATCH v3 1/2] gnu: qtscxml: Update to 6.5.2.
Date: Sun, 10 Mar 2024 08:26:16 +0100	[thread overview]
Message-ID: <1d2ee6c41a236ebd33dc353afafac21778a10efb.1710055531.git.sarg@sarg.org.ru> (raw)
In-Reply-To: <cover.1705400531.git.sarg@sarg.org.ru>

* 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 9df49d7fb3..5866d33394 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2360,7 +2360,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")
@@ -2388,6 +2388,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")
@@ -4497,7 +4536,7 @@ (define-public python-pyside-2
            qtquickcontrols-5
            qtquickcontrols2-5
            qtscript
-           qtscxml
+           qtscxml-5
            qtsensors
            qtspeech
            qtsvg-5

base-commit: 7758e63f7a89f53fbb7c7a265ae472af0a8dfab0
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





  parent reply	other threads:[~2024-03-10  7:29 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-16 10:24 [bug#68500] [PATCH 0/2] gnu: ausweisapp: Update to 2.0.2 Sergey Trofimov
2024-01-16 10:28 ` [bug#68500] [PATCH 1/2] gnu: qtscxml: Update to 6.5.2 Sergey Trofimov
2024-01-17 14:02   ` Maxim Cournoyer
2024-01-16 10:28 ` [bug#68500] [PATCH 2/2] gnu: ausweisapp: Update to 2.0.2 Sergey Trofimov
2024-01-17 20:36 ` [bug#68500] [PATCH v1 0/2] " Sergey Trofimov
2024-01-17 20:36   ` [bug#68500] [PATCH v1 1/2] gnu: qtscxml: Update to 6.5.2 Sergey Trofimov
2024-01-17 20:36   ` [bug#68500] [PATCH v1 2/2] gnu: ausweisapp: Update to 2.0.2 Sergey Trofimov
2024-03-04 18:03 ` [bug#68500] [PATCH v2 1/2] gnu: qtscxml: Update to 6.5.2 Sergey Trofimov
2024-03-04 18:03   ` [bug#68500] [PATCH v2 2/2] gnu: ausweisapp: Update to 2.1.0 Sergey Trofimov
2024-03-10  1:28     ` Maxim Cournoyer
2024-03-10  1:21   ` [bug#68500] [PATCH v2 1/2] gnu: qtscxml: Update to 6.5.2 Maxim Cournoyer
2024-03-10  7:26 ` Sergey Trofimov [this message]
2024-03-10  7:26   ` [bug#68500] [PATCH v3 2/2] gnu: ausweisapp: Update to 2.1.0 Sergey Trofimov
2024-03-19  7:45     ` bug#68500: " Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1d2ee6c41a236ebd33dc353afafac21778a10efb.1710055531.git.sarg@sarg.org.ru \
    --to=sarg@sarg.org.ru \
    --cc=68500@debbugs.gnu.org \
    --cc=iyzsong@envs.net \
    --cc=maxim.cournoyer@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.