[neon/kde/kwayland-integration/Neon/unstable] debian: back to single kf5 based build
Carlos De Maine
null at kde.org
Sun Oct 22 11:35:42 BST 2023
Git commit 0d0ff17cc0e233402dbbf0ff41d027a5c9245aa9 by Carlos De Maine.
Committed on 22/10/2023 at 12:35.
Pushed by carlosdem into branch 'Neon/unstable'.
back to single kf5 based build
M +2 -18 debian/control
M +2 -2 debian/kwayland-integration.install
D +0 -2 debian/kwayland-integration5.install
D +0 -118 debian/patches/001_dual_build
D +0 -1 debian/patches/series
M +3 -12 debian/rules
https://invent.kde.org/neon/kde/kwayland-integration/-/commit/0d0ff17cc0e233402dbbf0ff41d027a5c9245aa9
diff --git a/debian/control b/debian/control
index e88e546..fd2fb1a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,28 +5,19 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake,
debhelper-compat (= 13),
- kf6-extra-cmake-modules,
- kf6-kguiaddons-dev,
- kf6-kidletime-dev,
- kf6-kwayland-dev,
- kf6-kwindowsystem-dev,
libkf5guiaddons-dev,
libkf5idletime-dev,
libkf5wayland-dev,
libkf5windowsystem-dev,
libqt5waylandclient5-dev,
libwayland-dev,
- pkg-kde-tools-neon,
+ pkg-kde-tools,
plasma-wayland-protocols,
qtbase5-dev,
qtbase5-private-dev,
qtwayland5,
qtwayland5-dev-tools,
qtwayland5-private-dev,
- qt6-base-dev,
- qt6-wayland,
- qt6-wayland-dev,
- qt6-wayland-dev-tools,
wayland-protocols
Standards-Version: 4.6.2
Homepage: https://projects.kde.org/projects/kde/workspace/kwayland-integration
@@ -36,13 +27,6 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kwayland-integration.git
Package: kwayland-integration
Architecture: any
Multi-Arch: same
-Depends: qt6-wayland, ${misc:Depends}, ${shlibs:Depends}
-Description: kwayland runtime integration plugins
- Wayland runtime integration plugins for plasma6.
-
-Package: kwayland-integration5
-Architecture: any
-Multi-Arch: same
-Depends: kwayland-integration, qtwayland5, ${misc:Depends}, ${shlibs:Depends}
+Depends: qtwayland5, ${misc:Depends}, ${shlibs:Depends}
Description: kwayland runtime integration plugins
Wayland runtime integration plugins for plasma5.
diff --git a/debian/kwayland-integration.install b/debian/kwayland-integration.install
index ff3c841..61af31a 100644
--- a/debian/kwayland-integration.install
+++ b/debian/kwayland-integration.install
@@ -1,2 +1,2 @@
-usr/lib/*/qt6/plugins/
-usr/share/qlogging-categories6/
+usr/lib/*/qt5/plugins/
+usr/share/qlogging-categories5/kwindowsystem.kwayland.categories
\ No newline at end of file
diff --git a/debian/kwayland-integration5.install b/debian/kwayland-integration5.install
deleted file mode 100644
index 61af31a..0000000
--- a/debian/kwayland-integration5.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/qt5/plugins/
-usr/share/qlogging-categories5/kwindowsystem.kwayland.categories
\ No newline at end of file
diff --git a/debian/patches/001_dual_build b/debian/patches/001_dual_build
deleted file mode 100644
index 0cd71d0..0000000
--- a/debian/patches/001_dual_build
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9b8ba6a301503a31e9a2c991ad36dee8406eb777..8bbe8768be24bb5598f23ee651b342bf8375db30 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,29 +19,27 @@ find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} )
-
- include(FeatureSummary)
--include(KDEInstallDirs)
--include(KDECMakeSettings)
-+
- include(KDECompilerSettings NO_POLICY_SCOPE)
- include(ECMQtDeclareLoggingCategory)
- include(KDEClangFormat)
- include(KDEGitCommitHooks)
- include(ECMDeprecationSettings)
-
--find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
-- Core
-- Widgets
-- WaylandClient
--)
-+set(QT_NO_CREATE_VERSIONLESS_TARGETS ON)
-+set(QT_NO_CREATE_VERSIONLESS_FUNCTIONS ON)
-
--# required frameworks
--find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS
-- WindowSystem
-- Wayland
--)
-+option(BUILD_QT5 "Build for Qt5" ON)
-+option(BUILD_QT6 "Build for Qt6" ON)
-
--if (QT_MAJOR_VERSION EQUAL "5")
-- find_package(QtWaylandScanner REQUIRED)
-- find_package(Qt5XkbCommonSupport REQUIRED) # Needed by Qt5::WaylandClientPrivate
-+
-+# For KDE CI only. As the current infrastructure doesn't allow us to set CMAKE options per build variant
-+if ($ENV{CI_JOB_NAME_SLUG} MATCHES "qt5")
-+ set(BUILD_QT5 ON)
-+ set(BUILD_QT6 OFF)
-+elseif($ENV{CI_JOB_NAME_SLUG} MATCHES "qt6")
-+ set(BUILD_QT5 OFF)
-+ set(BUILD_QT6 ON)
- endif()
-
- find_package(WaylandProtocols 1.21 REQUIRED)
-@@ -53,7 +51,44 @@ ecm_set_disabled_deprecation_versions(QT 5.15.2
- KF 5.101
- )
-
--add_subdirectory(src)
-+set(KDE_SKIP_TEST_SETTINGS ON)
-+
-+function(buildsrc QT_MAJOR_VERSION)
-+ include(KDEInstallDirs${QT_MAJOR_VERSION})
-+ include(KDECMakeSettings)
-+ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
-+ Core
-+ Widgets
-+ WaylandClient
-+ )
-+ # https://bugreports.qt.io/browse/QTBUG-114706
-+ add_library(Qt::Core ALIAS Qt${QT_MAJOR_VERSION}::Core)
-+ add_library(Qt::CorePrivate ALIAS Qt${QT_MAJOR_VERSION}::CorePrivate)
-+ add_library(Qt::Gui ALIAS Qt${QT_MAJOR_VERSION}::Gui)
-+ add_library(Qt::GuiPrivate ALIAS Qt${QT_MAJOR_VERSION}::GuiPrivate)
-+
-+ # required frameworks
-+ find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS
-+ WindowSystem
-+ Wayland
-+ )
-+
-+ if (QT_MAJOR_VERSION EQUAL "5")
-+ find_package(QtWaylandScanner ${QT_MIN_VERSION} REQUIRED)
-+ find_package(Qt5XkbCommonSupport REQUIRED) # Needed by Qt5::WaylandClientPrivate
-+ endif()
-+ add_subdirectory(src src${QT_MAJOR_VERSION})
-+endfunction()
-+
-+if (${BUILD_QT5})
-+ unset(QUERY_EXECUTABLE CACHE)
-+ buildsrc(5)
-+endif()
-+if (${BUILD_QT6})
-+ unset(QUERY_EXECUTABLE CACHE)
-+ buildsrc(6)
-+endif()
-+
-
- # add clang-format target for all our real source files
- file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
-diff --git a/src/windowsystem/CMakeLists.txt b/src/windowsystem/CMakeLists.txt
-index accee434e56f5d2f263016ce16bd8cced118244f..d6f3b4b814f58b7d304c86b68034f05d5a5749e9 100644
---- a/src/windowsystem/CMakeLists.txt
-+++ b/src/windowsystem/CMakeLists.txt
-@@ -57,16 +57,16 @@ pkg_check_modules(XKBCommon REQUIRED IMPORTED_TARGET xkbcommon)
- target_link_libraries(KF${QT_MAJOR_VERSION}WindowSystemKWaylandPlugin
- KF${QT_MAJOR_VERSION}::WindowSystem
- KF${QT_MAJOR_VERSION}::WaylandClient
-- Qt::Widgets
-+ Qt${QT_MAJOR_VERSION}::Widgets
- Wayland::Client
-- Qt::WaylandClient
-- Qt::WaylandClientPrivate
-+ Qt${QT_MAJOR_VERSION}::WaylandClient
-+ Qt${QT_MAJOR_VERSION}::WaylandClientPrivate
- PkgConfig::XKBCommon
- )
-
- if (QT_MAJOR_VERSION EQUAL "5")
- target_link_libraries(KF${QT_MAJOR_VERSION}WindowSystemKWaylandPlugin
-- Qt::XkbCommonSupportPrivate
-+ Qt5::XkbCommonSupportPrivate
- )
- endif()
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 89d793d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-001_dual_build
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index b69b271..5cb2f4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,23 +2,14 @@
# SPDX-License-Identifier: LGPL-2.0-or-later
# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
-QT6_CMAKE_ARGS = -DBUILD_QT5=OFF -DBUILD_QT6=ON
-QT5_CMAKE_ARGS = -DBUILD_QT5=ON -DBUILD_QT6=OFF
-
%:
- dh $@ --with kf6 --buildsystem kf6
-
-execute_after_dh_auto_clean:
- rm -rf build-QT5
+ dh $@ --with kf5 --buildsystem kf5
override_dh_auto_configure:
- dh_auto_configure --builddirectory=build-QT5 -- $(QT5_CMAKE_ARGS) -DUSE_QT_VERSION=5
- dh_auto_configure -- $(QT6_CMAKE_ARGS) -DUSE_QT_VERSION=6
-
+ dh_auto_configure -DUSE_QT_VERSION=5
+
override_dh_auto_build:
- dh_auto_build --builddirectory=build-QT5
dh_auto_build
override_dh_install:
- dh_auto_install --builddirectory=build-QT5
dh_install
More information about the Neon-commits
mailing list