[neon/qt6/qt6-wayland/Neon/release] debian: revert to salsa experimental for qt 6.4.1 and run qt_sixy
Jonathan Esk-Riddell
null at kde.org
Tue Dec 6 13:33:23 GMT 2022
Git commit 3ebca1f39c445b7a6a40875e4ef4434cf94ae661 by Jonathan Esk-Riddell.
Committed on 06/12/2022 at 13:30.
Pushed by jriddell into branch 'Neon/release'.
revert to salsa experimental for qt 6.4.1 and run qt_sixy
A +1 -0 debian/.gitattributes
A +1 -0 debian/.gitignore
M +94 -3 debian/changelog
M +62 -17 debian/control
M +0 -9 debian/copyright
M +21 -0 debian/not-installed
M +52 -1 debian/qt6-wayland-dev.install
M +43 -2 debian/qt6-wayland.install
M +12 -2 debian/rules
https://invent.kde.org/neon/qt6/qt6-wayland/commit/3ebca1f39c445b7a6a40875e4ef4434cf94ae661
diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..027271b
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1 @@
+files
diff --git a/debian/changelog b/debian/changelog
index 3267596..6b81857 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,99 @@
-qt6-wayland (6.2.3-0neon) UNRELEASED; urgency=medium
+qt6-wayland (6.4.1-1) UNRELEASED; urgency=medium
- * New release
+ [ Lu YaNing ]
+ * New upstream release (6.4.1).
+ * Bump Qt B-Ds to 6.4.1.
+ * Update debian/copyright.
- -- Jonathan Riddell <jr at jriddell.org> Wed, 02 Feb 2022 15:13:49 +0000
+ -- Lu YaNing <dluyaning at gmail.com> Fri, 18 Nov 2022 09:33:38 +0000
+
+qt6-wayland (6.4.0-2) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * Enable link time optimization (Closes: #1015627).
+ * Fix FTCBFS, thx to Helmut Grohne (Closes: #1023088):
+ + Pass QT_HOST_PATH and QT_HOST_PATH_CMAKE_DIR.
+ + Depend on a native version of ourselves.
+ + qt6-wayland-dev needs to depend on qt6-wayland-dev-tools.
+ + Do build tools when cross compiling.
+
+ -- Patrick Franz <deltaone at debian.org> Sat, 05 Nov 2022 11:03:07 +0100
+
+qt6-wayland (6.4.0-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.4.0).
+ * Bump Qt B-Ds to 6.4.0.
+ * Increase CMake verbosity level.
+ * Bump minimum CMake version in order to get pkg-config's .pc files.
+ * Update list of installed files.
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Thu, 13 Oct 2022 12:33:04 +0200
+
+qt6-wayland (6.3.1-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Mon, 15 Aug 2022 19:24:06 +0200
+
+qt6-wayland (6.3.1-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.3.1).
+ * Bump Qt B-Ds to 6.3.1.
+ * Bump Standards-Version to 4.6.1 (no changes needed).
+ * Update list of installed files.
+
+ -- Patrick Franz <deltaone at debian.org> Sun, 17 Jul 2022 19:37:47 +0200
+
+qt6-wayland (6.3.0-2) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Sun, 19 Jun 2022 14:12:52 +0200
+
+qt6-wayland (6.3.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ - Update the .install files.
+ * Add my name to Uploaders.
+ * Bump build dependencies to grab 6.3.0.
+
+ -- Simon Quigley <tsimonq2 at debian.org> Fri, 17 Jun 2022 21:11:54 -0500
+
+qt6-wayland (6.2.4-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Fri, 22 Apr 2022 20:07:50 +0200
+
+qt6-wayland (6.2.4-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.2.4).
+ * Bump Qt B-Ds to 6.2.4.
+ * Update list of installed files.
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Wed, 30 Mar 2022 21:07:22 +0200
+
+qt6-wayland (6.2.2-3) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Tue, 15 Feb 2022 22:23:13 +0100
+
+qt6-wayland (6.2.2-2) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Sat, 01 Jan 2022 18:26:54 +0100
qt6-wayland (6.2.2-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 8960b9b..0b469d9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,10 @@ Source: qt6-wayland
Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Patrick Franz <deltaone at debian.org>, Lu YaNing <dluyaning at gmail.com>
-Build-Depends: cmake (>= 3.18~),
+Uploaders: Patrick Franz <deltaone at debian.org>,
+ Lu YaNing <dluyaning at gmail.com>,
+ Simon Quigley <tsimonq2 at debian.org>
+Build-Depends: cmake (>= 3.24~),
debhelper-compat (= 13),
libdrm-dev,
libegl1-mesa-dev,
@@ -17,12 +19,13 @@ Build-Depends: cmake (>= 3.18~),
ninja-build,
pkg-config,
pkg-kde-tools,
- qt6-base-dev (>= 6.2.3),
- qt6-declarative-dev (>= 6.2.3),
+ qt6-base-dev (>= 6.4.1+dfsg~),
+ qt6-declarative-dev (>= 6.4.1+dfsg~),
+ qt6-wayland-dev:native <cross>,
xauth <!nocheck>,
xvfb <!nocheck>,
zlib1g-dev
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
Homepage: https://www.qt.io/developers/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-wayland
Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-wayland.git
@@ -31,16 +34,8 @@ Rules-Requires-Root: no
Package: qt6-wayland
Architecture: any
Section: kde
-Provides: libqt6waylandclient6,
- libqt6waylandcompositor6,
- libqt6waylandeglclienthwintegration6,
- libqt6waylandeglcompositorhwintegration6,
- libqt6wlshellintegration6,
- qml6-module-qtwayland-client-texturesharing,
- qml6-module-qtwayland-compositor,
- qt6-wayland
-Depends: ${misc:Depends},
- ${shlibs:Depends}
+X-Neon-MergedPackage: true
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Qt 6 Wayland Client library
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -52,8 +47,10 @@ Description: Qt 6 Wayland Client library
Package: qt6-wayland-dev
Architecture: any
Section: kde
-Provides: qt6-wayland-dev, qt6-wayland-dev-tools
-Depends: qt6-wayland (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+X-Neon-MergedPackage: true
+Depends: qt6-wayland (= ${binary:Version}),
+ qt6-wayland-dev-tools (= ${binary:Version}),
+ ${misc:Depends}
Description: Qt 6 Wayland - 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.
@@ -62,3 +59,51 @@ Description: Qt 6 Wayland - development files
.
This package contains the development files for QtWayland client
and compositor libraries.
+
+Package: libqt6waylandclient6
+Architecture: all
+Depends: qt6-wayland
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6waylandcompositor6
+Architecture: all
+Depends: qt6-wayland
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6waylandeglclienthwintegration6
+Architecture: all
+Depends: qt6-wayland
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6waylandeglcompositorhwintegration6
+Architecture: all
+Depends: qt6-wayland
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6wlshellintegration6
+Architecture: all
+Depends: qt6-wayland
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qtwayland-compositor
+Architecture: all
+Depends: qt6-wayland
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qtwayland-client-texturesharing
+Architecture: all
+Depends: qt6-wayland
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-wayland-dev-tools
+Architecture: all
+Depends: qt6-wayland-dev
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/copyright b/debian/copyright
index 61c5b11..bdd34b2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -158,11 +158,6 @@ Copyright: 2014 Stephen "Lyude" Chandler Paul
2015-2016 Red Hat, Inc.
License: Expat
-Files: tests/auto/client/shared_old/mockinput.h
-Copyright: 2016 The Qt Company Ltd.
- 2016 Klarälvdalens Datakonsult AB (KDAB)
-License: GPL-3 with Qt-1.0 exception
-
Files: src/client/inputdeviceintegration/qwaylandinputdeviceintegration*
src/client/qwaylandshm*
Copyright: 2016 LG Electronics, Inc.
@@ -196,10 +191,6 @@ Copyright: 2018 The Qt Company Ltd.
2017 ITAGE Corporation
License: LGPL-3 or GPL-2
-Files: tests/auto/client/shared_old/mockregion.*
-Copyright: 2020 Aleix Pol Gonzalez <aleixpol at kde.org>
-License: GPL-3 with Qt-1.0 exception
-
Files: tests/auto/client/shared/mockcompositor.*
tests/auto/client/shared/iviapplication.*
tests/auto/client/shared/fullscreenshellv1.*
diff --git a/debian/not-installed b/debian/not-installed
index a17a5fe..f0f58af 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -2,6 +2,7 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandClient/6.*
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/6.*
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandEglClientHwIntegration/6.*
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandEglCompositorHwIntegration/6.*
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandGlobal/6.*
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWlShellIntegration/6.*
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QWaylandEglPlatformIntegrationPluginAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QWaylandEglPlatformIntegrationPluginConfig.cmake
@@ -39,6 +40,19 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorIviapp
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorIviapplicationConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorIviapplicationTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorIviapplicationTargets-none.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimeAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimeConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimeConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimeConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimeTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimeTargets-none.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorQtShellAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorQtShellConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorQtShellConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorQtShellConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorQtShellDependencies.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorQtShellTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorQtShellTargets-none.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorWLShellAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorWLShellConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorWLShellConfigVersion.cmake
@@ -175,6 +189,12 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandEglCompositorHwIntegrationPrivate/
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandEglCompositorHwIntegrationPrivate/Qt6WaylandEglCompositorHwIntegrationPrivateTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandEglCompositorHwIntegrationPrivate/Qt6WaylandEglCompositorHwIntegrationPrivateTargets-none.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandEglCompositorHwIntegrationPrivate/Qt6WaylandEglCompositorHwIntegrationPrivateVersionlessTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandGlobalPrivate/Qt6WaylandGlobalPrivateAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandGlobalPrivate/Qt6WaylandGlobalPrivateConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandGlobalPrivate/Qt6WaylandGlobalPrivateConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandGlobalPrivate/Qt6WaylandGlobalPrivateConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandGlobalPrivate/Qt6WaylandGlobalPrivateTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandGlobalPrivate/Qt6WaylandGlobalPrivateVersionlessTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WlShellIntegrationPrivate/Qt6WlShellIntegrationPrivateAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WlShellIntegrationPrivate/Qt6WlShellIntegrationPrivateConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WlShellIntegrationPrivate/Qt6WlShellIntegrationPrivateConfigVersion.cmake
@@ -193,4 +213,5 @@ usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_wayland_egl_compositor_
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_wl_shell_integration_private.pri
usr/share/qt6/modules/WaylandEglClientHwIntegrationPrivate.json
usr/share/qt6/modules/WaylandEglCompositorHwIntegrationPrivate.json
+usr/share/qt6/modules/WaylandGlobalPrivate.json
usr/share/qt6/modules/WlShellIntegrationPrivate.json
diff --git a/debian/qt6-wayland-dev.install b/debian/qt6-wayland-dev.install
index 7d7b0f7..c32902a 100644
--- a/debian/qt6-wayland-dev.install
+++ b/debian/qt6-wayland-dev.install
@@ -4,6 +4,7 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandClient/QtWaylandClient
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandClient/QtWaylandClientDepends
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandClient/QtWaylandClientVersion
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandClient/qtwaylandclient-config.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandClient/qtwaylandclientexports.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandClient/qtwaylandclientglobal.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandClient/qtwaylandclientversion.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandClient/qwaylandclientexport.h
@@ -47,6 +48,8 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/QWaylandSurfaceGrabber
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/QWaylandSurfaceRole
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/QWaylandTextInput
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/QWaylandTextInputManager
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/QWaylandTextInputManagerV4
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/QWaylandTextInputV4
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/QWaylandTouch
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/QWaylandView
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/QWaylandViewporter
@@ -63,6 +66,7 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/QtWaylandCompositor
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/QtWaylandCompositorDepends
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/QtWaylandCompositorVersion
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/qtwaylandcompositor-config.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/qtwaylandcompositorexports.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/qtwaylandcompositorglobal.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/qtwaylandcompositorversion.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/qtwaylandqmlinclude.h
@@ -102,6 +106,8 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/qwaylandsurface.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/qwaylandsurfacegrabber.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/qwaylandtextinput.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/qwaylandtextinputmanager.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/qwaylandtextinputmanagerv4.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/qwaylandtextinputv4.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/qwaylandtouch.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/qwaylandview.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/qwaylandviewporter.h
@@ -117,28 +123,70 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandEglCompositorHwIntegration/QtWayl
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandEglCompositorHwIntegration/QtWaylandEglCompositorHwIntegrationDepends
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandEglCompositorHwIntegration/QtWaylandEglCompositorHwIntegrationVersion
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandEglCompositorHwIntegration/qtwaylandeglcompositorhwintegrationversion.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandGlobal/QtWaylandGlobal
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandGlobal/QtWaylandGlobalDepends
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandGlobal/QtWaylandGlobalVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandGlobal/qtwaylandglobal-config.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandGlobal/qtwaylandglobalversion.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWlShellIntegration/QtWlShellIntegration
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWlShellIntegration/QtWlShellIntegrationDepends
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWlShellIntegration/QtWlShellIntegrationVersion
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWlShellIntegration/qtwlshellintegrationversion.h
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindWaylandkms.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindXComposite.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtWaylandTestsConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6DmaBufServerBufferPluginAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6DmaBufServerBufferPluginConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6DmaBufServerBufferPluginConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6DmaBufServerBufferPluginConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6DmaBufServerBufferPluginTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6DmaBufServerBufferPluginTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6DrmEglServerBufferPluginAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6DrmEglServerBufferPluginConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6DrmEglServerBufferPluginConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6DrmEglServerBufferPluginConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6DrmEglServerBufferPluginTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6DrmEglServerBufferPluginTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6QWaylandQtShellIntegrationPluginAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6QWaylandQtShellIntegrationPluginConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6QWaylandQtShellIntegrationPluginConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6QWaylandQtShellIntegrationPluginConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6QWaylandQtShellIntegrationPluginTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6QWaylandQtShellIntegrationPluginTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6WaylandClientAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6WaylandClientConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6WaylandClientConfigVersion.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6WaylandClientConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6WaylandClientDependencies.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6WaylandClientMacros.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6WaylandClientPlugins.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6WaylandClientTargets-*.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6WaylandClientTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandClient/Qt6WaylandClientVersionlessTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6DmaBufServerBufferIntegrationPluginAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6DmaBufServerBufferIntegrationPluginConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6DmaBufServerBufferIntegrationPluginConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6DmaBufServerBufferIntegrationPluginConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6DmaBufServerBufferIntegrationPluginTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6DmaBufServerBufferIntegrationPluginTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6DrmEglServerBufferIntegrationPluginAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6DrmEglServerBufferIntegrationPluginConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6DrmEglServerBufferIntegrationPluginConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6DrmEglServerBufferIntegrationPluginConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6DrmEglServerBufferIntegrationPluginTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6DrmEglServerBufferIntegrationPluginTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6QWaylandDmabufClientBufferIntegrationPluginAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6QWaylandDmabufClientBufferIntegrationPluginConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6QWaylandDmabufClientBufferIntegrationPluginConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6QWaylandDmabufClientBufferIntegrationPluginConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6QWaylandDmabufClientBufferIntegrationPluginTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6QWaylandDmabufClientBufferIntegrationPluginTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorConfigVersion.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorDependencies.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorMacros.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorPlugins.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorTargets-*.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorVersionlessTargets.cmake
@@ -162,8 +210,11 @@ usr/lib/${DEB_HOST_MULTIARCH}/libQt6WlShellIntegration.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6WlShellIntegration.so
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6waylandclient_*_metatypes.json
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6waylandcompositor_*_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6WaylandClient.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6WaylandCompositor.pc
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_waylandclient.pri
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_waylandcompositor.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_waylandglobal_private.pri
usr/lib/qt6/libexec/qtwaylandscanner
usr/share/qt6/modules/WaylandClient.json
usr/share/qt6/modules/WaylandCompositor.json
diff --git a/debian/qt6-wayland.install b/debian/qt6-wayland.install
index 1894d5f..fd00b77 100644
--- a/debian/qt6-wayland.install
+++ b/debian/qt6-wayland.install
@@ -3,5 +3,46 @@ usr/lib/${DEB_HOST_MULTIARCH}/libQt6WaylandCompositor.so.*
usr/lib/${DEB_HOST_MULTIARCH}/libQt6WaylandEglClientHwIntegration.so.*
usr/lib/${DEB_HOST_MULTIARCH}/libQt6WaylandEglCompositorHwIntegration.so.*
usr/lib/${DEB_HOST_MULTIARCH}/libQt6WlShellIntegration.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqwayland-egl.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqwayland-generic.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-decoration-client/libbradient.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-graphics-integration-client/libdmabuf-server.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-graphics-integration-client/libdrm-egl-server.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-graphics-integration-client/libshm-emulation-server.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-graphics-integration-client/libvulkan-server.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-shell-integration/libfullscreen-shell-v1.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-shell-integration/libivi-shell.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-shell-integration/libqt-shell.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-shell-integration/libwl-shell-plugin.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/wayland-shell-integration/libxdg-shell.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Client/TextureSharing/libwaylandtexturesharingplugin.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Client/TextureSharing/qmldir
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/IviApplication/libwaylandcompositoriviapplicationplugin.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/IviApplication/plugins.qmltypes
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/IviApplication/qmldir
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/PresentationTime/libwaylandcompositorpresentationtimeplugin.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/PresentationTime/qmldir
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/QtShell/libwaylandcompositorqtshellplugin.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/QtShell/plugins.qmltypes
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/QtShell/qmldir
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/TextureSharingExtension/libwaylandtexturesharingextensionplugin.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/TextureSharingExtension/qmldir
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/WaylandCompositor.qmltypes
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/WlShell/libwaylandcompositorwlshellplugin.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/WlShell/plugins.qmltypes
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/WlShell/qmldir
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/XdgShell/libwaylandcompositorxdgshellplugin.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/XdgShell/plugins.qmltypes
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/XdgShell/qmldir
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/libqwaylandcompositorplugin.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/qmldir
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/qmlfiles/WaylandCursorItem.qml
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWayland/Compositor/qmlfiles/WaylandOutputWindow.qml
diff --git a/debian/rules b/debian/rules
index 273b07d..e1bf815 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,14 +2,24 @@
include /usr/share/dpkg/architecture.mk
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
+
+# QT_HOST_PATH isn't passed in cross-builds
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+ extra_cmake_args += \
+ -DQT_HOST_PATH=/usr \
+ -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/${DEB_BUILD_MULTIARCH}/cmake \
+ -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
+endif
%:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
override_dh_auto_configure:
dh_auto_configure -- \
- -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+ --log-level=STATUS \
+ -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+ $(extra_cmake_args)
execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files
More information about the Neon-commits
mailing list