koko: fix build

To succesfully build koko some external files need to be placed in
src/. This patch adds the needed files to SRC_URI.

Also, add a patch to fix the "Could NOT find
org.kde.kquickimageeditor-QMLModule" message. A merge request has been
sent and is currently waiting approval.

Signed-off-by: Marc Ferland <marc.ferland@sonatest.com>
This commit is contained in:
Marc Ferland
2024-07-26 14:24:52 -04:00
parent df0e08c9e6
commit cb285771ef
3 changed files with 60 additions and 1 deletions

View File

@@ -32,3 +32,27 @@ RDEPENDS:${PN} += " \
purpose \
kirigami \
"
KOKO_CITIES1000="cities1000.zip"
KOKO_ADMIN1CODES="admin1CodesASCII.txt"
KOKO_ADMIN2CODES="admin2Codes.txt"
SRC_URI += "http://download.geonames.org/export/dump/${KOKO_CITIES1000};name=cities1000;unpack=0 \
http://download.geonames.org/export/dump/${KOKO_ADMIN1CODES};name=admin1Codes \
http://download.geonames.org/export/dump/${KOKO_ADMIN2CODES};name=admin2Codes \
file://0001-Fix-org.kde.kquickimageeditor-dependency.patch \
"
SRC_URI[cities1000.sha256sum] = "9fff9632d97a9ec05beddcf8764be6df43b16dfa2625bd4fe1bb3dc39cbe15a7"
SRC_URI[admin1Codes.sha256sum] = "499a7be16c4e91ebac33850c1af1d7baa1d055d5b95e6256f45e4bf2899b0987"
SRC_URI[admin2Codes.sha256sum] = "08cd19d53ee962b060710e35ed6e753c180c4260acb5ffe13c8e2feacde94432"
# To build Koko, it is required to import a few files from outside
# this repository. These files are licensed under the CC-BY-4.0 and
# are maintained by the GeoNames project. These files need to be
# copied to the src directory. CMake will take care of the rest.
do_configure:prepend() {
cp ${WORKDIR}/${KOKO_CITIES1000} ${S}/src
cp ${WORKDIR}/${KOKO_ADMIN1CODES} ${S}/src
cp ${WORKDIR}/${KOKO_ADMIN2CODES} ${S}/src
}

View File

@@ -0,0 +1,35 @@
From e42f8eb9e1119d579382a5fd265eca4f2cbeefe6 Mon Sep 17 00:00:00 2001
From: Marc Ferland <marc.ferland@sonatest.com>
Date: Fri, 26 Jul 2024 13:49:26 -0400
Subject: [PATCH] Fix org.kde.kquickimageeditor dependency
I noticed the following build message during a Yocto build:
| -- Could NOT find org.kde.kquickimageeditor-QMLModule (missing: org.kde.kquickimageeditor-QMLModule_FOUND) (found version "0.3.0")
since the version is optional for Qt6 builds, remove the 'version'
argument.
Upstream-Status: Submitted [https://invent.kde.org/graphics/koko/-/merge_requests/142]
Signed-off-by: Marc Ferland <marc.ferland@sonatest.com>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f4bac6..2a33335 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS I18n Declarative Config C
find_package(LibExiv2 0.21 REQUIRED)
-ecm_find_qmlmodule(org.kde.kquickimageeditor 1.0)
+ecm_find_qmlmodule(org.kde.kquickimageeditor)
find_package(KQuickImageEditor COMPONENTS)
set_package_properties(KQuickImageEditor PROPERTIES
TYPE REQUIRED
--
2.34.1

View File

@@ -2,5 +2,5 @@
# SPDX-License-Identifier: CC0-1.0
require ${PN}.inc
SRC_URI = "https://download.kde.org/stable/release-service/24.05.0/src/koko-24.05.0.tar.xz"
SRC_URI += "https://download.kde.org/stable/release-service/24.05.0/src/koko-24.05.0.tar.xz"
SRC_URI[sha256sum] = "80379b51d1c3eb5becde1d03263c24fcae98d4d2e88b8b6d057ca9cfeb10a9b9"