From 0317c5dd9968cf982f4b2ad526be73222bb208be Mon Sep 17 00:00:00 2001 From: Patrick Franz Date: Tue, 7 Sep 2021 16:06:52 +0200 Subject: [PATCH] cmake fixes. --- debian/control | 2 +- debian/libqt6gui6.install | 2 -- debian/libqt6gui6.symbols | 1 - debian/qt6base-dev.install | 11 ----------- debian/rules | 3 --- 5 files changed, 1 insertion(+), 18 deletions(-) diff --git a/debian/control b/debian/control index 9e3fff6..01e75ce 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: qt6base Priority: optional Maintainer: Debian Qt/KDE Maintainers Uploaders: Patrick Franz -Build-Depends: cmake (>= 3.16~), +Build-Depends: cmake (>= 3.18~), debhelper-compat (= 13), dh-exec, firebird-dev, diff --git a/debian/libqt6gui6.install b/debian/libqt6gui6.install index a78c109..817bbb4 100644 --- a/debian/libqt6gui6.install +++ b/debian/libqt6gui6.install @@ -7,7 +7,6 @@ usr/lib/${DEB_HOST_MULTIARCH}/libQt6XcbQpa.so.* usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-emu-integration.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so 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/generic/libqevdevkeyboardplugin.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevmouseplugin.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevtabletplugin.so @@ -27,5 +26,4 @@ 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/libqvnc.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqxcb.so -usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/xcbglintegrations/libqxcb-egl-integration.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/xcbglintegrations/libqxcb-glx-integration.so diff --git a/debian/libqt6gui6.symbols b/debian/libqt6gui6.symbols index a71340b..45da400 100644 --- a/debian/libqt6gui6.symbols +++ b/debian/libqt6gui6.symbols @@ -2987,7 +2987,6 @@ libQt6Gui.so.6 libqt6gui6 #MINVER# _ZN19QToolBarChangeEventD0Ev@Qt_6 6.1.2 _ZN19QToolBarChangeEventD1Ev@Qt_6 6.1.2 _ZN19QToolBarChangeEventD2Ev@Qt_6 6.1.2 - _ZN19QXlibEglIntegration21getCompatibleVisualIdEP9_XDisplayPvS2_@Qt_6_PRIVATE_API 6.1.2 1 _ZN20QAccessibleInterface12virtual_hookEiPv@Qt_6 6.1.2 _ZN20QAccessibleInterfaceD0Ev@Qt_6 6.1.2 _ZN20QAccessibleInterfaceD1Ev@Qt_6 6.1.2 diff --git a/debian/qt6base-dev.install b/debian/qt6base-dev.install index cf9dd69..25474fd 100644 --- a/debian/qt6base-dev.install +++ b/debian/qt6base-dev.install @@ -1940,12 +1940,6 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QEglFSKmsGbmIntegrationPluginConfi usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QEglFSKmsGbmIntegrationPluginDependencies.cmake usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QEglFSKmsGbmIntegrationPluginTargets-none.cmake usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QEglFSKmsGbmIntegrationPluginTargets.cmake -usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QEglFSX11IntegrationPluginAdditionalTargetInfo.cmake -usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QEglFSX11IntegrationPluginConfig.cmake -usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QEglFSX11IntegrationPluginConfigVersion.cmake -usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QEglFSX11IntegrationPluginDependencies.cmake -usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QEglFSX11IntegrationPluginTargets-none.cmake -usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QEglFSX11IntegrationPluginTargets.cmake usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QEvdevKeyboardPluginAdditionalTargetInfo.cmake usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QEvdevKeyboardPluginConfig.cmake usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QEvdevKeyboardPluginConfigVersion.cmake @@ -2032,11 +2026,6 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QVncIntegrationPluginConfig.cmake usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QVncIntegrationPluginConfigVersion.cmake usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QVncIntegrationPluginTargets-none.cmake usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QVncIntegrationPluginTargets.cmake -usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginAdditionalTargetInfo.cmake -usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginConfig.cmake -usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginConfigVersion.cmake -usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginTargets-none.cmake -usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginTargets.cmake usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginAdditionalTargetInfo.cmake usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginConfig.cmake usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginConfigVersion.cmake diff --git a/debian/rules b/debian/rules index 53ee88a..22716f4 100755 --- a/debian/rules +++ b/debian/rules @@ -6,9 +6,6 @@ include /usr/share/dpkg/architecture.mk export DEB_BUILD_MAINT_OPTIONS = hardening=+all -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - %: dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja