itinerary, bump version (#11500)

This commit is contained in:
Schrijvers Luc
2024-12-20 13:10:36 +01:00
committed by GitHub
parent 48897be48f
commit d9461c36ef
3 changed files with 37 additions and 32 deletions

View File

@@ -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 \

View File

@@ -1,24 +0,0 @@
From e582529dea3d2c6405b9d8efd1af91deeec5fca5 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
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

View File

@@ -0,0 +1,30 @@
From 2997081f9917acd75fdb371bef8396db0be8b3f6 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
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