Message ID | 4e99bf1440047a056e1026df92bdacb782f11362.1705400531.git.sarg@sarg.org.ru |
---|---|
State | New |
Headers | show |
Series | gnu: ausweisapp: Update to 2.0.2. | expand |
Hi, Sergey Trofimov <sarg@sarg.org.ru> writes: > * 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 | 30 ++++++++++++++++++++++++++++-- > 1 file changed, 28 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm > index 2b89e7e738..25821584ee 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,32 @@ (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 #:tests? #f)) ; TODO: Enable the tests Please make the effort to enable the test suite *now*, else it may never happen :-). There's a lot of examples around that should provide some help. Could you please send a v2, attempting to enable the test suite?
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2b89e7e738..25821584ee 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,32 @@ (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 #:tests? #f)) ; TODO: Enable the tests + (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 +4479,7 @@ (define-public python-pyside-2 qtquickcontrols-5 qtquickcontrols2-5 qtscript - qtscxml + qtscxml-5 qtsensors qtspeech qtsvg-5