Source: qt6-base
Severity: wishlist
Version: 6.10.2+dfsg-15
X-Debbugs-CC: [email protected]

Dear Debian Qt maintainers,

When working on migrating Deepin-related packages [1] from Qt5 to Qt6,
I noticed that the QtXcbQpa private headers are installed for Qt5 but not 
installed
for Qt6. In qtbase-opensource-src/5.15.4+dfsg-2:

qtbase-opensource-src (5.15.4+dfsg-2) experimental; urgency=medium

  * Install QtXcbQpa private headers needed for deepin-qt5dxcb-plugin,
    to avoid modifying it for every new Qt version.
  * Use symver directive to catch all private symbols at once.
  * Bump Standards-Version to 4.6.1, no changes needed.

 -- Dmitry Shachnev <[email protected]>  Mon, 16 May 2022 14:42:53 +0300


The previous diff is:

--- a/debian/qtbase5-private-dev.install

+++ b/debian/qtbase5-private-dev.install

@@ -104,6 +104,7 @@ 
usr/include/${DEB_HOST_MULTIARCH}/qt5/QtThemeSupport/QtThemeSupportDepends

usr/include/${DEB_HOST_MULTIARCH}/qt5/QtThemeSupport/QtThemeSupportVersion

usr/include/${DEB_HOST_MULTIARCH}/qt5/QtThemeSupport/qtthemesupportversion.h

usr/include/${DEB_HOST_MULTIARCH}/qt5/QtWidgets/5.*/*

+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtXcb/5.*/*

usr/include/${DEB_HOST_MULTIARCH}/qt5/QtXkbCommonSupport/5.*/*

usr/include/${DEB_HOST_MULTIARCH}/qt5/QtXkbCommonSupport/QtXkbCommonSupport

usr/include/${DEB_HOST_MULTIARCH}/qt5/QtXkbCommonSupport/QtXkbCommonSupportDepends

diff --git a/debian/rules b/debian/rules

index 5333568..1f1f305 100755

--- a/debian/rules

+++ b/debian/rules

@@ -297,6 +297,10 @@ endif

sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' 
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt5*.prl \

debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/widgets/tools/plugandpaint/plugins/libpnp_basictools.prl

+ # Headers needed for building deepin-qt5dxcb-plugin.

+ install -D -t 
debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtXcb/$(DEB_VERSION_UPSTREAM:+dfsg=)/QtXcb/private
 \

+ src/plugins/platforms/xcb/*.h

+

override_dh_auto_install-indep:

dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs


For the Qt6 case, Deepin-related software will need corresponding private 
headers
installed in qt6-base-private-dev. I believe some similar patch would be 
helpful.

Related headers are:

* src/plugins/platforms/*.h
* src/plugins/platforms/gl_integrations/*.h
* src/plugins/platforms/nativepainting/*.h

Please let me know if you find it okay, and I can prepare similar patches if 
necessary.

Best,
Boyuan


[1] 
https://qa.debian.org/developer.php?login=pkg-deepin-devel%40lists.alioth.debian.org

Attachment: OpenPGP_0xC293E7B461825ACE.asc
Description: OpenPGP public key

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature

Reply via email to