[neon/qt6/qt6-base/Neon/release] debian: not cmake_prefix_path, set qt_dir instead
Carlos De Maine
null at kde.org
Thu Dec 14 03:39:55 GMT 2023
Git commit 273cb666a82d17386e93948953b20c675e997946 by Carlos De Maine.
Committed on 14/12/2023 at 04:38.
Pushed by carlosdem into branch 'Neon/release'.
not cmake_prefix_path, set qt_dir instead
M +1 -1 debian/qt.conf.in
M +1 -1 debian/rules
https://invent.kde.org/neon/qt6/qt6-base/-/commit/273cb666a82d17386e93948953b20c675e997946
diff --git a/debian/qt.conf.in b/debian/qt.conf.in
index 29fa20c..6d2b9b3 100644
--- a/debian/qt.conf.in
+++ b/debian/qt.conf.in
@@ -1,6 +1,5 @@
[Paths]
Prefix=/usr
-Prefix_Path=/usr
ArchData=lib/@DEB_HOST_MULTIARCH@/qt6
Binaries=lib/qt6/bin
Data=share/qt6
@@ -13,5 +12,6 @@ Libraries=lib/@DEB_HOST_MULTIARCH@
LibraryExecutables=lib/qt6/libexec
Plugins=lib/@DEB_HOST_MULTIARCH@/qt6/plugins
Qml2Imports=lib/@DEB_HOST_MULTIARCH@/qt6/qml
+QtDir=/usr
Settings=/etc/xdg
Translations=share/qt6/translations
diff --git a/debian/rules b/debian/rules
index ca04da2..cd10be0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,7 +53,6 @@ override_dh_auto_configure:
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-DCMAKE_LIBRARY_PATH=lib/$(DEB_HOST_MULTIARCH) \
-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
- -DCMAKE_PREFIX_PATH=/usr \
-DFEATURE_accessibility=ON \
-DFEATURE_cups=ON \
-DFEATURE_directfb=OFF \
@@ -101,6 +100,7 @@ override_dh_auto_configure:
-DINSTALL_SYSCONFDIR=/etc/xdg \
-DINSTALL_TRANSLATIONDIR=share/qt6/translations \
-DQT_BUILD_EXAMPLES=ON \
+ -DQT_DIR=/usr \
-DQT_INSTALL_EXAMPLES_SOURCES=ON \
-DQT_UNITY_BUILD=ON \
$(extra_cmake_args)
More information about the Neon-commits
mailing list