Lubuntu
/
qt6-base
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move lots of QPA plugins into library packages.

Browse Source
ci/unstable
Patrick Franz 2 years ago
parent 6b7c10c4a5
commit 09b683fbf3
No known key found for this signature in database
GPG Key ID: 9E9F7A603077FE56
8 changed files with 64 additions and 47 deletions
Show Stats Download Patch File Download Diff File

6
debian/changelog vendored
Unescape View File

@ -1,8 +1,10 @@
qt6-base (6.3.1+dfsg-6) UNRELEASED; urgency=medium qt6-base (6.3.1+dfsg-6) UNRELEASED; urgency=medium
[ Dmitry Shachnev ] [ Dmitry Shachnev ]
* Make libqt6gui6 recommend qt6-qpa-plugins. That package contains * Make libqt6gui6 recommend qt6-qpa-plugins.
libqxcb.so, without which Qt will not work on X11 platform.
[ Patrick Franz ]
* Move lots of QPA plugins into library packages.
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 24 Jul 2022 19:36:07 +0300 -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 24 Jul 2022 19:36:07 +0300

14
debian/control vendored
Unescape View File

@ -126,8 +126,8 @@ Architecture: any
Multi-Arch: same Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends} Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends}
Breaks: qt6-qpa-plugins (<< 6.2.4+dfsg-5~) Breaks: qt6-qpa-plugins (<< 6.3.1+dfsg-6~)
Replaces: qt6-qpa-plugins (<< 6.2.4+dfsg-5~) Replaces: qt6-qpa-plugins (<< 6.3.1+dfsg-6~)
Recommends: qt6-gtk-platformtheme, qt6-qpa-plugins Recommends: qt6-gtk-platformtheme, qt6-qpa-plugins
Description: Qt 6 GUI module Description: Qt 6 GUI module
Qt is a cross-platform C++ application framework. Qt's primary feature Qt is a cross-platform C++ application framework. Qt's primary feature
@ -140,12 +140,14 @@ Architecture: any
Multi-Arch: same Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends} Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends}
Breaks: libqt6gui6 (<< 6.2.4+dfsg-5~), libqt6network6 (<< 6.2.4+dfsg-5~) Breaks: libqt6gui6 (<< 6.3.1+dfsg-6~), libqt6network6 (<< 6.3.1+dfsg-6~)
Description: Qt 6 EGL plugins Description: Qt 6 QPA plugins
Qt is a cross-platform C++ application framework. Qt's primary feature Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality. is its rich set of widgets that provide standard GUI functionality.
. .
This package contains QPA-related plugins. This package contains the following plugins:
* uioTouch Plugin
* VNC Plugin
Package: qt6-gtk-platformtheme Package: qt6-gtk-platformtheme
Architecture: any Architecture: any
@ -176,6 +178,8 @@ Architecture: any
Multi-Arch: same Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends} Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: qt6-qpa-plugins (<< 6.3.1+dfsg-6~)
Replaces: qt6-qpa-plugins (<< 6.3.1+dfsg-6~)
Description: Qt 6 OpenGL module Description: Qt 6 OpenGL module
Qt is a cross-platform C++ application framework. Qt's primary feature Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality. is its rich set of widgets that provide standard GUI functionality.

17
debian/libqt6gui6.install vendored
Unescape View File

@ -1,4 +1,21 @@
#!/usr/bin/dh-exec
usr/lib/${DEB_HOST_MULTIARCH}/libQt6Gui.so.* usr/lib/${DEB_HOST_MULTIARCH}/libQt6Gui.so.*
usr/lib/${DEB_HOST_MULTIARCH}/libQt6XcbQpa.so.*
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/imageformats/libqgif.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/imageformats/libqgif.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/imageformats/libqico.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/imageformats/libqico.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/imageformats/libqjpeg.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/imageformats/libqjpeg.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevkeyboardplugin.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevmouseplugin.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevtabletplugin.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevtouchplugin.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqlibinputplugin.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqtslibplugin.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqlinuxfb.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqminimal.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqoffscreen.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqxcb.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/xcbglintegrations/libqxcb-glx-integration.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqvkkhrdisplay.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/xcbglintegrations/libqxcb-egl-integration.so

11
debian/libqt6gui6.lintian-overrides vendored
Unescape View File

@ -1,3 +1,14 @@
# This dependency has been added to track external packages building against # This dependency has been added to track external packages building against
# our private headers. It is ok if internal packages depend on the ABI one. # our private headers. It is ok if internal packages depend on the ABI one.
libqt6gui6: symbols-declares-dependency-on-other-package qt6-base-abi * libqt6gui6: symbols-declares-dependency-on-other-package qt6-base-abi *
# libQt6XcbQpa is actually a private library *only* used by its
# platforms plugins.
# Sadly instead of being installed into a proper place like
# /usr/lib/<arch-triplet>/qt6/ it is are being installed into /usr/lib/.
# We are still shipping the headers but they only contain the version and
# the only binaries that depend on them are shipped within this very same
# binary package, so it's safe to override these Lintian warnings.
libqt6gui6: package-name-doesnt-match-sonames libQt6XcbQpa6
libqt6gui6: lacks-ldconfig-trigger usr/lib/*/libQt6XcbQpa.so.6.*
ships-undeclared-shared-library libQt6XcbQpa 6 for usr/lib/x86_64-linux-gnu/libQt6XcbQpa.so.6.*

10
debian/libqt6opengl6.install vendored
Unescape View File

@ -1 +1,11 @@
#!/usr/bin/dh-exec
usr/lib/${DEB_HOST_MULTIARCH}/libQt6OpenGL.so.* usr/lib/${DEB_HOST_MULTIARCH}/libQt6OpenGL.so.*
usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFSDeviceIntegration.so.*
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFsKmsGbmSupport.so.*
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFsKmsSupport.so.*
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-emu-integration.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-kms-integration.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-x11-integration.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqeglfs.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqminimalegl.so

13
debian/libqt6opengl6.lintian-overrides vendored
Unescape View File

@ -1,3 +1,16 @@
# This dependency has been added to track external packages building against # This dependency has been added to track external packages building against
# our private headers. It is ok if internal packages depend on the ABI one. # our private headers. It is ok if internal packages depend on the ABI one.
libqt6opengl6: symbols-declares-dependency-on-other-package qt6-base-abi * libqt6opengl6: symbols-declares-dependency-on-other-package qt6-base-abi *
# libQt6EglFSDeviceIntegration, libQt6EglFsKmsGbmSupport and libQt6EglFsKmsSupport
# are actually private libraries *only* used by their
# respective platforms plugins.
# Sadly instead of being installed into a proper place like
# /usr/lib/<arch-triplet>/qt6/ they are being installed into /usr/lib/.
# We are still shipping the headers but they only contain the version and
# the only binaries that depend on them are shipped within this very same
# binary package, so it's safe to override these Lintian warnings.
libqt6opengl6: package-name-doesnt-match-sonames libQt6EglFSDeviceIntegration6 libQt6EglFsKmsGbmSupport6 libQt6EglFsKmsSupport6
libqt6opengl6: ships-undeclared-shared-library libQt6EglFSDeviceIntegration 6 for usr/lib/x86_64-linux-gnu/libQt6EglFSDeviceIntegration.so.6.*
libqt6opengl6: ships-undeclared-shared-library libQt6EglFsKmsGbmSupport 6 for usr/lib/x86_64-linux-gnu/libQt6EglFsKmsGbmSupport.so.6.*
libqt6opengl6: ships-undeclared-shared-library libQt6EglFsKmsSupport 6 for usr/lib/x86_64-linux-gnu/libQt6EglFsKmsSupport.so.6.*

26
debian/qt6-qpa-plugins.install vendored
Unescape View File

@ -1,28 +1,2 @@
#!/usr/bin/dh-exec
usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFSDeviceIntegration.so.*
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFsKmsGbmSupport.so.*
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFsKmsSupport.so.*
usr/lib/${DEB_HOST_MULTIARCH}/libQt6XcbQpa.so.*
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-emu-integration.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-kms-integration.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-x11-integration.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevkeyboardplugin.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevmouseplugin.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevtabletplugin.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevtouchplugin.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqlibinputplugin.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqtslibplugin.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqtuiotouchplugin.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqtuiotouchplugin.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqeglfs.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqlinuxfb.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqminimal.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqminimalegl.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqoffscreen.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqvnc.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqvnc.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqxcb.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/xcbglintegrations/libqxcb-glx-integration.so
[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqvkkhrdisplay.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/xcbglintegrations/libqxcb-egl-integration.so

14
debian/qt6-qpa-plugins.lintian-overrides vendored
Unescape View File

@ -1,14 +0,0 @@
# libQt6EglFSDeviceIntegration, libQt6EglFsKmsGbmSupport, libQt6EglFsKmsSupport
# and libQt6XcbQpa are actually private libraries *only* used by their
# respective platforms plugins.
# Sadly instead of being installed into a proper place like
# /usr/lib/<arch-triplet>/qt6/ they are being installed into /usr/lib/.
# We are still shipping the headers but they only contain the version and
# the only binaries that depend on them are shipped within this very same
# binary package, so it's safe to override these Lintian warnings.
qt6-qpa-plugins: lacks-ldconfig-trigger usr/lib/*/libQt6XcbQpa.so.6.*
qt6-qpa-plugins: package-name-doesnt-match-sonames libQt6EglFSDeviceIntegration6 libQt6EglFsKmsGbmSupport6 libQt6EglFsKmsSupport6 libQt6XcbQpa6
qt6-qpa-plugins: no-shlibs usr/lib/*/libQt6EglFSDeviceIntegration.so.6.*
qt6-qpa-plugins: no-shlibs usr/lib/*/libQt6EglFsKmsGbmSupport.so.6.*
qt6-qpa-plugins: no-shlibs usr/lib/*/libQt6EglFsKmsSupport.so.6.*
qt6-qpa-plugins: no-shlibs usr/lib/*/libQt6XcbQpa.so.6.*
Write Preview
Loading…
Cancel
Save