[neon/qt/qtbase/Neon/release] debian: Install QtXcbQpa private headers needed for deepin-qt5dxcb-plugin.

Dmitry Shachnev null at kde.org
Thu Jul 14 13:14:44 BST 2022


Git commit fbd4ec4727ce82d164a2e2e2a0f2fdea2004da6f by Dmitry Shachnev.
Committed on 14/05/2022 at 12:07.
Pushed by jriddell into branch 'Neon/release'.

Install QtXcbQpa private headers needed for deepin-qt5dxcb-plugin.

To avoid modifying it for every new Qt version. See:
https://github.com/linuxdeepin/qt5platform-plugins/blob/5.0.62/xcb/linux.pri#L96-L97

M  +3    -0    debian/changelog
M  +1    -0    debian/qtbase5-private-dev.install
M  +4    -0    debian/rules

https://invent.kde.org/neon/qt/qtbase/commit/fbd4ec4727ce82d164a2e2e2a0f2fdea2004da6f

diff --git a/debian/changelog b/debian/changelog
index db30a4e..3192479 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtbase-opensource-src (5.15.4+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Install QtXcbQpa private headers needed for deepin-qt5dxcb-plugin,
+    to avoid modifying it for every new Qt version.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 14 May 2022 15:05:19 +0300
 
diff --git a/debian/qtbase5-private-dev.install b/debian/qtbase5-private-dev.install
index b02dabb..d423644 100755
--- 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
 



More information about the Neon-commits mailing list