From 15d3b8fd8d745b126d39cffba3ba87aeda842d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 8 May 2015 11:09:25 +0200 Subject: [PATCH] add pss MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...o-create-uninstall-target-only-if-no.patch | 50 +++++++++++++++++++ recipes-pss/pss/pss.bb | 39 +++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 recipes-pss/pss/files/0001-CMakeLists.txt-do-create-uninstall-target-only-if-no.patch create mode 100644 recipes-pss/pss/pss.bb diff --git a/recipes-pss/pss/files/0001-CMakeLists.txt-do-create-uninstall-target-only-if-no.patch b/recipes-pss/pss/files/0001-CMakeLists.txt-do-create-uninstall-target-only-if-no.patch new file mode 100644 index 00000000..5df6af49 --- /dev/null +++ b/recipes-pss/pss/files/0001-CMakeLists.txt-do-create-uninstall-target-only-if-no.patch @@ -0,0 +1,50 @@ +From c473f9dc0bd1c28e2fb1bb7206b6506826c9dfaa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 8 May 2015 10:50:35 +0200 +Subject: [PATCH] CMakeLists.txt: do create uninstall target only if not yet + created +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +later versions of ECM create unsinstall target by default and cmake +failes with: + +| CMake Error at CMakeLists.txt:39 (add_custom_target): +| add_custom_target cannot create target "uninstall" because another target +| with the same name already exists. The existing target is a custom target +| created in source directory +| "...". +| See documentation for policy CMP0002 for more details. + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f43444b..5a53f0e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,11 +32,13 @@ include(KDECompilerSettings) + include(FeatureSummary) + + # Add custom uninstall target +-configure_file( +- "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" +- "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" +- IMMEDIATE @ONLY) +-add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") ++if (NOT TARGET uninstall) ++ configure_file( ++ "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" ++ IMMEDIATE @ONLY) ++ add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") ++endif() + + # Set up packaging + set(CPACK_PACKAGE_NAME "pss") +-- +1.9.3 + diff --git a/recipes-pss/pss/pss.bb b/recipes-pss/pss/pss.bb new file mode 100644 index 00000000..993e85b2 --- /dev/null +++ b/recipes-pss/pss/pss.bb @@ -0,0 +1,39 @@ +SUMMARY = "Plasma Simple Shell" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4b54a1fd55a448865a0b32d41598759d \ +" + +inherit hawaii pythonnative + +DEPENDS += " \ + plasma-framework \ + plasma-workspace \ + ki18n \ + kdelibs4support \ + krunner \ + kservice \ + solid \ +" + +SRC_URI = " \ + git://github.com/plasma-simple-shell/${BPN}.git \ + file://0001-CMakeLists.txt-do-create-uninstall-target-only-if-no.patch \ +" +SRCREV = "9789d63a55e2ca74a70029574a6fe1a1dd94cbc2" +PV = "0.5.90+git${SRCPV}" + +S = "${WORKDIR}/git" + +FILES_${PN} += " \ + ${datadir}/sddm \ + ${datadir}/desktop-directories \ + ${datadir}/kservices5 \ + ${datadir}/plasma \ + ${OE_QMAKE_PATH_QML}/org/pss \ +" + +FILES_${PN}-dbg += " \ + ${OE_QMAKE_PATH_QML}/*/*/*/*/.debug \ +"