From 7de704814993ccdbe7322e2c311931ea98a511eb Mon Sep 17 00:00:00 2001
From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
Date: Mon, 6 Jun 2022 10:49:01 +0200
Subject: [PATCH] Merge qtwaylandscanner-kde into kwayland-server package

This simplifies maintenance during updates, because with every Plasma
update also the qtwaylandscanner_kde must updated.
---
 recipes-plasma/kwayland-server.inc            | 33 ++++++++++++++++---
 .../kwayland-server}/fake_project_root.patch  |  6 ++--
 recipes-support/qtwaylandscanner-kde.inc      | 31 -----------------
 .../qtwaylandscanner-kde_5.24.2.bb            |  5 ---
 4 files changed, 33 insertions(+), 42 deletions(-)
 rename {recipes-support/qtwaylandscanner-kde => recipes-plasma/kwayland-server}/fake_project_root.patch (85%)
 delete mode 100644 recipes-support/qtwaylandscanner-kde.inc
 delete mode 100644 recipes-support/qtwaylandscanner-kde_5.24.2.bb

diff --git a/recipes-plasma/kwayland-server.inc b/recipes-plasma/kwayland-server.inc
index be2f067..2c7a7e5 100644
--- a/recipes-plasma/kwayland-server.inc
+++ b/recipes-plasma/kwayland-server.inc
@@ -1,24 +1,49 @@
 # SPDX-FileCopyrightText: 2020 Volker Krause <vkrause@kde.org>
+# SPDX-FileCopyrightText: 2022 Andreas Cord-Landwehr <cordlandwehr@kde.org>
 #
 # SPDX-License-Identifier: MIT
 
 DESCRIPTION = "KWayland Server"
-HOMEPAGE = ""
+HOMEPAGE = "https://invent.kde.org/plasma/kwayland-server/"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = " \
     file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
 "
 PR = "r0"
 
-DEPENDS = " \
+inherit cmake_qt5
+inherit pkgconfig
+# TODO skip inherit of cmake_plasma for now because to leads to build errors for native package
+
+DEPENDS:class-target = " \
     qtbase \
     qtwayland \
     qtwayland-native \
     kwayland \
     plasma-wayland-protocols \
-    qtwaylandscanner-kde-native \
+    kwayland-server-native \
     wayland \
     wayland-protocols \
 "
 
-inherit cmake_plasma
+DEPENDS:class-native = " \
+    qtbase-native \
+    extra-cmake-modules-native \
+"
+
+SRC_URI:append:class-native = " \
+    file://fake_project_root.patch \
+"
+
+OECMAKE_SOURCEPATH:class-native = "${S}/src/tools"
+
+do_install:class-native() {
+    install -d ${D}/${bindir}
+    install ${B}/bin/qtwaylandscanner_kde ${D}/${bindir}
+}
+
+FILES:${PN}-dev += " \
+    ${datadir}/qlogging-categories5/* \
+"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes-support/qtwaylandscanner-kde/fake_project_root.patch b/recipes-plasma/kwayland-server/fake_project_root.patch
similarity index 85%
rename from recipes-support/qtwaylandscanner-kde/fake_project_root.patch
rename to recipes-plasma/kwayland-server/fake_project_root.patch
index ec622f3..0db1979 100644
--- a/recipes-support/qtwaylandscanner-kde/fake_project_root.patch
+++ b/recipes-plasma/kwayland-server/fake_project_root.patch
@@ -2,16 +2,18 @@ diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
 index 5eea6e49..b78afb7b 100644
 --- a/src/tools/CMakeLists.txt
 +++ b/src/tools/CMakeLists.txt
-@@ -1,3 +1,22 @@
+@@ -1,3 +1,24 @@
 +cmake_minimum_required(VERSION 3.16)
 +set(QT_MIN_VERSION "5.15.0")
 +project(QtWaylandScannerKde)
++set(CMAKE_C_STANDARD 99)
 +set(CMAKE_CXX_STANDARD 17)
 +set(CMAKE_CXX_STANDARD_REQUIRED ON)
 +
 +# ECM setup
++set(KDE_COMPILERSETTINGS_LEVEL "5.82")
 +include(FeatureSummary)
-+find_package(ECM ${KF5_MIN_VERSION} NO_MODULE REQUIRED)
++find_package(ECM 5.82 NO_MODULE REQUIRED)
 +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 +
 +include(CheckIncludeFile)
diff --git a/recipes-support/qtwaylandscanner-kde.inc b/recipes-support/qtwaylandscanner-kde.inc
deleted file mode 100644
index 58f79fc..0000000
--- a/recipes-support/qtwaylandscanner-kde.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-# SPDX-FileCopyrightText: 2018-2020 Volker Krause <vkrause@kde.org>
-#
-# SPDX-License-Identifier: MIT
-
-DESCRIPTION = "qtwaylandscanner temporary fork (really KWayland Server repository subset)"
-HOMEPAGE = "https://invent.kde.org/plasma/kwayland-server/"
-LICENSE = "LGPL-2.1"
-LIC_FILES_CHKSUM = "file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f"
-PR = "r0"
-
-BBCLASSEXTEND = "native nativesdk"
-
-DEPENDS = " \
-    qtbase \
-    extra-cmake-modules \
-"
-
-SRC_URI = " \
-    git://invent.kde.org/plasma/kwayland-server;nobranch=1;protocol=https \
-    file://fake_project_root.patch \
-"
-S = "${WORKDIR}/git"
-
-OECMAKE_SOURCEPATH = "${S}/src/tools"
-
-inherit cmake_qt5
-
-do_install() {
-    install -d ${D}/${bindir}
-    cp ${B}/qtwaylandscanner_kde ${D}/${bindir}
-}
diff --git a/recipes-support/qtwaylandscanner-kde_5.24.2.bb b/recipes-support/qtwaylandscanner-kde_5.24.2.bb
deleted file mode 100644
index 6082bec..0000000
--- a/recipes-support/qtwaylandscanner-kde_5.24.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRCREV = "v${PV}"