From 5a172520f3affee721859fa735848d40a1d30983 Mon Sep 17 00:00:00 2001 From: YeShanShan Date: Thu, 26 Oct 2023 12:30:15 +0800 Subject: [PATCH] feat: add dpkg-buildpackage support for qt6 Modify debian information. --- debian/changelog | 6 ++++++ debian/control | 24 ++++++------------------ debian/copyright | 4 ++-- debian/dde-qt5wayland-plugin.install | 2 -- debian/dde-qt5xcb-plugin.install | 1 - debian/rules | 12 ++++++++++++ 6 files changed, 26 insertions(+), 23 deletions(-) delete mode 100644 debian/dde-qt5wayland-plugin.install delete mode 100644 debian/dde-qt5xcb-plugin.install diff --git a/debian/changelog b/debian/changelog index 15461c1..3ba44af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dde-qt6platform-plugins (6.0.0) unstable; urgency=medium + + * Release 6.0.0 + + -- Deepin Packages Builder Thu, 26 Oct 2023 12:28:53 +0800 + dde-qt5platform-plugins (5.6.16) unstable; urgency=medium * fix: ensue ddeshell failed diff --git a/debian/control b/debian/control index 35f1145..8192586 100644 --- a/debian/control +++ b/debian/control @@ -1,31 +1,19 @@ -Source: dde-qt5platform-plugins +Source: dde-qt6platform-plugins Section: devel Priority: optional Maintainer: Deepin Packages Builder -Build-Depends: debhelper (>=9), qtbase5-dev, qtbase5-private-dev, - pkg-config, libqt5x11extras5-dev, libxcb-xkb-dev, libxcb-render-util0-dev, +Build-Depends: debhelper (>=9), qt6-base-dev, qt6-base-private-dev, + pkg-config, libxcb-xkb-dev, libxcb-render-util0-dev, libxcb-image0-dev, libxcb-icccm4-dev, libxcb-keysyms1-dev, libegl1-mesa-dev, - libmtdev-dev, libxkbcommon-x11-dev, libdbus-1-dev, libqt5opengl5-dev, + libmtdev-dev, libxkbcommon-x11-dev, libdbus-1-dev, libudev-dev, libxrender-dev,libxi-dev, libsm-dev, libxcb-xinerama0-dev, libfontconfig1-dev, libfreetype6-dev, libglib2.0-dev, libxcb-damage0-dev, - libxcb-composite0-dev, libcairo2-dev, libkf5wayland-dev, libdwayland-dev, - qtwayland5-private-dev | libqt5waylandclient5-dev, - libwayland-dev, libxcb-xinput-dev, libxcb-util-dev | libxcb-util0-dev, + libxcb-composite0-dev, libcairo2-dev, libxcb-xinput-dev, libxcb-util-dev | libxcb-util0-dev, libx11-xcb-dev, libxcb-sync-dev, libxcb-randr0-dev, cmake, libgtest-dev, libgmock-dev, libdtkcommon-dev(>=5.6.16) Standards-Version: 3.9.8 -Package: dde-qt5xcb-plugin +Package: dde-qt6xcb-plugin Architecture: any -Provides: libqt5dxcb-plugin -Conflicts: libqt5dxcb-plugin, qt5dxcb-plugin -Breaks:dde-qt5integration (<< 0.2.8.1) -Replaces: qt5dxcb-plugin Depends: ${shlibs:Depends}, ${misc:Depends} Description: Qt platform plugins Qt platform plugins for DDE. - -Package: dde-qt5wayland-plugin -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, qtwayland5 -Description: Qt platform plugins - Qt platform plugins for DDE. diff --git a/debian/copyright b/debian/copyright index 7058102..4d00442 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: qt5integration -Source: https://github.com/linuxdeepin/qt5integration +Upstream-Name: qt6platform-plugins +Source: https://github.com/linuxdeepin/qt6platform-plugins Files: * Copyright: 2017 Deepin.Inc diff --git a/debian/dde-qt5wayland-plugin.install b/debian/dde-qt5wayland-plugin.install deleted file mode 100644 index f507376..0000000 --- a/debian/dde-qt5wayland-plugin.install +++ /dev/null @@ -1,2 +0,0 @@ -/usr/lib/*/qt5/plugins/platforms/libdwayland.so -/usr/lib/*/qt5/plugins/wayland-shell-integration/libkwayland-shell.so diff --git a/debian/dde-qt5xcb-plugin.install b/debian/dde-qt5xcb-plugin.install deleted file mode 100644 index e3589e9..0000000 --- a/debian/dde-qt5xcb-plugin.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/qt5/plugins/platforms/libdxcb.so diff --git a/debian/rules b/debian/rules index ff01a88..261847e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,18 @@ #!/usr/bin/make -f +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/default.mk +export DEB_CXXFLAGS_MAINT_APPEND = -Ofast + +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +VERSION = $(DEB_VERSION_UPSTREAM) +PACK_VER = $(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$1}') + %: dh $@ +override_dh_auto_configure: + dh_auto_configure -- -DDTK_VERSION=$(PACK_VER) + override_dh_shlibdeps: dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info