From e32534f62b4d1a2efc521e0a7d30478a459a1b17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 27 Nov 2014 09:43:38 +0100
Subject: [PATCH] kconfig: add Upstream-Status to patches / share EXTRA_OECMAKE
 for cross/native
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../kconfig/files/0001-Make-sessionConfig-optional.patch        | 2 ++
 .../files/0002-Make-autotests-optional-enabled-by-default.patch | 2 ++
 recipes-kde-base/kconfig/kconfig-native.bb                      | 2 --
 recipes-kde-base/kconfig/kconfig.bb                             | 2 --
 recipes-kde-base/kconfig/kconfig.inc                            | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/recipes-kde-base/kconfig/files/0001-Make-sessionConfig-optional.patch b/recipes-kde-base/kconfig/files/0001-Make-sessionConfig-optional.patch
index d932e3b5..0363730b 100644
--- a/recipes-kde-base/kconfig/files/0001-Make-sessionConfig-optional.patch
+++ b/recipes-kde-base/kconfig/files/0001-Make-sessionConfig-optional.patch
@@ -8,6 +8,8 @@ Content-Transfer-Encoding: 8bit
 
 this is required for pure wayland environments
 
+Upstream-Status: Inappropriate [config]
+
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
  CMakeLists.txt         | 4 +++-
diff --git a/recipes-kde-base/kconfig/files/0002-Make-autotests-optional-enabled-by-default.patch b/recipes-kde-base/kconfig/files/0002-Make-autotests-optional-enabled-by-default.patch
index 758e844d..e1a8d17c 100644
--- a/recipes-kde-base/kconfig/files/0002-Make-autotests-optional-enabled-by-default.patch
+++ b/recipes-kde-base/kconfig/files/0002-Make-autotests-optional-enabled-by-default.patch
@@ -6,6 +6,8 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+Upstream-Status: Inappropriate [config]
+
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
  CMakeLists.txt | 6 +++++-
diff --git a/recipes-kde-base/kconfig/kconfig-native.bb b/recipes-kde-base/kconfig/kconfig-native.bb
index 0acebef9..05b64f31 100644
--- a/recipes-kde-base/kconfig/kconfig-native.bb
+++ b/recipes-kde-base/kconfig/kconfig-native.bb
@@ -1,5 +1,3 @@
 require ${BPN}.inc
 
 inherit native
-
-EXTRA_OECMAKE += "-DAUTOTESTS=OFF -DSESSION_MANAGEMENT=OFF"
diff --git a/recipes-kde-base/kconfig/kconfig.bb b/recipes-kde-base/kconfig/kconfig.bb
index 5a6bf5d5..8beeca22 100644
--- a/recipes-kde-base/kconfig/kconfig.bb
+++ b/recipes-kde-base/kconfig/kconfig.bb
@@ -4,8 +4,6 @@ inherit cmake-lib
 
 DEPENDS += "${BPN}-native"
 
-EXTRA_OECMAKE += "-DAUTOTESTS=OFF -DSESSION_MANAGEMENT=${@base_contains("DISTRO_FEATURES", "x11", "ON", "OFF", d)}"
-
 # cross libs / headers
 CMAKE_HIDE_ERROR[1] = "KF5Config, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_HIDE_ERROR[2] = "KF5Config, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde-base/kconfig/kconfig.inc b/recipes-kde-base/kconfig/kconfig.inc
index 7f31afbc..0a4d30af 100644
--- a/recipes-kde-base/kconfig/kconfig.inc
+++ b/recipes-kde-base/kconfig/kconfig.inc
@@ -13,6 +13,8 @@ SRC_URI += " \
 SRCREV = "f844f6a85e4bce35d0802eed11b19916d34ed78c"
 PV = "5.5.0"
 
+EXTRA_OECMAKE += "-DAUTOTESTS=OFF -DSESSION_MANAGEMENT=${@base_contains("DISTRO_FEATURES", "x11", "ON", "OFF", d)}"
+
 PACKAGES =+ "${PN}-bin"
 
 FILES_${PN}-dbg += "${libdir}/kconfig/kf5/.debug"