me
/
guix
Archived
1
0
Fork 0
Code

gnu: qtbase: Replace QML2_IMPORT_PATH with QML_IMPORT_PATH. 

* gnu/packages/qt.scm (qtbase) [native-search-paths]: Replace QML2_IMPORT_PATH
with QML_IMPORT_PATH, preferred for Qt 6 and up.
[phases] <check>: Likewise.
(qtdeclarative, qtwebsockets, qtwebchannel, qtscxml)
(qtremoteobjects, qtspeech): Likewise.

Change-Id: Ib64fce15a4333cdf36a41330c13987d867329c9c
master
Maxim Cournoyer 2024-03-23 00:34:40 -04:00
parent cfcd5df74d
commit 470ca56110
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gnu/packages/qt.scm
View File

@ -849,7 +849,7 @@ tst_qt_cmake_create.cpp"
;; 'qtbase-qmake-use-libname.patch' patch. ;; 'qtbase-qmake-use-libname.patch' patch.
(setenv "LIBRARY_PATH" (string-append #$output "/lib:" (setenv "LIBRARY_PATH" (string-append #$output "/lib:"
(getenv "LIBRARY_PATH"))) (getenv "LIBRARY_PATH")))
(setenv "QML2_IMPORT_PATH" (setenv "QML_IMPORT_PATH"
(string-append #$output "/lib/qt6/qml")) (string-append #$output "/lib/qt6/qml"))
(setenv "QT_PLUGIN_PATH" (setenv "QT_PLUGIN_PATH"
(string-append #$output "/lib/qt6/plugins")) (string-append #$output "/lib/qt6/plugins"))
@ -1082,7 +1082,7 @@ tst_qt_cmake_create.cpp"
(variable "QMAKEPATH") (variable "QMAKEPATH")
(files '("lib/qt6"))) (files '("lib/qt6")))
(search-path-specification (search-path-specification
(variable "QML2_IMPORT_PATH") (variable "QML_IMPORT_PATH")
(files '("lib/qt6/qml"))) (files '("lib/qt6/qml")))
(search-path-specification (search-path-specification
(variable "QT_PLUGIN_PATH") (variable "QT_PLUGIN_PATH")
@ -1549,7 +1549,7 @@ with JavaScript and C++.")))
(when tests? (when tests?
;; The tests expect to find the modules provided by this ;; The tests expect to find the modules provided by this
;; package; extend the environment variables needed to do so. ;; package; extend the environment variables needed to do so.
(setenv "QML2_IMPORT_PATH" (setenv "QML_IMPORT_PATH"
(string-append #$output "/lib/qt6/qml")) (string-append #$output "/lib/qt6/qml"))
(setenv "QT_PLUGIN_PATH" (setenv "QT_PLUGIN_PATH"
(string-append #$output "/lib/qt6/plugins:" (string-append #$output "/lib/qt6/plugins:"
@ -1608,7 +1608,7 @@ with JavaScript and C++.")))
;; These tests fail starting with 6.5.2 (see: ;; These tests fail starting with 6.5.2 (see:
;; https://bugreports.qt.io/browse/QTBUG-116019). They ;; https://bugreports.qt.io/browse/QTBUG-116019). They
;; appear to fail because of attempting to load QML from ;; appear to fail because of attempting to load QML from
;; elsewhere than from QML2_IMPORT_PATH. ;; elsewhere than from QML_IMPORT_PATH.
"cmake_test_common_import_path" "cmake_test_common_import_path"
"tst_qqmlcomponent" "tst_qqmlcomponent"
"tst_qmllint" "tst_qmllint"
@ -1710,9 +1710,9 @@ consume data received from the server, or both.")))
(add-after 'install 'prepare-for-tests (add-after 'install 'prepare-for-tests
(lambda _ (lambda _
(setenv "QT_QPA_PLATFORM" "offscreen") (setenv "QT_QPA_PLATFORM" "offscreen")
(setenv "QML2_IMPORT_PATH" (setenv "QML_IMPORT_PATH"
(string-append #$output "/lib/qt6/qml:" (string-append #$output "/lib/qt6/qml:"
(getenv "QML2_IMPORT_PATH"))))) (getenv "QML_IMPORT_PATH")))))
(add-after 'prepare-for-tests 'check (add-after 'prepare-for-tests 'check
(assoc-ref %standard-phases 'check)) (assoc-ref %standard-phases 'check))
(add-after 'check 'delete-installed-tests (add-after 'check 'delete-installed-tests
@ -2132,9 +2132,9 @@ popular web engines, Qt WebKit 2 and Qt WebEngine.")))
(add-after 'install 'prepare-for-tests (add-after 'install 'prepare-for-tests
(lambda _ (lambda _
(setenv "QT_QPA_PLATFORM" "offscreen") (setenv "QT_QPA_PLATFORM" "offscreen")
(setenv "QML2_IMPORT_PATH" (setenv "QML_IMPORT_PATH"
(string-append #$output "/lib/qt6/qml:" (string-append #$output "/lib/qt6/qml:"
(getenv "QML2_IMPORT_PATH"))))) (getenv "QML_IMPORT_PATH")))))
(add-after 'prepare-for-tests 'check (add-after 'prepare-for-tests 'check
(assoc-ref %standard-phases 'check)) (assoc-ref %standard-phases 'check))
(add-after 'check 'delete-installed-tests (add-after 'check 'delete-installed-tests
@ -2266,9 +2266,9 @@ positioning and geolocation plugins.")))
(add-after 'install 'prepare-for-tests (add-after 'install 'prepare-for-tests
(lambda _ (lambda _
(setenv "QT_QPA_PLATFORM" "offscreen") (setenv "QT_QPA_PLATFORM" "offscreen")
(setenv "QML2_IMPORT_PATH" (setenv "QML_IMPORT_PATH"
(string-append #$output "/lib/qt6/qml:" (string-append #$output "/lib/qt6/qml:"
(getenv "QML2_IMPORT_PATH")))))))) (getenv "QML_IMPORT_PATH"))))))))
(native-inputs (list perl)) (native-inputs (list perl))
(inputs (list libxkbcommon qtbase qtdeclarative)) (inputs (list libxkbcommon qtbase qtdeclarative))
(home-page (package-home-page qtbase)) (home-page (package-home-page qtbase))
@ -2533,9 +2533,9 @@ also contains functionality to support data models and executable content.")))
(lambda _ (lambda _
(setenv "ARGS" "-E tst_scion") (setenv "ARGS" "-E tst_scion")
(setenv "QT_QPA_PLATFORM" "offscreen") (setenv "QT_QPA_PLATFORM" "offscreen")
(setenv "QML2_IMPORT_PATH" (setenv "QML_IMPORT_PATH"
(string-append #$output "/lib/qt6/qml:" (string-append #$output "/lib/qt6/qml:"
(getenv "QML2_IMPORT_PATH")))))))) (getenv "QML_IMPORT_PATH"))))))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (list qtbase qtdeclarative libxkbcommon)) (inputs (list qtbase qtdeclarative libxkbcommon))
(synopsis "Qt SCXML module") (synopsis "Qt SCXML module")
@ -2704,9 +2704,9 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.")
(assoc-ref %standard-phases 'check)) (assoc-ref %standard-phases 'check))
(add-before 'check 'prepare-for-tests (add-before 'check 'prepare-for-tests
(lambda _ (lambda _
(setenv "QML2_IMPORT_PATH" (setenv "QML_IMPORT_PATH"
(string-append #$output "/lib/qt6/qml:" (string-append #$output "/lib/qt6/qml:"
(getenv "QML2_IMPORT_PATH")))))))) (getenv "QML_IMPORT_PATH"))))))))
(native-inputs (list perl vulkan-headers)) (native-inputs (list perl vulkan-headers))
(inputs (list libxkbcommon qtbase qtdeclarative)) (inputs (list libxkbcommon qtbase qtdeclarative))
(synopsis "Qt Remote Objects module") (synopsis "Qt Remote Objects module")
@ -2765,10 +2765,10 @@ message.")))
(setenv "QT_QPA_PLATFORM" "offscreen"))) (setenv "QT_QPA_PLATFORM" "offscreen")))
(add-before 'check 'prepare-for-tests (add-before 'check 'prepare-for-tests
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(setenv "QML2_IMPORT_PATH" (setenv "QML_IMPORT_PATH"
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
"/lib/qt6/qml:" "/lib/qt6/qml:"
(getenv "QML2_IMPORT_PATH"))))) (getenv "QML_IMPORT_PATH")))))
(add-after 'install 'delete-installed-tests (add-after 'install 'delete-installed-tests
(lambda _ (lambda _
(delete-file-recursively (delete-file-recursively