diff --git a/kde-apps/itinerary/itinerary-24.12.0.recipe b/kde-apps/itinerary/itinerary-24.12.2.recipe similarity index 91% rename from kde-apps/itinerary/itinerary-24.12.0.recipe rename to kde-apps/itinerary/itinerary-24.12.2.recipe index eb2d684d6..c985ae910 100644 --- a/kde-apps/itinerary/itinerary-24.12.0.recipe +++ b/kde-apps/itinerary/itinerary-24.12.2.recipe @@ -2,11 +2,11 @@ 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" +COPYRIGHT="2010-2025 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="76bb36a2358a0333d6c16a79789a47e45b5edc566078a9c8918b7f897e052e8c" +CHECKSUM_SHA256="a139ffa1fdeb9b2b471b67fca89f7dda1d7c2343fd70df4220e64f45622fc7cd" PATCHES="itinerary-$portVersion.patchset" ADDITIONAL_FILES="itinerary.rdef.in" @@ -56,7 +56,7 @@ REQUIRES=" lib:libQt6DBus$secondaryArchSuffix lib:libQt6Gui$secondaryArchSuffix lib:libQt6Location$secondaryArchSuffix - lib:libQt6Multimedia$secondaryArchSuffix +# lib:libQt6Multimedia$secondaryArchSuffix lib:libQt6Network$secondaryArchSuffix lib:libQt6Positioning$secondaryArchSuffix lib:libQt6Qml$secondaryArchSuffix @@ -116,7 +116,10 @@ BUILD_REQUIRES=" # Qt6 devel:libQt6Core$secondaryArchSuffix devel:libQt6DBus$secondaryArchSuffix + devel:libQt6Gui$secondaryArchSuffix devel:libQt6Location$secondaryArchSuffix + devel:libQt6Multimedia$secondaryArchSuffix + devel:libQt6Network$secondaryArchSuffix devel:libQt6Positioning$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix " @@ -137,11 +140,14 @@ BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ + -DCMAKE_INSTALL_BINDIR=$appsDir \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ - -DBUILD_TESTING=OFF + -DBUILD_TESTING=OFF \ + -Wno-dev + make -C build $jobArgs } @@ -152,6 +158,8 @@ INSTALL() # cleanup rm -rf $dataDir/{applications,metainfo} + mv $appsDir/itinerary $appsDir/Itinerary + local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" local MINOR="`echo "$portVersion" | cut -d. -f3`" @@ -167,13 +175,13 @@ INSTALL() -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ $portDir/additional-files/itinerary.rdef.in > itinerary.rdef - addResourcesToBinaries itinerary.rdef $binDir/itinerary - addAppDeskbarSymlink $binDir/itinerary Itinerary + addResourcesToBinaries itinerary.rdef $appsDir/Itinerary + addAppDeskbarSymlink $appsDir/Itinerary } TEST() { -# 53% tests passed, 15 tests failed out of 32 +# 47% tests passed, 19 tests failed out of 36 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/itinerary-24.12.0.patchset b/kde-apps/itinerary/patches/itinerary-24.12.2.patchset similarity index 72% rename from kde-apps/itinerary/patches/itinerary-24.12.0.patchset rename to kde-apps/itinerary/patches/itinerary-24.12.2.patchset index 9a2de06dc..15921148a 100644 --- a/kde-apps/itinerary/patches/itinerary-24.12.0.patchset +++ b/kde-apps/itinerary/patches/itinerary-24.12.2.patchset @@ -1,16 +1,19 @@ -From 2997081f9917acd75fdb371bef8396db0be8b3f6 Mon Sep 17 00:00:00 2001 +From 2bbeaabbc58be06a47bea1e90af3b035ee8e83ad Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Fri, 20 Dec 2024 12:36:31 +0100 Subject: Build fix (error on finding required qml modules) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4c3e00b..f96baa2 100644 +index 0f63449..98aa3c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -78,11 +78,11 @@ include(ECMFindQmlModule) +@@ -76,13 +76,13 @@ set_package_properties(SeleniumWebDriverATSPI PROPERTIES PURPOSE "Needed for GUI + include(ECMFindQmlModule) + # TODO all of these should be required, but that doesn't work with Flatpak/Android yet... ecm_find_qmlmodule(QtLocation 6.0) - ecm_find_qmlmodule(QtMultimedia 6.0) +-ecm_find_qmlmodule(QtMultimedia 6.0) ++#ecm_find_qmlmodule(QtMultimedia 6.0) ecm_find_qmlmodule(QtPositioning 6.0) -ecm_find_qmlmodule(org.kde.kitemmodels ${KF_MIN_VERSION}) -ecm_find_qmlmodule(org.kde.prison ${KF_MIN_VERSION})