oxygen: make settings / kcmutils dependency an option disabled by default

kcmutils depends on kdeclarative which is not builable without x11-egl.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2015-09-01 10:12:16 +02:00
parent 3bd9250ac0
commit 9dc082bf35
2 changed files with 48 additions and 1 deletions

View File

@@ -0,0 +1,43 @@
From 70183d51ee4fe116ffac2c7ef5f2b28e47a68b0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 1 Sep 2015 09:57:07 +0200
Subject: [PATCH] kstyle: add an option BUILD_OXYGEN_SETTINGS disabled by
default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
on machines not supporting x11-egl (Raspberrypi / TI armv7) kdeclarative fails
to build and kcmutils depends on kdeclarative. By this option we get the chance
to build the library for these machines.
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
kstyle/config/CMakeLists.txt | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/kstyle/config/CMakeLists.txt b/kstyle/config/CMakeLists.txt
index 3d5387e..1625a06 100644
--- a/kstyle/config/CMakeLists.txt
+++ b/kstyle/config/CMakeLists.txt
@@ -53,6 +53,9 @@ else()
endif()
+option(BUILD_OXYGEN_SETTINGS "Build oxygen settings" OFF)
+if(BUILD_OXYGEN_SETTINGS)
+
########### next target ###############
if(NOT OXYGEN_USE_KDE4)
@@ -78,3 +81,5 @@ if(NOT OXYGEN_USE_KDE4)
THEME hicolor )
endif()
endif()
+
+endif()
--
2.1.0

View File

@@ -17,13 +17,17 @@ DEPENDS += " \
frameworkintegration \
kwindowsystem \
kdecoration \
kcmutils \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "libxcb qtx11extras", "", d)} \
"
PV = "${PLASMA_VERSION}"
SRC_URI[md5sum] = "8a8b312d21eed54912a0357df1c4f1ec"
SRC_URI[sha256sum] = "de5e0ee8491db19c4483936499d6130757336b8d82de2c929781cdc684853efa"
SRC_URI += "file://0001-kstyle-add-an-option-BUILD_OXYGEN_SETTINGS-disabled-.patch"
PACKAGECONFIG ??= ""
PACKAGECONFIG[settings] = "-DBUILD_OXYGEN_SETTINGS=ON,-DBUILD_OXYGEN_SETTINGS=OFF,kcmutils"
FILES_${PN} += " \
${datadir}/icons \