GNU bug report logs - #72082
[PATCH] gnu: gpxsee: Update to 13.22.

Previous Next

Package: guix-patches;

Reported by: Morgan Smith <Morgan.J.Smith <at> outlook.com>

Date: Fri, 12 Jul 2024 19:37:01 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#72082: closed ([PATCH] gnu: gpxsee: Update to 13.22.)
Date: Sat, 20 Jul 2024 10:13:02 +0000
[Message part 1 (text/plain, inline)]
Your message dated Sat, 20 Jul 2024 12:11:42 +0200
with message-id <877cdgqso1.fsf <at> gnu.org>
and subject line Re: [bug#72082] [PATCH v2] gnu: gpxsee: Update to 13.22.
has caused the debbugs.gnu.org bug report #72082,
regarding [PATCH] gnu: gpxsee: Update to 13.22.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
72082: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=72082
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
To: guix-patches <at> gnu.org
Cc: Morgan Smith <Morgan.J.Smith <at> outlook.com>
Subject: [PATCH] gnu: gpxsee: Update to 13.22.
Date: Fri, 12 Jul 2024 15:30:15 -0400
* gnu/packages/gps.scm (gpxsee): Update to 13.22.
Use qt-build-system.  Use qt6 instead of qt5.

Change-Id: I9101a6f763be198549aca8e5aea95987b14e58e4
---
 gnu/packages/gps.scm | 53 ++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index 09a419d7e9..d78c581ad0 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -31,6 +31,7 @@ (define-module (gnu packages gps)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system scons)
+  #:use-module (guix build-system qt)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix utils)
   #:use-module (gnu packages)
@@ -51,6 +52,7 @@ (define-module (gnu packages gps)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xml))
 
 (define-public gpsbabel
@@ -179,33 +181,32 @@ (define-public gama
 (define-public gpxsee
   (package
     (name "gpxsee")
-    (version "11.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/tumic0/GPXSee")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1klpjiqsvpvhlg5hsfjaszsyqr817hig9r7y7w4cp0kyn8z5fzfj"))))
-    (build-system gnu-build-system)
+    (version "13.22")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tumic0/GPXSee")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "15m5rqky2fwsq5n6x531350x39wwhpv1hz56m1yfaxj7acxhb2p5"))))
+    (build-system qt-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (replace 'configure
-           ;; Use lrelease to convert TS translation files into QM files.
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (for-each (lambda (file)
-                         (invoke "lrelease" file))
-                       (find-files "lang" "\\.ts"))
-             (invoke "qmake"
-                     (string-append "PREFIX="
-                                    (assoc-ref outputs "out"))))))))
-    (inputs
-     (list qtbase-5 qtlocation qtsvg-5))
-    (native-inputs
-     (list qttools-5))
+     (list
+      #:qtbase qtbase
+      #:tests? #f
+      #:phases #~(modify-phases %standard-phases
+                   (replace 'configure
+                     ;; Use lrelease to convert TS translation files into QM files.
+                     (lambda _
+                       (apply invoke "lrelease"
+                              (find-files "lang" ".*\\.ts"))
+                       (invoke "qmake"
+                               (string-append "PREFIX="
+                                              #$output)))))))
+    (inputs (list libxkbcommon qtbase qtpositioning qtserialport qtsvg))
+    (native-inputs (list qttools))
     (home-page "https://www.gpxsee.org")
     (synopsis "GPS log file viewer and analyzer")
     (description
-- 
2.45.2



[Message part 3 (message/rfc822, inline)]
From: Ludovic Courtès <ludo <at> gnu.org>
To: Morgan Smith <Morgan.J.Smith <at> outlook.com>
Cc: 72082-done <at> debbugs.gnu.org
Subject: Re: [bug#72082] [PATCH v2] gnu: gpxsee: Update to 13.22.
Date: Sat, 20 Jul 2024 12:11:42 +0200
Hello,

Morgan Smith <Morgan.J.Smith <at> outlook.com> skribis:

> * gnu/packages/gps.scm (gpxsee): Update to 13.22.
> Use qt-build-system.  Use qt6 instead of qt5.
>
> Change-Id: I9101a6f763be198549aca8e5aea95987b14e58e4
> ---
> Ludovic Courtès <ludo <at> gnu.org> writes:
>
>>
>> In general we avoid disabling tests.  Could you investigate a bit as to
>> why tests are failing?  Then the usual approach is to tweak or skip
>> individual tests, and only as a last resort use #:tests? #f.  In either
>> case, there should be a comment explaining why we’re doing this.
>>
>> Thanks,
>> Ludo’.
>
> I added a comment explaining that there are no tests.  I greped the source code
> for "test" and "check" and found nothing of interest.  The project does have
> some continuous integration stuff but all it does is build.  It does not run
> tests.

OK, that makes sense to me.

I applied it (it did not apply cleanly but with a bit of help it was
fine).

Thanks!

Ludo’.


This bug report was last modified 302 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.