[neon/qt6/qt6-base/Neon/release] debian: sync to salsa
Carlos De Maine
null at kde.org
Tue Apr 29 00:28:59 BST 2025
Git commit db1d21b367718c42355b5b9f3719f705631536e7 by Carlos De Maine.
Committed on 28/04/2025 at 23:28.
Pushed by carlosdem into branch 'Neon/release'.
sync to salsa
M +26 -101 debian/control
M +2 -1 debian/qt.conf.in
M +5 -1 debian/qt6-base-dev.links
A +1 -0 debian/qt6-base-doc.links
A +5 -0 debian/qtpaths-cross-wrapper.in
M +13 -16 debian/rules
https://invent.kde.org/neon/qt6/qt6-base/-/commit/db1d21b367718c42355b5b9f3719f705631536e7
diff --git a/debian/control b/debian/control
index 482ec29..f5d651b 100644
--- a/debian/control
+++ b/debian/control
@@ -120,8 +120,7 @@ Depends: fontconfig,
shared-mime-info,
${misc:Depends},
${shlibs:Depends}
-Provides: qt6-base-abi (=6.8.2),
- qt6-base-private-abi (=6.8.2),
+Provides: qt6-base-private-abi (=6.9.0), ${t64:Provides},
Recommends: libcups2,
libqt6sql6-sqlite | libqt6sql6-mysql | libqt6sql6-odbc | libqt6sql6-psql | libqt6sql6-ibase,
qt6-gtk-platformtheme,
@@ -151,104 +150,30 @@ Architecture: any
Section: kde
X-Neon-MergedPackage: true
Pre-Depends: ${misc:Pre-Depends},
-Depends: default-libmysqlclient-dev,
- firebird-dev,
- glslang-tools,
- glslc,
- libatspi2.0-dev,
- libb2-dev,
- libbrotli-dev,
- libcups2-dev,
- libdbus-1-dev,
- libdouble-conversion-dev,
- libdrm-dev,
- libegl-dev,
- libfontconfig-dev,
- libfreetype-dev,
- libgif-dev,
- libgbm-dev,
- libgl-dev,
- libgles-dev,
- libglib2.0-dev,
- libglu1-mesa-dev | libglu-dev,
+Depends: libgl-dev,
libglx-dev,
- libgtk-3-dev,
- libharfbuzz-dev,
- libice-dev,
- libicu-dev,
- libinput-dev,
- libjpeg-dev,
- libkrb5-dev,
- liblttng-ust-dev,
- libmd4c-dev,
- libmd4c-html0-dev,
- libmtdev-dev,
libopengl-dev,
- libpcre2-dev,
- libpng-dev,
- libpq-dev,
- libproxy-dev,
- libsctp-dev,
- libsystemd-dev,
- libsqlite3-dev,
- libssl-dev,
- libts-dev,
- liblttng-ust-dev,
- libturbojpeg0-dev,
- libudev-dev,
+ libqt6concurrent6 (= ${binary:Version}),
+ libqt6core6t64 (= ${binary:Version}),
+ libqt6dbus6 (= ${binary:Version}),
+ libqt6gui6 (= ${binary:Version}),
+ libqt6network6 (= ${binary:Version}),
+ libqt6opengl6 (= ${binary:Version}),
+ libqt6openglwidgets6 (= ${binary:Version}),
+ libqt6printsupport6 (= ${binary:Version}),
+ libqt6sql6 (= ${binary:Version}),
+ libqt6test6 (= ${binary:Version}),
+ libqt6widgets6 (= ${binary:Version}),
+ libqt6xml6 (= ${binary:Version}),
libvulkan-dev,
- libwayland-dev,
- libx11-dev,
- libx11-xcb-dev,
- libxcb1-dev,
- libxcb-cursor-dev,
- libxcb-composite0-dev,
- libxcb-damage0-dev,
- libxcb-dpms0-dev,
- libxcb-dri2-0-dev,
- libxcb-dri3-dev,
- libxcb-ewmh-dev,
- libxcb-glx0-dev,
- libxcb-icccm4-dev,
- libxcb-image0-dev,
- libxcb-keysyms1-dev,
- libxcb-present-dev,
- libxcb-randr0-dev,
- libxcb-record0-dev,
- libxcb-render-util0-dev,
- libxcb-render0-dev,
- libxcb-res0-dev,
- libxcb-screensaver0-dev,
- libxcb-shape0-dev,
- libxcb-shm0-dev,
- libxcb-sync-dev,
- libxcb-util-dev,
- libxcb-xfixes0-dev,
- libxcb-xf86dri0-dev,
- libxcb-xinerama0-dev,
- libxcb-xinput-dev,
- libxcb-xkb-dev,
- libxcb-xrm-dev,
- libxcb-xv0-dev,
- libxcb-xvmc0-dev,
- libxcb-xtest0-dev,
- libxext-dev,
- libxfixes-dev,
- libxi-dev,
- libxkbcommon-dev,
- libxkbcommon-x11-dev,
- libxrender-dev,
- libzstd-dev,
- python3:any,
- qt6-base (= ${binary:Version}),
- unixodbc-dev,
- zlib1g-dev,
+ qmake6 (= ${binary:Version}),
+ qt6-base-dev-tools (= ${binary:Version}),
+ qt6-qpa-plugins (= ${binary:Version}),
${misc:Depends},
- ${shlibs:Depends},
Breaks: libqt6opengl6-dev (<< 6.4.2+dfsg-12~),
- qt6-base (<< 6.6.2-1neon),
- qt6-base-doc (<< ${source:Version}~ciBuild),
Replaces: libqt6opengl6-dev (<< 6.4.2+dfsg-12~),
+Provides: libqt6opengl6-dev (= ${binary:Version}),
+
Description: Qt 6 base development files
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -295,6 +220,12 @@ Depends: qt6-base, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
+Package: libqt6concurrent6t64
+Architecture: all
+Depends: qt6-base, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
Package: libqt6dbus6
Architecture: all
Depends: qt6-base, ${misc:Depends}
@@ -373,12 +304,6 @@ Depends: qt6-base, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
-Package: libqt6concurrent6t64
-Architecture: all
-Depends: qt6-base, ${misc:Depends}
-Description: Dummy transitional
- Transitional dummy package.
-
Package: libqt6sql6
Architecture: all
Depends: qt6-base, ${misc:Depends}
@@ -509,4 +434,4 @@ Package: qt6-xdgdesktopportal-platformtheme
Architecture: all
Depends: qt6-base, ${misc:Depends}
Description: Dummy transitional
- Transitional dummy package.
\ No newline at end of file
+ Transitional dummy package.
diff --git a/debian/qt.conf.in b/debian/qt.conf.in
index ea99272..52cdda3 100644
--- a/debian/qt.conf.in
+++ b/debian/qt.conf.in
@@ -8,9 +8,10 @@ Headers=include/@DEB_HOST_MULTIARCH@/qt6
HostBinaries=lib/qt6/bin
HostData=lib/@DEB_HOST_MULTIARCH@/qt6
HostLibraries=lib/@DEB_HOST_MULTIARCH@
+HostLibraryExecutables=lib/qt6/libexec
Libraries=lib/@DEB_HOST_MULTIARCH@
LibraryExecutables=lib/qt6/libexec
Plugins=lib/@DEB_HOST_MULTIARCH@/qt6/plugins
-Qml2Imports=lib/@DEB_HOST_MULTIARCH@/qt6/qml
+QmlImports=lib/@DEB_HOST_MULTIARCH@/qt6/qml
Settings=/etc/xdg
Translations=share/qt6/translations
diff --git a/debian/qt6-base-dev.links b/debian/qt6-base-dev.links
index c5a119c..750afd9 100644
--- a/debian/qt6-base-dev.links
+++ b/debian/qt6-base-dev.links
@@ -1,6 +1,10 @@
-## qt6-base-dev-tools.links
# qtpaths and qtpaths6 are identical files. We want people to use qtpaths6,
# so we do not install qtpaths. Instead, qtpaths is a symbolic link pointing to qtpaths6.
usr/lib/qt6/bin/qtpaths6 usr/lib/qt6/bin/qtpaths
# On public path we want qtpaths6.
usr/lib/qt6/bin/qtpaths6 usr/bin/qtpaths6
+# androiddeployqt and androiddeployqt6 are identical files. We want people to use androiddeployqt6,
+# so we do not install androiddeployqt. Instead, androiddeployqt is a symbolic link pointing to androiddeployqt6.
+usr/lib/qt6/bin/androiddeployqt6 usr/lib/qt6/bin/androiddeployqt
+# On public path we want androiddeployqt6.
+usr/lib/qt6/bin/androiddeployqt6 usr/bin/androiddeployqt6
diff --git a/debian/qt6-base-doc.links b/debian/qt6-base-doc.links
new file mode 100644
index 0000000..efaba0b
--- /dev/null
+++ b/debian/qt6-base-doc.links
@@ -0,0 +1 @@
+usr/share/qt6/doc usr/share/doc/qt6-base-doc-html/html
diff --git a/debian/qtpaths-cross-wrapper.in b/debian/qtpaths-cross-wrapper.in
new file mode 100644
index 0000000..db29f0f
--- /dev/null
+++ b/debian/qtpaths-cross-wrapper.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec /usr/lib/qt6/bin/qtpaths6 \
+ -qtconf /usr/lib/@DEB_HOST_MULTIARCH@/qt6/qt6.conf \
+ "$@"
diff --git a/debian/rules b/debian/rules
index faa0aac..3c82d45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,12 +30,6 @@ endif
%:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
-## -DFEATURE_lttng=ON \
-## segfaults at
-## FAILED: src/gui/qtgui_tracepoints_p.
-## tracegen: fatal: Cannot deduce CTF type for 'QImage::Format format
-##
-
override_dh_auto_configure:
dh_auto_configure -- \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -58,6 +52,7 @@ override_dh_auto_configure:
-DFEATURE_journald=ON \
-DFEATURE_libproxy=ON \
-DFEATURE_ltcg=ON \
+ -DFEATURE_lttng=ON \
-DFEATURE_mimetype_database=OFF \
-DFEATURE_pcre2=ON -DFEATURE_system_pcre2=ON \
-DFEATURE_png=ON -DFEATURE_system_png=ON \
@@ -94,15 +89,6 @@ override_dh_auto_configure:
-DQT_UNITY_BUILD=ON \
$(extra_cmake_args)
-override_dh_auto_build-indep:
- dh_auto_build -- $(extra_build_args)
-
-override_dh_auto_install-indep:
- DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- $(extra_install_args)
- # Remove build path from index files if we are a doc build.
- find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
- sed -i 's@$(CURDIR)/@@g' {} \;
-
execute_after_dh_auto_install-arch:
# Reproducible builds: remove build paths from .prl files
sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt6*.prl
@@ -129,10 +115,21 @@ execute_after_dh_auto_install-arch:
sed -i 's,lib/qt6/bin/qtpaths,bin/$(DEB_HOST_GNU_TYPE)-qtpaths6,' \
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6CoreTools/Qt6CoreToolsTargets-none.cmake
+override_dh_auto_build-indep:
+ dh_auto_build -- docs
+
+override_dh_auto_install-indep:
+ DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_docs
+ # Remove build path from index files.
+ find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
+ sed -i 's@$(CURDIR)/@@g' {} \;
-### no longer needed??
override_dh_makeshlibs:
dh_makeshlibs -XlibQt6EglFSDeviceIntegration -XlibQt6EglFsKmsGbmSupport -XlibQt6EglFsKmsSupport -XlibQt6XcbQpa
execute_after_dh_shlibdeps-arch:
echo libssl:Depends=$(sslpkgname) >> debian/libqt6network6.substvars
+
+# Do not run tests when building the documentation
+override_dh_auto_test-indep:
+
More information about the Neon-commits
mailing list