From 2617ec0f9679365abcc6e725367591ef3247ff70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 17 Sep 2015 01:39:23 +0200 Subject: [PATCH] marble: initial add 15.08 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../0001-align-path-of-designer-plugins.patch | 31 +++++++++ recipes-kde/apps/marble/marble.bb | 64 +++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 recipes-kde/apps/marble/files/0001-align-path-of-designer-plugins.patch create mode 100644 recipes-kde/apps/marble/marble.bb diff --git a/recipes-kde/apps/marble/files/0001-align-path-of-designer-plugins.patch b/recipes-kde/apps/marble/files/0001-align-path-of-designer-plugins.patch new file mode 100644 index 00000000..7a09b5e2 --- /dev/null +++ b/recipes-kde/apps/marble/files/0001-align-path-of-designer-plugins.patch @@ -0,0 +1,31 @@ +From 51a1a623dbdeac52b0afd383189e509f6b61df9e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 16 Sep 2015 15:20:30 +0200 +Subject: [PATCH] align path of designer plugins +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 68b3d78..57c4792 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -197,7 +197,7 @@ add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget suppo + set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) + set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Base directory for executables and libraries" FORCE) + if (QT5BUILD) +- set(QT_PLUGINS_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/plugins) ++ set(QT_PLUGINS_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qt5/plugins) + endif() + + #################################################### +-- +2.1.0 + diff --git a/recipes-kde/apps/marble/marble.bb b/recipes-kde/apps/marble/marble.bb new file mode 100644 index 00000000..3e6c505f --- /dev/null +++ b/recipes-kde/apps/marble/marble.bb @@ -0,0 +1,64 @@ +SUMMARY = "Marble is a Virtual Globe and World Atlas" +LICENSE = "GPLv3 & GFDL-1.2 & LGPLv2 & MIT" +LIC_FILES_CHKSUM = " \ + file://LICENSE.GPL-3;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ + file://LICENSE.txt;md5=e9b5891877660f283be4bc396de0570f \ + file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1 \ + file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \ +" + +inherit kde-apps + +DEPENDS += " \ + qtsvg \ + qtwebkit \ + \ + kconfig \ + krunner \ + kservice \ + ki18n \ + kio \ + knewstuff \ + kwallet \ + kparts \ + kcoreaddons \ + kparts \ + plasma-framework \ + kdoctools \ +" + +PV = "${KDE_APP_VERSION}" +SRC_URI[md5sum] = "26bdda01bfa6b1012ff1ae5832facf16" +SRC_URI[sha256sum] = "3db6f9c8eb27c2add498797cb676e446b9fd1f470bac94b1353b4a3062ea4ba7" +SRC_URI += "file://0001-align-path-of-designer-plugins.patch" + +PACKAGES =+ " \ + ${PN}-mobile ${PN}-qt ${PN}-touch \ + ${PN}-designer-plugin-dbg ${PN}-designer-plugin \ +" + +FILES_${PN}-mobile = "${bindir}/${BPN}-mobile" +FILES_${PN}-qt = "${bindir}/${BPN}-qt" +FILES_${PN}-touch = "${bindir}/${BPN}-touch" + +FILES_${PN} += " \ + ${datadir}/config.kcfg \ + ${datadir}/icons \ + ${datadir}/k*5 \ + ${datadir}/appdata \ + ${OE_QMAKE_PATH_PLUGINS} \ +" + +FILES_${PN}-dbg += " \ + ${libdir}/marble/plugins/.debug \ + ${libdir}/marble/plugins/org/kde/edu/marble/.debug \ + ${OE_QMAKE_PATH_PLUGINS}/.debug \ +" + +FILES_${PN}-designer-plugin += " \ + ${OE_QMAKE_PATH_PLUGINS}/designer \ +" + +FILES_${PN}-designer-plugin-dbg += " \ + ${OE_QMAKE_PATH_PLUGINS}/designer/.debug \ +"