From d9461c36ef28659fd05aa19938720627f6ffccf4 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Fri, 20 Dec 2024 13:10:36 +0100 Subject: [PATCH] itinerary, bump version (#11500) --- ...4.08.3.recipe => itinerary-24.12.0.recipe} | 15 +++++----- .../patches/itinerary-24.08.3.patchset | 24 --------------- .../patches/itinerary-24.12.0.patchset | 30 +++++++++++++++++++ 3 files changed, 37 insertions(+), 32 deletions(-) rename kde-apps/itinerary/{itinerary-24.08.3.recipe => itinerary-24.12.0.recipe} (94%) delete mode 100644 kde-apps/itinerary/patches/itinerary-24.08.3.patchset create mode 100644 kde-apps/itinerary/patches/itinerary-24.12.0.patchset diff --git a/kde-apps/itinerary/itinerary-24.08.3.recipe b/kde-apps/itinerary/itinerary-24.12.0.recipe similarity index 94% rename from kde-apps/itinerary/itinerary-24.08.3.recipe rename to kde-apps/itinerary/itinerary-24.12.0.recipe index 18905bd44..eb2d684d6 100644 --- a/kde-apps/itinerary/itinerary-24.08.3.recipe +++ b/kde-apps/itinerary/itinerary-24.12.0.recipe @@ -4,9 +4,9 @@ your privacy." HOMEPAGE="https://invent.kde.org/pim/itinerary" COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="3" +REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/itinerary-$portVersion.tar.xz" -CHECKSUM_SHA256="226f31c887eed3dc105f50295669c13ac018d1b27587a07228471c0d4913c75f" +CHECKSUM_SHA256="76bb36a2358a0333d6c16a79789a47e45b5edc566078a9c8918b7f897e052e8c" PATCHES="itinerary-$portVersion.patchset" ADDITIONAL_FILES="itinerary.rdef.in" @@ -20,9 +20,9 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - kirigami_addons1$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libKHealthCertificate$secondaryArchSuffix + lib:libKirigamiAddonsStatefulApp$secondaryArchSuffix lib:libKOpeningHours$secondaryArchSuffix lib:libKOSM$secondaryArchSuffix lib:libKOSMIndoorMap$secondaryArchSuffix @@ -67,9 +67,9 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel shared_mime_info$secondaryArchSuffix - kirigami_addons1${secondaryArchSuffix}_devel devel:libical$secondaryArchSuffix devel:libKHealthCertificate$secondaryArchSuffix + devel:libKirigamiAddonsStatefulApp$secondaryArchSuffix devel:libKOpeningHours$secondaryArchSuffix devel:libKOSMIndoorMap$secondaryArchSuffix devel:libKPublicTransport$secondaryArchSuffix @@ -123,10 +123,9 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix - cmd:git cmd:make - cmd:msgfmt - cmd:msgmerge + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix " @@ -136,7 +135,7 @@ TEST_REQUIRES=" BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ diff --git a/kde-apps/itinerary/patches/itinerary-24.08.3.patchset b/kde-apps/itinerary/patches/itinerary-24.08.3.patchset deleted file mode 100644 index ab76b3ed0..000000000 --- a/kde-apps/itinerary/patches/itinerary-24.08.3.patchset +++ /dev/null @@ -1,24 +0,0 @@ -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 - diff --git a/kde-apps/itinerary/patches/itinerary-24.12.0.patchset b/kde-apps/itinerary/patches/itinerary-24.12.0.patchset new file mode 100644 index 000000000..9a2de06dc --- /dev/null +++ b/kde-apps/itinerary/patches/itinerary-24.12.0.patchset @@ -0,0 +1,30 @@ +From 2997081f9917acd75fdb371bef8396db0be8b3f6 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 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -78,11 +78,11 @@ include(ECMFindQmlModule) + ecm_find_qmlmodule(QtLocation 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}) +-ecm_find_qmlmodule(org.kde.prison.scanner ${KF_MIN_VERSION}) +-ecm_find_qmlmodule(org.kde.kosmindoormap ${GEAR_MIN_VERSION} REQUIRED) +-ecm_find_qmlmodule(org.kde.kopeninghours ${GEAR_MIN_VERSION} REQUIRED) ++#ecm_find_qmlmodule(org.kde.kitemmodels ${KF_MIN_VERSION}) ++#ecm_find_qmlmodule(org.kde.prison ${KF_MIN_VERSION}) ++#ecm_find_qmlmodule(org.kde.prison.scanner ${KF_MIN_VERSION}) ++#ecm_find_qmlmodule(org.kde.kosmindoormap ${GEAR_MIN_VERSION} REQUIRED) ++#ecm_find_qmlmodule(org.kde.kopeninghours ${GEAR_MIN_VERSION} REQUIRED) + + # runtime dependencies are build-time dependencies on Android + if (ANDROID) +-- +2.45.2 +