diff --git a/kde-apps/eventviews/eventviews-22.04.3.recipe b/kde-apps/eventviews/eventviews-23.08.5.recipe similarity index 70% rename from kde-apps/eventviews/eventviews-22.04.3.recipe rename to kde-apps/eventviews/eventviews-23.08.5.recipe index cc066e7cc..e095ec743 100644 --- a/kde-apps/eventviews/eventviews-22.04.3.recipe +++ b/kde-apps/eventviews/eventviews-23.08.5.recipe @@ -1,35 +1,29 @@ SUMMARY="Calendar viewer for KDE PIM" DESCRIPTION="Library for creating events." -HOMEPAGE="https://kontact.kde.org/" +HOMEPAGE="https://invent.kde.org/pim/eventviews" COPYRIGHT="2010-2022 KDE Organisation" -LICENSE="BSD (3-clause) - CC0 v1.0 - GNU GPL v2 - GNU LGPL v2 - Qt-Commercial-exception-1.0" +LICENSE="GNU GPL v2 + GNU LGPL v2.1" REVISION="1" -SOURCE_URI="https://download.kde.org/Attic/release-service/$portVersion/src/eventviews-$portVersion.tar.xz" -CHECKSUM_SHA256="99d52b4933d6a8303989e0b92d58bf55a552f461ab0207a583fd35b95d99868c" +SOURCE_URI="$HOMEPAGE/-/archive/v$portVersion/eventviews-v$portVersion.tar.bz2" +CHECKSUM_SHA256="6fb61891117393bded16e9aa5e307b94322bad6275ee8d4aa980f13349ec0db0" +SOURCE_DIR="eventviews-v$portVersion" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="5.20.3" +libVersion="5.24.5" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" eventviews$secondaryArchSuffix = $portVersion - lib:libKF5EventViews$secondaryArchSuffix = $libVersionCompat + lib:libKPim5EventViews$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix - lib:libKF5AkonadiCalendar$secondaryArchSuffix - lib:libKF5AkonadiCore$secondaryArchSuffix - lib:libKF5AkonadiWidgets$secondaryArchSuffix + # KF5 lib:libKF5Auth$secondaryArchSuffix lib:libKF5CalendarCore$secondaryArchSuffix - lib:libKF5CalendarSupport$secondaryArchSuffix - lib:libKF5CalendarUtils$secondaryArchSuffix lib:libKF5Codecs$secondaryArchSuffix lib:libKF5Completion$secondaryArchSuffix lib:libKF5ConfigCore$secondaryArchSuffix @@ -41,13 +35,19 @@ REQUIRES=" lib:libKF5Holidays$secondaryArchSuffix lib:libKF5I18n$secondaryArchSuffix lib:libKF5IconThemes$secondaryArchSuffix - lib:libKF5IdentityManagement$secondaryArchSuffix lib:libKF5ItemModels$secondaryArchSuffix - lib:libKF5libkdepim$secondaryArchSuffix - lib:libKF5Mime$secondaryArchSuffix lib:libKF5Service$secondaryArchSuffix lib:libKF5WidgetsAddons$secondaryArchSuffix lib:libKGantt$secondaryArchSuffix + # KPim5 + lib:libKPim5AkonadiCalendar$secondaryArchSuffix + lib:libKPim5AkonadiCore$secondaryArchSuffix + lib:libKPim5CalendarSupport$secondaryArchSuffix + lib:libKPim5CalendarUtils$secondaryArchSuffix + lib:libKPim5IdentityManagement$secondaryArchSuffix + lib:libKPim5Libkdepim$secondaryArchSuffix + lib:libKPim5Mime$secondaryArchSuffix + # Qt5 lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix @@ -56,7 +56,7 @@ REQUIRES=" PROVIDES_devel=" eventviews${secondaryArchSuffix}_devel = $portVersion - devel:libKF5EventViews$secondaryArchSuffix = $libVersionCompat + devel:libKPim5EventViews$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" eventviews$secondaryArchSuffix == $portVersion base @@ -64,14 +64,11 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + # KF5 extra_cmake_modules$secondaryArchSuffix >= 5.93.0 - devel:libKF5AkonadiCalendar$secondaryArchSuffix - devel:libKF5AkonadiCore$secondaryArchSuffix devel:libKF5Auth$secondaryArchSuffix devel:libKF5Bookmarks$secondaryArchSuffix devel:libKF5CalendarCore$secondaryArchSuffix - devel:libKF5CalendarSupport$secondaryArchSuffix - devel:libKF5CalendarUtils$secondaryArchSuffix devel:libKF5Codecs$secondaryArchSuffix devel:libKF5Completion$secondaryArchSuffix devel:libKF5ConfigCore$secondaryArchSuffix @@ -82,14 +79,10 @@ BUILD_REQUIRES=" devel:libKF5Holidays$secondaryArchSuffix devel:libKF5I18n$secondaryArchSuffix devel:libKF5IconThemes$secondaryArchSuffix - devel:libKF5IdentityManagement$secondaryArchSuffix devel:libKF5ItemModels$secondaryArchSuffix devel:libKF5ItemViews$secondaryArchSuffix devel:libKF5JobWidgets$secondaryArchSuffix devel:libKF5KIOCore$secondaryArchSuffix - devel:libKF5libkdepim$secondaryArchSuffix - devel:libKF5Mime$secondaryArchSuffix - devel:libKF5PimTextEdit$secondaryArchSuffix devel:libKF5Service$secondaryArchSuffix devel:libKF5Solid$secondaryArchSuffix devel:libKF5SonnetCore$secondaryArchSuffix @@ -98,6 +91,16 @@ BUILD_REQUIRES=" devel:libKF5WindowSystem$secondaryArchSuffix devel:libKF5XmlGui$secondaryArchSuffix devel:libKGantt$secondaryArchSuffix + # KPim5 + devel:libKPim5AkonadiCalendar$secondaryArchSuffix + devel:libKPim5AkonadiCore$secondaryArchSuffix + devel:libKPim5CalendarSupport$secondaryArchSuffix + devel:libKPim5CalendarUtils$secondaryArchSuffix + devel:libKPim5IdentityManagement$secondaryArchSuffix + devel:libKPim5Libkdepim$secondaryArchSuffix + devel:libKPim5Mime$secondaryArchSuffix + devel:libKPim5TextEdit$secondaryArchSuffix + # Qt5 devel:libQt5Core$secondaryArchSuffix devel:libQt5DBus$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix @@ -115,6 +118,10 @@ BUILD_PREREQUIRES=" cmd:qdbuscpp2xml$secondaryArchSuffix >= 5 " +TEST_REQUIRES=" + qthaikuplugins$secondaryArchSuffix + " + PATCH() { sed -e '/platforms:/ a \ \ \ \ - name: Haiku' -i $sourceDir/metainfo.yaml @@ -124,8 +131,6 @@ BUILD() { cmake -Bbuild -S. $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=Release \ - -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \ - -DKDE_INSTALL_QMLDIR=$dataDir/Qt5/qml \ -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake make -C build $jobArgs @@ -136,10 +141,16 @@ INSTALL() make -C build install prepareInstalledDevelLib \ - libKF5EventViews + libKPim5EventViews packageEntries devel \ - $libDir/cmake \ - $dataDir/Qt5/mkspecs \ - $developDir + $developDir \ + $dataDir/Qt5 \ + $libDir/cmake +} + +TEST() +{ + export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" + make -C build test }