From 9c369922ac81dc872d5960a6160aba57bf7e6d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 5 Dec 2019 17:28:20 +0100 Subject: [PATCH] kdb: fix build for python3 only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../kdb/0001-Do-not-rely-on-python2.patch | 31 +++++++++++++++++++ recipes-kde/apps/calligra/kdb_3.2.0.bb | 5 ++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 recipes-kde/apps/calligra/kdb/0001-Do-not-rely-on-python2.patch diff --git a/recipes-kde/apps/calligra/kdb/0001-Do-not-rely-on-python2.patch b/recipes-kde/apps/calligra/kdb/0001-Do-not-rely-on-python2.patch new file mode 100644 index 00000000..4320d880 --- /dev/null +++ b/recipes-kde/apps/calligra/kdb/0001-Do-not-rely-on-python2.patch @@ -0,0 +1,31 @@ +From ac4229126c5e11c21db757565597b5c4ccde062a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 5 Dec 2019 17:23:36 +0100 +Subject: [PATCH] Do not rely on python2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + cmake/modules/KDbCreateSharedDataClasses.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/modules/KDbCreateSharedDataClasses.cmake b/cmake/modules/KDbCreateSharedDataClasses.cmake +index dc5101d..b764cb3 100644 +--- a/cmake/modules/KDbCreateSharedDataClasses.cmake ++++ b/cmake/modules/KDbCreateSharedDataClasses.cmake +@@ -23,7 +23,7 @@ macro(KDB_CREATE_SHARED_DATA_CLASSES) + list(GET _args 1 PREFIX) + list(REMOVE_AT _args 0 1) + # message(STATUS "OUTPUT_VAR: ${OUTPUT_VAR} ${_args}") +- find_package(PythonInterp 2.6) ++ find_package(PythonInterp) + set_package_properties(PythonInterp PROPERTIES DESCRIPTION "Python language interpreter" + URL "https://www.python.org" TYPE REQUIRED + PURPOSE "Required by the Shared Data Classes (SDC) tool") +-- +2.21.0 + diff --git a/recipes-kde/apps/calligra/kdb_3.2.0.bb b/recipes-kde/apps/calligra/kdb_3.2.0.bb index b647159c..425165a9 100644 --- a/recipes-kde/apps/calligra/kdb_3.2.0.bb +++ b/recipes-kde/apps/calligra/kdb_3.2.0.bb @@ -15,7 +15,10 @@ DEPENDS += " \ kcoreaddons \ " -SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz" +SRC_URI = " \ + ${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \ + file://0001-Do-not-rely-on-python2.patch \ +" SRC_URI[md5sum] = "78f66c9b8f9d1e61d421eea7ce5241c7" SRC_URI[sha256sum] = "8f8983bc8d143832dc14bc2003ba6af1af27688e477c0c791fd61445464f2069"