From 20f86ed5db61acc036626df16fd55a92e6369e75 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 10 Sep 2024 19:31:17 +0200 Subject: [PATCH] itinerary, add KF6 package (#11092) --- kde-apps/itinerary/itinerary24-24.08.0.recipe | 174 ++++++++++++++++++ .../patches/itinerary24-24.08.0.patchset | 24 +++ 2 files changed, 198 insertions(+) create mode 100644 kde-apps/itinerary/itinerary24-24.08.0.recipe create mode 100644 kde-apps/itinerary/patches/itinerary24-24.08.0.patchset diff --git a/kde-apps/itinerary/itinerary24-24.08.0.recipe b/kde-apps/itinerary/itinerary24-24.08.0.recipe new file mode 100644 index 000000000..d084d163c --- /dev/null +++ b/kde-apps/itinerary/itinerary24-24.08.0.recipe @@ -0,0 +1,174 @@ +SUMMARY="A boarding pass management application" +DESCRIPTION="A digital travel assistant that supports you while traveling without compromising \ +your privacy." +HOMEPAGE="https://invent.kde.org/pim/itinerary" +COPYRIGHT="2010-2024 KDE Organisation" +LICENSE="GNU LGPL v2" +REVISION="1" +SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/itinerary-$portVersion.tar.xz" +CHECKSUM_SHA256="166864fb078f4e83739b3672a824efba50b87e08e366f7c4edf94555f54d0435" +SOURCE_DIR="itinerary-$portVersion" +PATCHES="itinerary24-$portVersion.patchset" +ADDITIONAL_FILES="itinerary.rdef.in" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + itinerary24$secondaryArchSuffix = $portVersion + cmd:itinerary$secondaryArchSuffix = $portVersion + lib:libSolidExtras$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + kirigami_addons1$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libKHealthCertificate$secondaryArchSuffix + lib:libKOpeningHours$secondaryArchSuffix + lib:libKOSM$secondaryArchSuffix + lib:libKOSMIndoorMap$secondaryArchSuffix + lib:libKPublicTransport$secondaryArchSuffix + lib:libolm$secondaryArchSuffix + lib:libQt6Keychain$secondaryArchSuffix + lib:libQuotientQt6$secondaryArchSuffix + lib:libz$secondaryArchSuffix + # KF 6 + lib:libKF6CalendarCore$secondaryArchSuffix + lib:libKF6Contacts$secondaryArchSuffix + lib:libKF6CoreAddons$secondaryArchSuffix + lib:libKF6Crash$secondaryArchSuffix + lib:libKF6DbusAddons$secondaryArchSuffix + lib:libKF6Holidays$secondaryArchSuffix + lib:libKF6I18n$secondaryArchSuffix + lib:libKF6Notifications$secondaryArchSuffix + lib:libKF6UnitConversion$secondaryArchSuffix + lib:libKF6WindowSystem$secondaryArchSuffix + # KPim6 + lib:libKPim6Itinerary$secondaryArchSuffix + lib:libKPim6Mime$secondaryArchSuffix + lib:libKPim6PkPass$secondaryArchSuffix + # Qt6 + lib:libQt6Core$secondaryArchSuffix + lib:libQt6DBus$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix + lib:libQt6Location$secondaryArchSuffix + lib:libQt6Multimedia$secondaryArchSuffix + lib:libQt6Network$secondaryArchSuffix + lib:libQt6Positioning$secondaryArchSuffix + lib:libQt6Qml$secondaryArchSuffix + lib:libQt6Quick$secondaryArchSuffix + lib:libQt6Widgets$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + shared_mime_info$secondaryArchSuffix + kirigami_addons1${secondaryArchSuffix}_devel + devel:libical$secondaryArchSuffix + devel:libKHealthCertificate$secondaryArchSuffix + devel:libKOpeningHours$secondaryArchSuffix + devel:libKOSMIndoorMap$secondaryArchSuffix + devel:libKPublicTransport$secondaryArchSuffix + devel:libolm$secondaryArchSuffix + devel:libQuotientQt6$secondaryArchSuffix + devel:libssl$secondaryArchSuffix >= 3 + devel:libz$secondaryArchSuffix + # KF 6 + extra_cmake_modules$secondaryArchSuffix + qqc2_desktop_style6${secondaryArchSuffix}_devel + devel:libKF6Archive$secondaryArchSuffix + devel:libKF6AuthCore$secondaryArchSuffix + devel:libKF6Bookmarks$secondaryArchSuffix + devel:libKF6CalendarCore$secondaryArchSuffix + devel:libKF6Codecs$secondaryArchSuffix + devel:libKF6Completion$secondaryArchSuffix + devel:libKF6ConfigCore$secondaryArchSuffix + devel:libKF6ConfigWidgets$secondaryArchSuffix + devel:libKF6Contacts$secondaryArchSuffix + devel:libKF6CoreAddons$secondaryArchSuffix + devel:libKF6Crash$secondaryArchSuffix + devel:libKF6DbusAddons$secondaryArchSuffix + devel:libKF6FileMetaData$secondaryArchSuffix + devel:libKF6Holidays$secondaryArchSuffix + devel:libKF6I18n$secondaryArchSuffix + devel:libKF6ItemModels$secondaryArchSuffix + devel:libKF6ItemViews$secondaryArchSuffix + devel:libKF6JobWidgets$secondaryArchSuffix + devel:libKF6KIOCore$secondaryArchSuffix + devel:libKF6Notifications$secondaryArchSuffix + devel:libKF6Prison$secondaryArchSuffix + devel:libKF6PrisonScanner$secondaryArchSuffix + devel:libKF6Service$secondaryArchSuffix + devel:libKF6Solid$secondaryArchSuffix + devel:libKF6UnitConversion$secondaryArchSuffix + devel:libKF6WidgetsAddons$secondaryArchSuffix + devel:libKF6WindowSystem$secondaryArchSuffix + devel:libKF6XmlGui$secondaryArchSuffix + # KPim6 + devel:libKPim6Itinerary$secondaryArchSuffix + devel:libKPim6Mime$secondaryArchSuffix + devel:libKPim6PkPass$secondaryArchSuffix + # Qt6 + devel:libQt6Core$secondaryArchSuffix + devel:libQt6DBus$secondaryArchSuffix + devel:libQt6Location$secondaryArchSuffix + devel:libQt6Positioning$secondaryArchSuffix + devel:libQt6Qml$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:g++$secondaryArchSuffix + cmd:git + cmd:make + cmd:msgfmt + cmd:msgmerge + cmd:pkg_config$secondaryArchSuffix + " + +TEST_REQUIRES=" + qthaikuplugins$secondaryArchSuffix + " + +BUILD() +{ + cmake -Bbuild -S. $cmakeDirArgs \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ + -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DBUILD_TESTING=OFF + make -C build $jobArgs +} + +INSTALL() +{ + make -C build install + + # cleanup + rm -rf $dataDir/{applications,metainfo} + + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local APP_NAME="Itinerary" + local LONG_INFO="$SUMMARY" + local APP_SIGNATURE="application/x-vnd.itinerary" + sed \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + -e "s|@LONG_INFO@|$LONG_INFO|" \ + -e "s|@APP_NAME@|$APP_NAME|" \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ + $portDir/additional-files/itinerary.rdef.in > itinerary.rdef + + addResourcesToBinaries itinerary.rdef $binDir/itinerary + addAppDeskbarSymlink $binDir/itinerary Itinerary +} + +TEST() +{ +# 53% tests passed, 15 tests failed out of 32 + export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" + ctest --test-dir build --output-on-failure -E "(tripgroup|timelinemodel)test" +} diff --git a/kde-apps/itinerary/patches/itinerary24-24.08.0.patchset b/kde-apps/itinerary/patches/itinerary24-24.08.0.patchset new file mode 100644 index 000000000..ab76b3ed0 --- /dev/null +++ b/kde-apps/itinerary/patches/itinerary24-24.08.0.patchset @@ -0,0 +1,24 @@ +From e582529dea3d2c6405b9d8efd1af91deeec5fca5 Mon Sep 17 00:00:00 2001 +From: Schrijvers Luc +Date: Sat, 27 Jul 2024 14:06:42 +0200 +Subject: Build fix (error on finding required qml modules) + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fe8ed82..cb8bcf3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -89,8 +89,8 @@ ecm_find_qmlmodule(QtPositioning 6.0) + ecm_find_qmlmodule(org.kde.kitemmodels 5.245) + ecm_find_qmlmodule(org.kde.prison 5.245) + ecm_find_qmlmodule(org.kde.prison.scanner 5.245) +-ecm_find_qmlmodule(org.kde.kosmindoormap 24.02 REQUIRED) +-ecm_find_qmlmodule(org.kde.kopeninghours 24.02 REQUIRED) ++# ecm_find_qmlmodule(org.kde.kosmindoormap 24.02 REQUIRED) ++# ecm_find_qmlmodule(org.kde.kopeninghours 24.02 REQUIRED) + + # runtime dependencies are build-time dependencies on Android + if (ANDROID) +-- +2.45.2 +