From a4c074d09f7c84aa15fe44aed5714ef9d2fc542c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 22 Jun 2020 21:40:39 +0200 Subject: [PATCH] oxygen: remove very old workaround for machines not building kdeclarative MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...tion-BUILD_OXYGEN_SETTINGS-disabled-.patch | 43 ------------------- recipes-kde/plasma/untier/oxygen/oxygen.bb | 1 - 2 files changed, 44 deletions(-) delete mode 100644 recipes-kde/plasma/untier/oxygen/files/0001-kstyle-add-an-option-BUILD_OXYGEN_SETTINGS-disabled-.patch diff --git a/recipes-kde/plasma/untier/oxygen/files/0001-kstyle-add-an-option-BUILD_OXYGEN_SETTINGS-disabled-.patch b/recipes-kde/plasma/untier/oxygen/files/0001-kstyle-add-an-option-BUILD_OXYGEN_SETTINGS-disabled-.patch deleted file mode 100644 index 3f5da827..00000000 --- a/recipes-kde/plasma/untier/oxygen/files/0001-kstyle-add-an-option-BUILD_OXYGEN_SETTINGS-disabled-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 70183d51ee4fe116ffac2c7ef5f2b28e47a68b0a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -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 ---- - 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 - diff --git a/recipes-kde/plasma/untier/oxygen/oxygen.bb b/recipes-kde/plasma/untier/oxygen/oxygen.bb index 409c5ee7..850f09d0 100644 --- a/recipes-kde/plasma/untier/oxygen/oxygen.bb +++ b/recipes-kde/plasma/untier/oxygen/oxygen.bb @@ -27,7 +27,6 @@ DEPENDS += " \ PV = "${PLASMA_VERSION}" SRC_URI[md5sum] = "5bb3e172c4f514efa5598fd8e0d942d6" SRC_URI[sha256sum] = "0fd50db0d08ecf7d04a1cc0740f41cb8e6fc56cb904d5daec644648f7e69aae6" -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"