From 59ff9d008816a7d04cdd50d0db371ae1223e3329 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 9 Mar 2024 16:49:55 -0500 Subject: gnu: qttools-5: Patch path to qmake for the lprodump command. This previously would lead to this cryptic error: "WARNING: Could not find qmake spec 'default'", which turned out to be caused by lprodump erroneously attempting to run 'qmake' from its own prefix (qmake is from the qtbase package, not qttools). * gnu/packages/qt.scm (qttools-5) [phases] : New phase. Change-Id: I6e9a2d35fec987451fd1e30b84a82023dbfd3316 --- gnu/packages/qt.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 761d12e31f..72c36513e9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2171,7 +2171,18 @@ plugin for Adobe After Effects.") "1bkx2sc5hyldarc7w76ymv7dlcna3ib9r2kp67jdqcf856bnrx36")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) - ((#:tests? _ #f) #f))) ; TODO: Enable the tests + ((#:tests? _ #f) #f) ; TODO: Enable the tests + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'patch-qmake + (lambda* (#:key inputs #:allow-other-keys) + ;; Adjust the default location of the 'qmake' command known to + ;; the 'lprodump' command, which would otherwise look for it + ;; in its own bindir. + (substitute* "src/linguist/lprodump/main.cpp" + (("app.applicationDirPath\\() \\+ QLatin1String\\(\"/qmake\")") + (format #f "QLatin1String(~s)" + (search-input-file inputs "bin/qmake")))))))))) (native-inputs (list perl qtdeclarative-5 vulkan-headers)) (inputs (list mesa qtbase-5)) (synopsis "Qt Tools and Designer modules") -- cgit v1.2.3 From c9ce94b5e1e43d5660b64ad5c66ef722babb708f Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 9 Mar 2024 14:48:44 +0800 Subject: gnu: qt5ct: Update to 1.8. * gnu/packages/qt.scm (qt5ct): Update to 1.8. Change-Id: Ic8637433e18f4913bf77b1ef8003daafddcae5cd --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 72c36513e9..9df49d7fb3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -218,14 +218,14 @@ of C++20 coroutines in connection with certain asynchronous Qt actions.") (define-public qt5ct (package (name "qt5ct") - (version "1.5") + (version "1.8") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qt5ct/qt5ct-" version ".tar.bz2")) (sha256 - (base32 "14742vs32m98nbfb5mad0i8ciff5f45gfcb5v03p4hh2dvhhqgfn")))) + (base32 "1s88v3x5vxrz981jiqb9cnwak0shz6kgjbkp511i592y85a41dr3")))) (build-system qt-build-system) (arguments (list -- cgit v1.2.3 From 2c55353c7990c5d77f4d884e2cf79fb082794517 Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Sun, 10 Mar 2024 08:26:16 +0100 Subject: gnu: qtscxml: Update to 6.5.2. * 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(-) (limited to 'gnu/packages/qt.scm') 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 @@ control equipment. The module provides both QML and C++ interfaces. The 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 @@ 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."))) +(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 @@ color-related widgets.") qtquickcontrols-5 qtquickcontrols2-5 qtscript - qtscxml + qtscxml-5 qtsensors qtspeech qtsvg-5 -- cgit v1.2.3