guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/05: gnu: itinerary: Update to 24.05.2.


From: guix-commits
Subject: 05/05: gnu: itinerary: Update to 24.05.2.
Date: Wed, 10 Jul 2024 11:50:35 -0400 (EDT)

z572 pushed a commit to branch kde-team
in repository guix.

commit 895a2ed496db4f339fe64fdfb35aacc2829ec788
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Wed Jul 10 23:32:10 2024 +0800

    gnu: itinerary: Update to 24.05.2.
    
    * gnu/packages/kde-pim.scm (itinerary): Update to 24.05.2.
    [inputs]: Remove qtdeclarative-5, qtgraphicaleffects, qtlocation-5,
    qtmultimedia-5, and qtquickcontrols2-5; add qtdeclarative,
    qtpositioning, qtlocation, and qtmultimedia.
    [native-inputs]: Add python-minimal.
    [arguments]<#:phases>: Add stop-require-qmlmodule phase.
    
    Change-Id: Ie03b729c420ba8519c2108109eac462a67f24c77
---
 gnu/packages/kde-pim.scm | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 60f6081229..80cef42c2a 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -45,6 +45,7 @@
   #:use-module (gnu packages openldap)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages search)
   #:use-module (gnu packages sqlite)
@@ -394,18 +395,29 @@ Akonadi PIM data server.  It uses Xapian for indexing and 
querying.")
 (define-public itinerary
   (package
     (name "itinerary")
-    (version "23.04.3")
+    (version "24.05.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
                                   version "/src/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "132x68wc4pallxgkvridfsimfq5m2g47fj9lcgz1kq4gdsidzf6i"))))
+                "1p05v9r1ipi465nmka8n2gs7npc6wdgfxzj7523plnja9kfa8bmb"))))
     (build-system qt-build-system)
+
     (arguments
-     `(#:tests? #f)) ;Fails 20/27
-    (native-inputs (list extra-cmake-modules))
+     (list #:qtbase qtbase
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'stop-require-qmlmodule
+                 (lambda _
+                   ;; HACK: ecm_find_qmlmodule cann't find qmlmodule on other
+                   ;; prefix, so we remove it require.
+                   (substitute* "CMakeLists.txt"
+                     (("24.02 REQUIRED")
+                      "24.02")))))
+           #:tests? #f)) ;Fails 20/27
+    (native-inputs (list extra-cmake-modules python-minimal))
     (inputs (list karchive
                   kdbusaddons
                   ki18n
@@ -428,11 +440,10 @@ Akonadi PIM data server.  It uses Xapian for indexing and 
querying.")
                   kunitconversion
                   kwindowsystem
                   prison
-                  qtdeclarative-5
-                  qtgraphicaleffects
-                  qtlocation-5
-                  qtmultimedia-5
-                  qtquickcontrols2-5
+                  qtdeclarative
+                  qtpositioning
+                  qtlocation
+                  qtmultimedia
                   qqc2-desktop-style
                   shared-mime-info
                   solid



reply via email to

[Prev in Thread] Current Thread [Next in Thread]