From bda456332e195206860c6e3624685fd4b82fd657 Mon Sep 17 00:00:00 2001
From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
Date: Sat, 2 Jan 2021 17:05:16 +0100
Subject: [PATCH] Fix installation of marble-maps

Patch is upstreamed in:
https://invent.kde.org/education/marble/-/merge_requests/37
---
 recipes-application/edu/marble.inc            |  5 +++-
 ...e-maps-when-not-building-for-Android.patch | 30 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 recipes-application/edu/marble/0001-Install-marble-maps-when-not-building-for-Android.patch

diff --git a/recipes-application/edu/marble.inc b/recipes-application/edu/marble.inc
index cc218a3..a69e3bf 100644
--- a/recipes-application/edu/marble.inc
+++ b/recipes-application/edu/marble.inc
@@ -23,7 +23,10 @@ DEPENDS += " \
     qtserialport \
 "
 
-SRC_URI = "git://invent.kde.org/education/${BPN};nobranch=1;protocol=https"
+SRC_URI = " \
+    git://invent.kde.org/education/${BPN};nobranch=1;protocol=https \
+    file://0001-Install-marble-maps-when-not-building-for-Android.patch \
+"
 S = "${WORKDIR}/git"
 
 inherit cmake_kdeapp
diff --git a/recipes-application/edu/marble/0001-Install-marble-maps-when-not-building-for-Android.patch b/recipes-application/edu/marble/0001-Install-marble-maps-when-not-building-for-Android.patch
new file mode 100644
index 0000000..7552700
--- /dev/null
+++ b/recipes-application/edu/marble/0001-Install-marble-maps-when-not-building-for-Android.patch
@@ -0,0 +1,30 @@
+From 9d267247bb9817dbe251d051edd600d83b061da4 Mon Sep 17 00:00:00 2001
+From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
+Date: Sat, 2 Jan 2021 17:20:53 +0100
+Subject: [PATCH] Install marble-maps when not building for Android
+
+Otherwise the executable is getting missed during packaging.
+---
+ src/apps/marble-maps/CMakeLists.txt | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/apps/marble-maps/CMakeLists.txt b/src/apps/marble-maps/CMakeLists.txt
+index 3ecb48b4d..fcd4ae0b7 100644
+--- a/src/apps/marble-maps/CMakeLists.txt
++++ b/src/apps/marble-maps/CMakeLists.txt
+@@ -39,6 +39,9 @@ target_link_libraries (
+     marble-maps
+     marbledeclarative
+ )
+-
+-FILE(GLOB QML_FILES *.qml)
+-add_custom_target(marble-maps_resources ALL SOURCES ${QML_FILES} package/AndroidManifest.xml)
++if (ANDROID)
++    FILE(GLOB QML_FILES *.qml)
++    add_custom_target(marble-maps_resources ALL SOURCES ${QML_FILES} package/AndroidManifest.xml)
++else()
++    install(TARGETS marble-maps RUNTIME DESTINATION bin)
++endif()
+-- 
+2.27.0
+