[bug#73459] [PATCH] gnu: qview: Update to 6.1.

[bug#73459] [PATCH] gnu: qview: Update to 6.1.

[Sergey Trofimov]

* gnu/packages/image-viewers.scm (qview): Update to 6.1.
[inputs, native-inputs]: Use qt6.
[arguments]: Disable broken tests. Workaround lrelease being resolved
relative to qtbase instead of qttools.
---
 gnu/packages/image-viewers.scm | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 81ee770420..7fd8585ff1 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -700,7 +700,7 @@ (define-public qpageview
 (define-public qview
   (package
     (name "qview")
-    (version "5.0")
+    (version "6.1")
     (source
      (origin
        (method git-fetch)
@@ -709,32 +709,31 @@ (define-public qview
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ck4mvhzc4m72n010n43d8ipjczzk6ya637rgfyi7bzb4gv0f3am"))))
+        (base32 "1c719ivzdm0m8apbqx8h0wi796k5myrm4q3vl16vxwzjcx5ball7"))))
     (build-system qt-build-system)
     (arguments
      (list
+      #:qtbase qtbase
+      #:tests? #f ; test code doesn't compile
       #:phases
       #~(modify-phases %standard-phases
           (replace 'configure
-            (lambda* (#:key outputs #:allow-other-keys)
-              (invoke "qmake" (string-append "PREFIX=" #$output))))
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (invoke "qmake" (string-append "PREFIX=" #$output))
+              (substitute* "Makefile"
+                (((string-append #$qtbase "/bin/lrelease"))
+                 (search-input-file inputs "/bin/lrelease")))))
           ;; Don't phone home or show "Checking for updates..." in the About
           ;; menu.
           (add-before 'build 'disable-auto-update
             (lambda _
               (substitute* "src/qvaboutdialog.cpp"
                 (("qvApp->checkUpdates\\(\\);") "")
-                (("updateText\\(\\);") ""))))
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (with-directory-excursion "tests"
-                  (invoke "qmake" "tests.pro")
-                  (invoke "make" "tests"))))))))
+                (("updateText\\(\\);") "")))))))
     (native-inputs
-     (list qttools-5))
+     (list qttools))
     (inputs
-     (list qtbase-5 qtimageformats-5 qtsvg-5))
+     (list qtbase qtimageformats qtsvg))
     (home-page "https://interversehq.com/qview/")
     (synopsis "Convenient and minimal image viewer")
     (description "qView is a Qt image viewer designed with visually

base-commit: 759b74b85224f1da1e1027bb48427648c1bbde98
-- 
2.46.0

bug#73459: [PATCH] gnu: qview: Update to 6.1.

[Ludovic Courtès]

Sergey Trofimov <sarg@sarg.org.ru> skribis:

> * gnu/packages/image-viewers.scm (qview): Update to 6.1.
> [inputs, native-inputs]: Use qt6.
> [arguments]: Disable broken tests. Workaround lrelease being resolved
> relative to qtbase instead of qttools.

Hi! Applied it with the change below, which resorts to a literal
regexp in ‘substitute*’, which is usually safer:

--8<---------------cut here---------------start------------->8---
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 7fd8585ff1..cb4e903f39 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -721,7 +721,7 @@ (define-public qview
             (lambda* (#:key inputs outputs #:allow-other-keys)
               (invoke "qmake" (string-append "PREFIX=" #$output))
               (substitute* "Makefile"
-                (((string-append #$qtbase "/bin/lrelease"))
+                (("[[:graph:]]+/bin/lrelease")
                  (search-input-file inputs "/bin/lrelease")))))
           ;; Don't phone home or show "Checking for updates..." in the About
           ;; menu.
--8<---------------cut here---------------end--------------->8---

Thanks,
Ludo’.