From 5002800717650066a545d0a0c6942b3b40f51acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 12 Jan 2022 15:33:00 +0700 Subject: [PATCH] kmymoney: fix build, use ninja --- srcpkgs/kmymoney/patches/akonadi-include.patch | 17 +++++++++++++++++ srcpkgs/kmymoney/template | 10 ++-------- 2 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/kmymoney/patches/akonadi-include.patch diff --git a/srcpkgs/kmymoney/patches/akonadi-include.patch b/srcpkgs/kmymoney/patches/akonadi-include.patch new file mode 100644 index 0000000000..d65932b984 --- /dev/null +++ b/srcpkgs/kmymoney/patches/akonadi-include.patch @@ -0,0 +1,17 @@ +Index: kmymoney-5.1.2/kmymoney/mymoney/mymoneycontact.cpp +=================================================================== +--- kmymoney-5.1.2.orig/kmymoney/mymoney/mymoneycontact.cpp ++++ kmymoney-5.1.2/kmymoney/mymoney/mymoneycontact.cpp +@@ -10,9 +10,9 @@ + #ifdef ENABLE_ADDRESSBOOK + #include + #include +-#include +-#include +-#include ++#include ++#include ++#include + #include + #include + #endif diff --git a/srcpkgs/kmymoney/template b/srcpkgs/kmymoney/template index 218ca869da..dd5372079e 100644 --- a/srcpkgs/kmymoney/template +++ b/srcpkgs/kmymoney/template @@ -5,14 +5,14 @@ revision=2 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson -DBUILD_TESTING=OFF" -make_cmd="make" hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools pkg-config python3 qt5-host-tools qt5-qmake gettext" makedepends="akonadi5-devel aqbanking-devel gmp-devel gmpxx-devel gpgmeqt-devel gwenhywfar-devel gwenhywfar-qt5 kactivities5-devel kcmutils-devel kcontacts-devel kdewebkit-devel kdiagram-devel kholidays-devel kidentitymanagement-devel kross-devel libalkimia-devel libical-devel - libofx-devel kio-devel kbookmarks-devel kwidgetsaddons-devel" + libofx-devel kio-devel kbookmarks-devel kwidgetsaddons-devel + akonadi5-devel" depends="shared-mime-info" short_desc="Personal finance manager" maintainer="Helmut Pozimski " @@ -21,12 +21,6 @@ homepage="https://kmymoney.org" distfiles="${KDE_SITE}/kmymoney/${version}/src/${pkgname}-${version}.tar.xz" checksum=37bdc4e763a2849b9f739f73e38b389c02bde1c1b1844edcfa7e3ab1d5bf7b3b -export CMAKE_GENERATOR="Unix Makefiles" - -if [ "$CROSS_BUILD" ]; then - configure_args+=" -DENABLE_LIBICAL=0" -fi - post_extract() { if [ "$CROSS_BUILD" ]; then vsed /find_package\(Libical\)/d -i CMakeLists.txt