From 2cbf532aab0e191c5279a4ec5311cb3035499897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 19 Jun 2018 01:10:04 +0200 Subject: [PATCH] kexi: initial add 3.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...-by-try_compile-in-breeze-icon-check.patch | 48 +++++++++++++++ recipes-kde/apps/calligra/kexi_3.1.0.bb | 60 +++++++++++++++++++ recipes-kde/packagegroups/kde-apps.bb | 1 + 3 files changed, 109 insertions(+) create mode 100644 recipes-kde/apps/calligra/kexi/0001-replace-try_run-by-try_compile-in-breeze-icon-check.patch create mode 100644 recipes-kde/apps/calligra/kexi_3.1.0.bb diff --git a/recipes-kde/apps/calligra/kexi/0001-replace-try_run-by-try_compile-in-breeze-icon-check.patch b/recipes-kde/apps/calligra/kexi/0001-replace-try_run-by-try_compile-in-breeze-icon-check.patch new file mode 100644 index 00000000..ce76d499 --- /dev/null +++ b/recipes-kde/apps/calligra/kexi/0001-replace-try_run-by-try_compile-in-breeze-icon-check.patch @@ -0,0 +1,48 @@ +From 11f1c4adc5141a66552f6862d943c7af3c8972b3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 18 Jun 2018 23:31:15 +0200 +Subject: [PATCH] replace try_run by try_compile in breeze-icon-check +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +try_run does not work in cross environments + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller +--- + cmake/modules/CheckGlobalBreezeIcons.cmake | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/cmake/modules/CheckGlobalBreezeIcons.cmake b/cmake/modules/CheckGlobalBreezeIcons.cmake +index 9763213..46a218a 100644 +--- a/cmake/modules/CheckGlobalBreezeIcons.cmake ++++ b/cmake/modules/CheckGlobalBreezeIcons.cmake +@@ -24,21 +24,14 @@ else() + set(CheckGlobalBreezeIcons_libs Qt5::Xml) + endif() + +-try_run(RUN_RESULT COMPILE_OK ++try_compile(COMPILE_OK + ${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp + ${CMAKE_SOURCE_DIR}/cmake/modules/CheckGlobalBreezeIcons.cpp + COMPILE_DEFINITIONS ${CheckGlobalBreezeIcons_defs} + LINK_LIBRARIES ${CheckGlobalBreezeIcons_libs} + CMAKE_FLAGS ${CheckGlobalBreezeIcons_flags} +- COMPILE_OUTPUT_VARIABLE COMPILE_OUTPUT +- RUN_OUTPUT_VARIABLE RUN_OUTPUT) ++ OUTPUT_VARIABLE COMPILE_OUTPUT) + + if(NOT COMPILE_OK) + message(FATAL_ERROR "${COMPILE_OUTPUT}") + endif() +- +-if(NOT ${RUN_RESULT} EQUAL 0) +- message(FATAL_ERROR "No valid breeze-icons.rcc resource file found. \ +-The CheckGlobalBreezeIcons.cmake script returned ${RUN_RESULT}.\n \ +-Result: ${RUN_OUTPUT}") +-endif() +-- +2.14.3 + diff --git a/recipes-kde/apps/calligra/kexi_3.1.0.bb b/recipes-kde/apps/calligra/kexi_3.1.0.bb new file mode 100644 index 00000000..625ca91f --- /dev/null +++ b/recipes-kde/apps/calligra/kexi_3.1.0.bb @@ -0,0 +1,60 @@ +SUMMARY = "Kexi is a visual database applications creator" +HOMEPAGE = "https://www.calligra.org/kexi/" +LICENSE = "GPLv2 & LGPLv2 & GFDL-1.2 & BSD" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=8608b1f74c58ebcb11718f46e8619749 \ + file://COPYING.LIB;md5=7537f2f34ef162007ae9f34b9f256dcb \ + file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \ + file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \ +" + +inherit kde-apps gtk-icon-cache + +DEPENDS += " \ + qtwebkit \ + \ + kdb \ + kreport \ + \ + kauth-native \ + kconfig-native \ + kcoreaddons-native \ + kdoctools-native \ + breeze-icons \ + karchive \ + kcodecs \ + kconfigwidgets \ + kguiaddons \ + ki18n \ + kiconthemes \ + kitemviews \ + kwidgetsaddons \ + ktextwidgets \ + kxmlgui \ + kcompletion \ + kio \ + ktexteditor \ + marble \ +" + +SRC_URI = " \ + ${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \ + file://0001-replace-try_run-by-try_compile-in-breeze-icon-check.patch \ +" +SRC_URI[md5sum] = "22d6c4739109441f5274da584f67f1c8" +SRC_URI[sha256sum] = "6d55cd4af177bcb060673a0977d52bc91cc2dd1b1420d008a78f9783312152fb" + +FILES_${PN} += " \ + ${OE_QMAKE_PATH_PLUGINS} \ +" + +# REVISIT +#-- The following RECOMMENDED packages have not been found: +# +# * KexiMarble (required version >= 0.19.2), KDE World Globe Widget library, +# Required by Kexi form map widget +# * MySQL, MySQL Client Library (libmysqlclient), +# Required by Kexi MySQL migration driver +# * PostgreSQL, C API to PostgreSQL (libpq), +# Required by Kexi PostgreSQL migration driver + diff --git a/recipes-kde/packagegroups/kde-apps.bb b/recipes-kde/packagegroups/kde-apps.bb index 2b6d7bc4..218db015 100644 --- a/recipes-kde/packagegroups/kde-apps.bb +++ b/recipes-kde/packagegroups/kde-apps.bb @@ -17,6 +17,7 @@ RDEPENDS_${PN} = " \ kcolorchooser \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "kdenlive", "",d)} \ kdf \ + kexi \ khelpcenter \ kio-extras \ kmag \