all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#72082] [PATCH] gnu: gpxsee: Update to 13.22.
@ 2024-07-12 19:30 Morgan Smith
  2024-07-18 15:06 ` Ludovic Courtès
  2024-07-18 23:09 ` [bug#72082] [PATCH v2] " Morgan Smith
  0 siblings, 2 replies; 4+ messages in thread
From: Morgan Smith @ 2024-07-12 19:30 UTC (permalink / raw)
  To: 72082; +Cc: Morgan Smith

* 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





^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [bug#72082] [PATCH] gnu: gpxsee: Update to 13.22.
  2024-07-12 19:30 [bug#72082] [PATCH] gnu: gpxsee: Update to 13.22 Morgan Smith
@ 2024-07-18 15:06 ` Ludovic Courtès
  2024-07-18 23:09 ` [bug#72082] [PATCH v2] " Morgan Smith
  1 sibling, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2024-07-18 15:06 UTC (permalink / raw)
  To: Morgan Smith; +Cc: 72082

Hi Morgan,

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

> * gnu/packages/gps.scm (gpxsee): Update to 13.22.
> Use qt-build-system.  Use qt6 instead of qt5.
>
> Change-Id: I9101a6f763be198549aca8e5aea95987b14e58e4

[...]

> +     (list
> +      #:qtbase qtbase
> +      #:tests? #f

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’.




^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#72082] [PATCH v2] gnu: gpxsee: Update to 13.22.
  2024-07-12 19:30 [bug#72082] [PATCH] gnu: gpxsee: Update to 13.22 Morgan Smith
  2024-07-18 15:06 ` Ludovic Courtès
@ 2024-07-18 23:09 ` Morgan Smith
  2024-07-20 10:11   ` bug#72082: " Ludovic Courtès
  1 sibling, 1 reply; 4+ messages in thread
From: Morgan Smith @ 2024-07-18 23:09 UTC (permalink / raw)
  To: ludo; +Cc: 72082, Morgan Smith

* 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@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.

Thanks,

Morgan

 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..a908744c73 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                     ; no tests
+      #: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





^ permalink raw reply related	[flat|nested] 4+ messages in thread

* bug#72082: [PATCH v2] gnu: gpxsee: Update to 13.22.
  2024-07-18 23:09 ` [bug#72082] [PATCH v2] " Morgan Smith
@ 2024-07-20 10:11   ` Ludovic Courtès
  0 siblings, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2024-07-20 10:11 UTC (permalink / raw)
  To: Morgan Smith; +Cc: 72082-done

Hello,

Morgan Smith <Morgan.J.Smith@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@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’.




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-07-20 10:13 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-12 19:30 [bug#72082] [PATCH] gnu: gpxsee: Update to 13.22 Morgan Smith
2024-07-18 15:06 ` Ludovic Courtès
2024-07-18 23:09 ` [bug#72082] [PATCH v2] " Morgan Smith
2024-07-20 10:11   ` bug#72082: " Ludovic Courtès

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.