[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
28/52: gnu: qtbase: Replace QML2_IMPORT_PATH with QML_IMPORT_PATH.
|
From: |
guix-commits |
|
Subject: |
28/52: gnu: qtbase: Replace QML2_IMPORT_PATH with QML_IMPORT_PATH. |
|
Date: |
Sat, 30 Mar 2024 20:41:42 -0400 (EDT) |
apteryx pushed a commit to branch qt-team
in repository guix.
commit 2f107e94ad2c7b73db814baa335514bc0f74493c
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Mar 23 00:34:40 2024 -0400
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
---
gnu/packages/qt.scm | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c3b21365da..74f48a3720 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -789,7 +789,7 @@ tst_qt_cmake_create.cpp"
;; 'qtbase-qmake-use-libname.patch' patch.
(setenv "LIBRARY_PATH" (string-append #$output "/lib:"
(getenv
"LIBRARY_PATH")))
- (setenv "QML2_IMPORT_PATH"
+ (setenv "QML_IMPORT_PATH"
(string-append #$output "/lib/qt6/qml"))
(setenv "QT_PLUGIN_PATH"
(string-append #$output "/lib/qt6/plugins"))
@@ -1022,7 +1022,7 @@ tst_qt_cmake_create.cpp"
(variable "QMAKEPATH")
(files '("lib/qt6")))
(search-path-specification
- (variable "QML2_IMPORT_PATH")
+ (variable "QML_IMPORT_PATH")
(files '("lib/qt6/qml")))
(search-path-specification
(variable "QT_PLUGIN_PATH")
@@ -1489,7 +1489,7 @@ with JavaScript and C++.")))
(when tests?
;; The tests expect to find the modules provided by this
;; package; extend the environment variables needed to do so.
- (setenv "QML2_IMPORT_PATH"
+ (setenv "QML_IMPORT_PATH"
(string-append #$output "/lib/qt6/qml"))
(setenv "QT_PLUGIN_PATH"
(string-append #$output "/lib/qt6/plugins:"
@@ -1548,7 +1548,7 @@ with JavaScript and C++.")))
;; These tests fail starting with 6.5.2 (see:
;; https://bugreports.qt.io/browse/QTBUG-116019). They
;; 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"
"tst_qqmlcomponent"
"tst_qmllint"
@@ -1650,9 +1650,9 @@ consume data received from the server, or both.")))
(add-after 'install 'prepare-for-tests
(lambda _
(setenv "QT_QPA_PLATFORM" "offscreen")
- (setenv "QML2_IMPORT_PATH"
+ (setenv "QML_IMPORT_PATH"
(string-append #$output "/lib/qt6/qml:"
- (getenv "QML2_IMPORT_PATH")))))
+ (getenv "QML_IMPORT_PATH")))))
(add-after 'prepare-for-tests 'check
(assoc-ref %standard-phases 'check))
(add-after 'check 'delete-installed-tests
@@ -2072,9 +2072,9 @@ popular web engines, Qt WebKit 2 and Qt WebEngine.")))
(add-after 'install 'prepare-for-tests
(lambda _
(setenv "QT_QPA_PLATFORM" "offscreen")
- (setenv "QML2_IMPORT_PATH"
+ (setenv "QML_IMPORT_PATH"
(string-append #$output "/lib/qt6/qml:"
- (getenv "QML2_IMPORT_PATH")))))
+ (getenv "QML_IMPORT_PATH")))))
(add-after 'prepare-for-tests 'check
(assoc-ref %standard-phases 'check))
(add-after 'check 'delete-installed-tests
@@ -2206,9 +2206,9 @@ positioning and geolocation plugins.")))
(add-after 'install 'prepare-for-tests
(lambda _
(setenv "QT_QPA_PLATFORM" "offscreen")
- (setenv "QML2_IMPORT_PATH"
+ (setenv "QML_IMPORT_PATH"
(string-append #$output "/lib/qt6/qml:"
- (getenv "QML2_IMPORT_PATH"))))))))
+ (getenv "QML_IMPORT_PATH"))))))))
(native-inputs (list perl))
(inputs (list libxkbcommon qtbase qtdeclarative))
(home-page (package-home-page qtbase))
@@ -2473,9 +2473,9 @@ also contains functionality to support data models and
executable content.")))
(lambda _
(setenv "ARGS" "-E tst_scion")
(setenv "QT_QPA_PLATFORM" "offscreen")
- (setenv "QML2_IMPORT_PATH"
+ (setenv "QML_IMPORT_PATH"
(string-append #$output "/lib/qt6/qml:"
- (getenv "QML2_IMPORT_PATH"))))))))
+ (getenv "QML_IMPORT_PATH"))))))))
(build-system cmake-build-system)
(inputs (list qtbase qtdeclarative libxkbcommon))
(synopsis "Qt SCXML module")
@@ -2644,9 +2644,9 @@ implementation of OAuth and OAuth2 authenticathon methods
for Qt.")
(assoc-ref %standard-phases 'check))
(add-before 'check 'prepare-for-tests
(lambda _
- (setenv "QML2_IMPORT_PATH"
+ (setenv "QML_IMPORT_PATH"
(string-append #$output "/lib/qt6/qml:"
- (getenv "QML2_IMPORT_PATH"))))))))
+ (getenv "QML_IMPORT_PATH"))))))))
(native-inputs (list perl vulkan-headers))
(inputs (list libxkbcommon qtbase qtdeclarative))
(synopsis "Qt Remote Objects module")
@@ -2705,10 +2705,10 @@ message.")))
(setenv "QT_QPA_PLATFORM" "offscreen")))
(add-before 'check 'prepare-for-tests
(lambda* (#:key outputs #:allow-other-keys)
- (setenv "QML2_IMPORT_PATH"
+ (setenv "QML_IMPORT_PATH"
(string-append (assoc-ref outputs "out")
"/lib/qt6/qml:"
- (getenv "QML2_IMPORT_PATH")))))
+ (getenv "QML_IMPORT_PATH")))))
(add-after 'install 'delete-installed-tests
(lambda _
(delete-file-recursively
- 09/52: gnu: qtwayland: Update to 6.6.2., (continued)
- 09/52: gnu: qtwayland: Update to 6.6.2., guix-commits, 2024/03/30
- 12/52: gnu: qtlottie: Update to 6.6.2., guix-commits, 2024/03/30
- 16/52: gnu: qtnetworkauth: Update to 6.6.2., guix-commits, 2024/03/30
- 36/52: gnu: Add qthttpserver., guix-commits, 2024/03/30
- 41/52: gnu: python-sip: Update to 6.8.3., guix-commits, 2024/03/30
- 33/52: gnu: Add syscmdline., guix-commits, 2024/03/30
- 22/52: gnu: qtspeech: Rename package to qtspeech-5., guix-commits, 2024/03/30
- 27/52: gnu: qtbase: Have qmlimportscanner honor QML_IMPORT_PATH., guix-commits, 2024/03/30
- 26/52: build: qt-utils: Use QML_IMPORT_PATH for Qt 6., guix-commits, 2024/03/30
- 29/52: gnu: qtbase: Disable the tst_qxmlstream test on powerpc64-le., guix-commits, 2024/03/30
- 28/52: gnu: qtbase: Replace QML2_IMPORT_PATH with QML_IMPORT_PATH.,
guix-commits <=
- 08/52: gnu: qtmultimedia: Update to 6.6.2., guix-commits, 2024/03/30
- 10/52: gnu: qtwebchannel: Update to 6.6.2., guix-commits, 2024/03/30
- 07/52: gnu: qtshadertools: Update to 6.6.2., guix-commits, 2024/03/30
- 44/52: gnu: gwenview: Break disabled tests into a list., guix-commits, 2024/03/30
- 35/52: gnu: Add qwindowkit., guix-commits, 2024/03/30
- 03/52: gnu: qtsvg: Update to 6.6.2., guix-commits, 2024/03/30
- 23/52: gnu: Add qtspeech., guix-commits, 2024/03/30
- 46/52: gnu: extra-cmake-modules: Update to 6.0.0., guix-commits, 2024/03/30
- 42/52: gnu: python-pyqt-6: Update to 6.6.1., guix-commits, 2024/03/30
- 32/52: gnu: ffmpeg-jami: Apply patch adding pipewire support., guix-commits, 2024/03/30