diff --git a/srcpkgs/calligra-plan/patches/tasklist.patch b/srcpkgs/calligra-plan/patches/tasklist.patch deleted file mode 100644 index 14b48a47ab3..00000000000 --- a/srcpkgs/calligra-plan/patches/tasklist.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/src/plugins/schedulers/tj/taskjuggler/TaskList.cpp -+++ b/src/plugins/schedulers/tj/taskjuggler/TaskList.cpp -@@ -146,17 +146,25 @@ TaskList::compareItemsLevel(CoreAttribut - case ResponsibleUp: - { - QString fn1; -- t1->responsible->getFullName(fn1); -+ if (t1->responsible) { -+ t1->responsible->getFullName(fn1); -+ } - QString fn2; -- t2->responsible->getFullName(fn2); -+ if (t2->responsible) { -+ t2->responsible->getFullName(fn2); -+ } - return fn1.compare(fn2); - } - case ResponsibleDown: - { - QString fn1; -- t1->responsible->getFullName(fn1); -+ if (t1->responsible) { -+ t1->responsible->getFullName(fn1); -+ } - QString fn2; -- t2->responsible->getFullName(fn2); -+ if (t2->responsible) { -+ t2->responsible->getFullName(fn2); -+ } - return -fn1.compare(fn2); - } - case CriticalnessUp: diff --git a/srcpkgs/calligra-plan/template b/srcpkgs/calligra-plan/template index 135ef17308d..4f00eda533f 100644 --- a/srcpkgs/calligra-plan/template +++ b/srcpkgs/calligra-plan/template @@ -1,31 +1,29 @@ # Template file for 'calligra-plan' pkgname=calligra-plan -version=3.3.0 -revision=3 +version=4.0.1 +revision=1 build_style=cmake -hostmakedepends="extra-cmake-modules gettext kdoctools" -makedepends="kinit-devel kcmutils-devel kdiagram-devel kholidays-devel - kparts-devel kactivities5-devel" +hostmakedepends="extra-cmake-modules gettext qt6-tools qt6-base + kf6-kconfig kf6-kdoctools" +makedepends="kf6-kcmutils-devel kdiagram6-devel kf6-kholidays-devel + kf6-kdbusaddons-devel kf6-kiconthemes-devel kf6-kparts-devel + kf6-kitemmodels-devel kf6-knotifications-devel kf6-sonnet-devel + kf6-ktextwidgets-devel kf6-threadweaver-devel kf6-kwallet-devel + plasma-activities-devel" short_desc="Project Management" maintainer="John " license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later" homepage="https://www.calligra.org/plan/" -distfiles="${KDE_SITE}/calligra/${version}/calligraplan-${version}.tar.xz" -checksum=9a97414f2207941a70d93ff096617365d35379cc93a09cfc19ee532d2905a9d8 +distfiles="${KDE_SITE}/calligraplan/calligraplan-${version}.tar.xz" +checksum=9267ea174c04466014343927f73757bb3047dab36a74fc8f38b891e8d8833a39 -if [ "$CROSS_BUILD" ];then - hostmakedepends+=" qt5-qmake qt5-host-tools python3 perl - calligra-plan-devtools kcoreaddons kconfig kparts" - configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" calligra-plan-devtools" fi -post_patch() { - sed -i '/find_package/i return()' src/libs/widgets/tests/CMakeLists.txt -} - calligra-plan-devtools_package() { short_desc+=" - devtools required for cross compilation" pkg_install() { - vbin build/devtools/rng2cpp/plan_rng2cpp + vbin build/bin/plan_rng2cpp } }