GNU bug report logs - #78360
[PATCH 0/2] gnu: nomacs: Update to 3.21.1.

Previous Next

To reply to this bug, email your comments to 78360 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: guix-patches <at> gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH 0/2] gnu: nomacs: Update to 3.21.1.
Date: Sat, 10 May 2025 22:30:55 +0200

Sergey Trofimov (2):
  gnu: Add quazip-qt6.
  gnu: nomacs: Update to 3.21.1.

 gnu/packages/compression.scm   | 17 +++++++++++++++++
 gnu/packages/image-viewers.scm | 22 ++++++++++++----------
 2 files changed, 29 insertions(+), 10 deletions(-)


base-commit: efbc986d803190917097f51a899e1f4f3785c28a
-- 
2.49.0

Message #8 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH 1/2] gnu: Add quazip-qt6.
Date: Sat, 10 May 2025 22:38:12 +0200

* gnu/packages/compression.scm (quazip-qt6): New variable.

Change-Id: I2632560a6795d0825b1b552d79682ed78571cb56
---
 gnu/packages/compression.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 497cea895d..f52b883fae 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2550,6 +2550,23 @@ (define-public quazip
        (sha256
         (base32 "1jsw4xm5wyaqcj1pma5zzd8f5xbgd5lcjh18ah3kg36xz5i69yi4"))))))
 
+(define-public quazip-qt6
+  (package
+    (inherit quazip)
+    (name "quazip-qt6")
+    (version "1.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/stachenov/quazip")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jsw4xm5wyaqcj1pma5zzd8f5xbgd5lcjh18ah3kg36xz5i69yi4"))))
+
+    (inputs (list qtbase qt5compat zlib))))
+
 (define-public zchunk
   (package
     (name "zchunk")
-- 
2.49.0

Message #11 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH 2/2] gnu: nomacs: Update to 3.21.1.
Date: Sat, 10 May 2025 22:38:13 +0200

* gnu/packages/image-viewers.scm (nomacs): Update to 3.21.1.

Change-Id: I957054430043b72e6f50c4849fbce92f12b51adc
---
 gnu/packages/image-viewers.scm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 4413b93fce..def557afa0 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -1041,7 +1041,7 @@ (define-public pqiv
 (define-public nomacs
   (package
     (name "nomacs")
-    (version "3.16.224")
+    (version "3.21.1")
     (source
      (origin
        (method git-fetch)
@@ -1051,12 +1051,13 @@ (define-public nomacs
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "05d4hqg0gl3g9s2xf1hr7mc7g4cqarcap4nzxxa51fsphw2b8x16"))))
+         "1by62r1g1clji7g539zyhm5z7h1ssp8pcb6vrm33p2gvz3vba5j5"))))
     (build-system cmake-build-system)
     (arguments
      `(#:build-type "Release" ; fails to build with debug info
        #:configure-flags (list "-DENABLE_TRANSLATIONS=true"
                                "-DUSE_SYSTEM_QUAZIP=true"
+                               "-DENABLE_QUAZIP=true"
                                "-DENABLE_OPENCV=true")
        #:tests? #f ; no rule for target 'test'
        #:phases
@@ -1072,22 +1073,23 @@ (define-public nomacs
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/nomacs/nomacs-plugins")
-                 (commit "3.16")))
+                 (url "https://github.com/novomesk/nomacs-plugins")
+                 (commit "20101da282f13d3184ece873388e1c234a79b5e7")))
            (sha256
             (base32
-             "1cpdwhfvaxm970nwdc1hc13848a85pqqi176m9xpa3krla9qskml"))))
+             "0nbrsxhggy15idvm5dlhxh2z14gvki7vljxqi90hw98nmbh5ri41"))))
        ("exiv2" ,exiv2)
        ("libraw" ,libraw)
        ("libtiff" ,libtiff)
        ("opencv" ,opencv)
-       ("python" ,python-wrapper)
-       ("quazip" ,quazip-0)
-       ("qtbase" ,qtbase-5)
-       ("qtsvg-5" ,qtsvg-5)))
+       ("quazip" ,quazip-qt6)
+       ("qtimageformats" ,qtimageformats)
+       ("qtbase" ,qtbase)
+       ("qt5compat" ,qt5compat)
+       ("qtsvg" ,qtsvg)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qtlinguist" ,qttools-5)))
+       ("qttools" ,qttools)))
     (synopsis "Image viewer supporting all common formats")
     (description "Nomacs is a simple to use image lounge featuring
 semi-transparent widgets that display additional information such as metadata,
-- 
2.49.0

Message #14 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: Sergey Trofimov <sarg <at> sarg.org.ru>
Cc: 78360 <at> debbugs.gnu.org, z572 <at> z572.online, iyzsong <at> envs.net,
 maxim.cournoyer <at> gmail.com
Subject: Re: [PATCH 1/2] gnu: Add quazip-qt6.
Date: Sun, 11 May 2025 14:20:54 +0200

Hello Sergey,

thanks for the patch, it is always good to get rid of Qt5 dependencies!

However, I am not convinced about the order of things:
Why add the "-qt6" suffix to the name, in particular since Qt6 should be
the standard now? I think it would be better to do things as with qtbase:
Keep the "name" field the same; rename the quazip variable to quazip-5; 
adapt the packages that currently have quazip as input to use quazip-5.

I am cc-ing the qt team since they are more competent to give advice.

Andreas

Message #17 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: Andreas Enge <andreas <at> enge.fr>
Cc: 78360 <at> debbugs.gnu.org, z572 <at> z572.online, iyzsong <at> envs.net,
 maxim.cournoyer <at> gmail.com
Subject: Re: [PATCH 1/2] gnu: Add quazip-qt6.
Date: Sun, 11 May 2025 15:52:12 +0200

Hi Andreas,

Andreas Enge <andreas <at> enge.fr> writes:

> Hello Sergey,
>
> thanks for the patch, it is always good to get rid of Qt5 dependencies!
>
> However, I am not convinced about the order of things:
> Why add the "-qt6" suffix to the name, in particular since Qt6 should be
> the standard now? I think it would be better to do things as with qtbase:
> Keep the "name" field the same; rename the quazip variable to quazip-5; 
> adapt the packages that currently have quazip as input to use quazip-5.
>
> I am cc-ing the qt team since they are more competent to give advice.
>

A couple reasons:
- there already is quazip-0 variable, quazip-6 or quazip-5 look odd
- having two packages under the same name and version leads to
ambiguity, i.e. `guix build quazip <at> 1.4` would build only one of these
- a couple other packages follow -qt6 naming scheme, I've followed these steps

Message #20 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: Sergey Trofimov <sarg <at> sarg.org.ru>
Cc: 78360 <at> debbugs.gnu.org, z572 <at> z572.online, iyzsong <at> envs.net,
 maxim.cournoyer <at> gmail.com
Subject: Re: [PATCH 1/2] gnu: Add quazip-qt6.
Date: Sun, 11 May 2025 17:17:13 +0200

Hello,

Am Sun, May 11, 2025 at 03:52:12PM +0200 schrieb Sergey Trofimov:
> - there already is quazip-0 variable, quazip-6 or quazip-5 look odd
> - having two packages under the same name and version leads to
> ambiguity, i.e. `guix build quazip <at> 1.4` would build only one of these
> - a couple other packages follow -qt6 naming scheme, I've followed these steps

in any case, you can distinguish the name of the variable (the string
after "define public") and the "name" in the record field; both need not
be the same.

I will let the qt team take the decision and push; I had just come
across this package since it had a green badge on QA, wanted to push it,
but ended up having doubts about the naming scheme.

Andreas

Message #23 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Sergey Trofimov <sarg <at> sarg.org.ru>
Cc: 78360 <at> debbugs.gnu.org, Andreas Enge <andreas <at> enge.fr>, z572 <at> z572.online,
 iyzsong <at> envs.net
Subject: Re: [bug#78360] [PATCH 1/2] gnu: Add quazip-qt6.
Date: Mon, 12 May 2025 16:53:35 +0900

Hi,

Sergey Trofimov <sarg <at> sarg.org.ru> writes:

> Hi Andreas,
>
> Andreas Enge <andreas <at> enge.fr> writes:
>
>> Hello Sergey,
>>
>> thanks for the patch, it is always good to get rid of Qt5 dependencies!
>>
>> However, I am not convinced about the order of things:
>> Why add the "-qt6" suffix to the name, in particular since Qt6 should be
>> the standard now? I think it would be better to do things as with qtbase:
>> Keep the "name" field the same; rename the quazip variable to quazip-5; 
>> adapt the packages that currently have quazip as input to use quazip-5.
>>
>> I am cc-ing the qt team since they are more competent to give advice.

My opinion is that 'quazip' alone as both the variable name and package
name would be nicer, for the latest Qt 6 version.

Is quazip-0 still needed?  If not, it can be removed.  And then we can
introduce a quazip-5 variable.

Does that make sense?

-- 
Thanks,
Maxim

Message #26 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH v1 0/6] Remove quazip-0. Update nomacs.
Date: Mon, 12 May 2025 12:00:33 +0200

Sergey Trofimov (6):
  gnu: Switch quazip to qt6.
  gnu: nomacs: Update to 3.21.1.
  gnu: openboard: Update quazip dependency.
  gnu: krita: Update quazip dependency.
  gnu: cvassistant: Update quazip dependency.
  gnu: Remove quazip-0.

 gnu/packages/admin.scm          |  2 +-
 gnu/packages/compression.scm    | 38 +++++++++++++--------------------
 gnu/packages/cvassistant.scm    | 30 +++++++++++---------------
 gnu/packages/education.scm      |  6 ++++--
 gnu/packages/engineering.scm    |  2 +-
 gnu/packages/geo.scm            |  2 +-
 gnu/packages/hardware.scm       |  2 +-
 gnu/packages/image-viewers.scm  | 22 ++++++++++---------
 gnu/packages/kde.scm            |  2 +-
 gnu/packages/ocr.scm            |  2 +-
 gnu/packages/password-utils.scm |  1 -
 11 files changed, 49 insertions(+), 60 deletions(-)


base-commit: 300d29e69988caf23684f08effa51f621c7ec083
-- 
2.49.0

Message #29 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH v1 1/6] gnu: Switch quazip to qt6.
Date: Mon, 12 May 2025 12:00:34 +0200

* gnu/packages/compression.scm (quazip): Link with qt6.
(quazip-5): Inherit from quazip overriding inputs to qt5.
(quazip-0): Inherit from quazip-5 setting version to 0.9.1.

* gnu/packages/admin.scm (corectrl):
* gnu/packages/engineering.scm (librepcb):
* gnu/packages/geo.scm (qmapshack):
* gnu/packages/hardware.scm (ckb-next):
* gnu/packages/ocr.scm (gimagereader):
[inputs]: Rename quazip to quazip-5.
* gnu/packages/password-utils.scm (keepassxc):
[inputs]: Remove unused quazip-0.

Change-Id: I2632560a6795d0825b1b552d79682ed78571cb56
---
 gnu/packages/admin.scm          |  2 +-
 gnu/packages/compression.scm    | 53 +++++++++++++++++++--------------
 gnu/packages/engineering.scm    |  2 +-
 gnu/packages/geo.scm            |  2 +-
 gnu/packages/hardware.scm       |  2 +-
 gnu/packages/ocr.scm            |  2 +-
 gnu/packages/password-utils.scm |  1 -
 7 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 12965ebcd8..4d7b95913b 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -3495,7 +3495,7 @@ (define-public corectrl
                   qtquickcontrols2-5
                   qtsvg-5
                   qtwayland-5
-                  quazip
+                  quazip-5
                   spdlog
                   trompeloeil
                   units
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 497cea895d..cbfabd607d 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2499,26 +2499,26 @@ (define-public upx
     (properties `((lint-hidden-cve . ("CVE-2023-23456" "CVE-2023-23457"))))
     (license license:gpl2+)))
 
-(define-public quazip-0
+(define-public quazip
   (package
     (name "quazip")
-    (version "0.9.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/stachenov/quazip")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "11icgwv2xyxhd1hm1add51xv54zwkcqkg85d1xqlgiigvbm196iq"))))
+    (version "1.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/stachenov/quazip")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jsw4xm5wyaqcj1pma5zzd8f5xbgd5lcjh18ah3kg36xz5i69yi4"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f))                    ;no test
     (native-inputs
      (list doxygen))
     (inputs
-     (list qtbase-5 zlib))
+     (inputs (list qtbase qt5compat zlib)))
     (home-page "https://stachenov.github.io/quazip/index.html")
     (synopsis "Qt/C++ wrapper for Minizip")
     (description "QuaZIP is a simple C++ wrapper over Gilles Vollant's
@@ -2535,20 +2535,27 @@ (define-public quazip-0
     ;; distributed under zlib terms.
     (license (list license:lgpl2.1+ license:zlib))))
 
-(define-public quazip
+(define-public quazip-5
   (package
-    (inherit quazip-0)
+    (inherit quazip)
     (name "quazip")
     (version "1.4")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/stachenov/quazip")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1jsw4xm5wyaqcj1pma5zzd8f5xbgd5lcjh18ah3kg36xz5i69yi4"))))))
+    (inputs (list qtbase-5 zlib))))
+
+(define-public quazip-0
+  (package
+    (inherit quazip-5)
+    (name "quazip")
+    (version "0.9.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/stachenov/quazip")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "11icgwv2xyxhd1hm1add51xv54zwkcqkg85d1xqlgiigvbm196iq"))))))
 
 (define-public zchunk
   (package
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 3ed3814d5a..42904a809b 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2670,7 +2670,7 @@ (define-public librepcb
            qtdeclarative-5
            qtquickcontrols2-5
            qtsvg-5
-           quazip
+           quazip-5
            zlib))
     (native-inputs
      (list googletest
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 17b43c0397..f25707d3f2 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -3011,7 +3011,7 @@ (define-public qmapshack
            qtlocation-5
            qtwebchannel-5
            qtwebengine-5
-           quazip
+           quazip-5
            routino
            sqlite ; See wrap phase
            zlib))
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 7ee03cbd24..08bdf39043 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -530,7 +530,7 @@ (define-public ckb-next
       (inputs (list qtbase-5
                     zlib
                     libdbusmenu-qt
-                    quazip
+                    quazip-5
                     pulseaudio
                     libxcb
                     xcb-util-wm
diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm
index 8e376da78b..f5233e704f 100644
--- a/gnu/packages/ocr.scm
+++ b/gnu/packages/ocr.scm
@@ -235,7 +235,7 @@ (define-public gimagereader
            sane-backends
            qtbase-5
            qtspell
-           quazip
+           quazip-5
            tesseract-ocr))
     (home-page "https://github.com/manisandro/gImageReader")
     (synopsis "Qt front-end to tesseract-ocr")
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index bce4af8e5f..548629c965 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -305,7 +305,6 @@ (define-public keepassxc
            qtsvg-5
            qtwayland-5
            qtx11extras
-           quazip-0                     ; XC_KEESHARE
            readline
            wl-clipboard                 ;for 'wl-copy'
            xclip                        ;for 'xclip'
-- 
2.49.0

Message #32 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH v1 2/6] gnu: nomacs: Update to 3.21.1.
Date: Mon, 12 May 2025 12:00:35 +0200

* gnu/packages/image-viewers.scm (nomacs): Update to 3.21.1.

Change-Id: I957054430043b72e6f50c4849fbce92f12b51adc
---
 gnu/packages/image-viewers.scm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 4413b93fce..43f0be5a3e 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -1041,7 +1041,7 @@ (define-public pqiv
 (define-public nomacs
   (package
     (name "nomacs")
-    (version "3.16.224")
+    (version "3.21.1")
     (source
      (origin
        (method git-fetch)
@@ -1051,12 +1051,13 @@ (define-public nomacs
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "05d4hqg0gl3g9s2xf1hr7mc7g4cqarcap4nzxxa51fsphw2b8x16"))))
+         "1by62r1g1clji7g539zyhm5z7h1ssp8pcb6vrm33p2gvz3vba5j5"))))
     (build-system cmake-build-system)
     (arguments
      `(#:build-type "Release" ; fails to build with debug info
        #:configure-flags (list "-DENABLE_TRANSLATIONS=true"
                                "-DUSE_SYSTEM_QUAZIP=true"
+                               "-DENABLE_QUAZIP=true"
                                "-DENABLE_OPENCV=true")
        #:tests? #f ; no rule for target 'test'
        #:phases
@@ -1072,22 +1073,23 @@ (define-public nomacs
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/nomacs/nomacs-plugins")
-                 (commit "3.16")))
+                 (url "https://github.com/novomesk/nomacs-plugins")
+                 (commit "20101da282f13d3184ece873388e1c234a79b5e7")))
            (sha256
             (base32
-             "1cpdwhfvaxm970nwdc1hc13848a85pqqi176m9xpa3krla9qskml"))))
+             "0nbrsxhggy15idvm5dlhxh2z14gvki7vljxqi90hw98nmbh5ri41"))))
        ("exiv2" ,exiv2)
        ("libraw" ,libraw)
        ("libtiff" ,libtiff)
        ("opencv" ,opencv)
-       ("python" ,python-wrapper)
-       ("quazip" ,quazip-0)
-       ("qtbase" ,qtbase-5)
-       ("qtsvg-5" ,qtsvg-5)))
+       ("quazip" ,quazip)
+       ("qtimageformats" ,qtimageformats)
+       ("qtbase" ,qtbase)
+       ("qt5compat" ,qt5compat)
+       ("qtsvg" ,qtsvg)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qtlinguist" ,qttools-5)))
+       ("qttools" ,qttools)))
     (synopsis "Image viewer supporting all common formats")
     (description "Nomacs is a simple to use image lounge featuring
 semi-transparent widgets that display additional information such as metadata,
-- 
2.49.0

Message #35 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH v1 3/6] gnu: openboard: Update quazip dependency.
Date: Mon, 12 May 2025 12:00:36 +0200

* gnu/packages/education.scm (openboard): [inputs]: Replace quazip-0
with quazip-5.

Change-Id: I208bd7f420df5c57bc182814da240f5a927802ca
---
 gnu/packages/education.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 4c1401f6d7..b03066b663 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -534,7 +534,9 @@ (define-public openboard
             (lambda* (#:key inputs #:allow-other-keys)
               (substitute* "OpenBoard.pro"
                 (("/usr/include/quazip5")
-                 (search-input-directory inputs "/include/quazip5"))
+                 (search-input-directory inputs "/include/QuaZip-Qt5-1.4/quazip"))
+                (("-lquazip5")
+                 "-lquazip1-qt5")
                 (("/usr/include/poppler")
                  (search-input-directory inputs "/include/poppler")))))
           (replace 'configure
@@ -600,7 +602,7 @@ (define-public openboard
            qtwebchannel-5
            qtwebengine-5
            qtxmlpatterns
-           quazip-0
+           quazip-5
            sdl
            zlib))
     (home-page "https://openboard.ch/")
-- 
2.49.0

Message #38 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH v1 4/6] gnu: krita: Update quazip dependency.
Date: Mon, 12 May 2025 12:00:37 +0200

* gnu/packages/kde.scm (krita):[inputs]: Update quazip-0 to quazip-5.

Change-Id: Ic361a51acfc9356f289f093dfe6a5996aa8b9476
---
 gnu/packages/kde.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index c0b94c6bcf..fc21b29659 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1076,7 +1076,7 @@ (define-public krita
            qtmultimedia-5
            qtsvg-5
            qtx11extras
-           quazip-0
+           quazip-5
            sdl2
            xsimd
            zlib
-- 
2.49.0

Message #41 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH v1 5/6] gnu: cvassistant: Update quazip dependency.
Date: Mon, 12 May 2025 12:00:38 +0200

* gnu/packages/cvassistant.scm (cvassistant):
[phases]: Adjust quazip patches.
[inputs]: Replace quazip-0 with quazip-5.

Change-Id: Ic27d28bd8429592a095b8f2f5c308c1063985b87
---
 gnu/packages/cvassistant.scm | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/cvassistant.scm b/gnu/packages/cvassistant.scm
index 9af5c7976f..66f66a48f0 100644
--- a/gnu/packages/cvassistant.scm
+++ b/gnu/packages/cvassistant.scm
@@ -45,31 +45,25 @@ (define-public cvassistant
            ;; the INSTALL file.
            (lambda _
              (substitute* "controllers/mainwindow.cpp"
-               (("//(#define NO_DONATION_PROMPT)" _ line) line))
-             #t))
-         (add-after 'unpack 'fix-quazip-directory
-           (lambda _
-             (substitute* "models/resumedocument.h"
-               (("quazip(/quazipfile\\.h)" _ suffix)
-                (string-append "quazip5" suffix)))
-             #t))
-         (add-after 'fix-quazip-directory 'fix-quazip-link
-           (lambda _
-             (substitute* "CVAssistant.pro"
-               (("lquazip-qt5")
-                "lquazip5"))
-             #t))
-         (add-after 'fix-quazip-directory 'fix-install-root
+               (("//(#define NO_DONATION_PROMPT)" _ line) line))))
+         (add-after 'unpack 'fix-quazip
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((quazip
+                    (search-input-directory inputs "/include/QuaZip-Qt5-1.4")))
+
+               (substitute* "CVAssistant.pro"
+                 (("-lquazip-qt5")
+                  (format #f "-lquazip1-qt5~%INCLUDEPATH += ~a~%" quazip))))))
+         (add-after 'fix-quazip 'fix-install-root
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
                (substitute* "CVAssistant.pro"
                  (("/usr/(bin|share/)" _ suffix)
-                  (string-append out "/" suffix)))
-               #t)))
+                  (string-append out "/" suffix))))))
          (replace 'configure
            (lambda _ (invoke "qmake"))))))
     (inputs
-     (list qtbase-5 quazip-0 zlib))
+     (list qtbase-5 quazip-5 zlib))
     (home-page "https://cvassistant.sourceforge.io/")
     (synopsis "Job application organizer")
     (description "Whether you're looking for a job or trying to help
-- 
2.49.0

Message #44 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH v1 6/6] gnu: Remove quazip-0.
Date: Mon, 12 May 2025 12:00:39 +0200

* gnu/packages/compression.scm (quazip-0): Delete variable.

Change-Id: Ia952c3758fd39ce0f9c04b7a89bd9b8365af6974
---
 gnu/packages/compression.scm | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index cbfabd607d..e02d4d25ff 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2542,21 +2542,6 @@ (define-public quazip-5
     (version "1.4")
     (inputs (list qtbase-5 zlib))))
 
-(define-public quazip-0
-  (package
-    (inherit quazip-5)
-    (name "quazip")
-    (version "0.9.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/stachenov/quazip")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "11icgwv2xyxhd1hm1add51xv54zwkcqkg85d1xqlgiigvbm196iq"))))))
-
 (define-public zchunk
   (package
     (name "zchunk")
-- 
2.49.0

Message #47 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: 78360 <at> debbugs.gnu.org, Andreas Enge <andreas <at> enge.fr>, z572 <at> z572.online,
 iyzsong <at> envs.net
Subject: Re: [bug#78360] [PATCH 1/2] gnu: Add quazip-qt6.
Date: Mon, 12 May 2025 12:03:30 +0200

Hi Maxim, Andreas
Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:

> Hi,
>
> Sergey Trofimov <sarg <at> sarg.org.ru> writes:
>
>> Hi Andreas,
>>
>> Andreas Enge <andreas <at> enge.fr> writes:
>>
>>> Hello Sergey,
>>>
>>> thanks for the patch, it is always good to get rid of Qt5 dependencies!
>>>
>>> However, I am not convinced about the order of things:
>>> Why add the "-qt6" suffix to the name, in particular since Qt6 should be
>>> the standard now? I think it would be better to do things as with qtbase:
>>> Keep the "name" field the same; rename the quazip variable to quazip-5; 
>>> adapt the packages that currently have quazip as input to use quazip-5.
>>>
>>> I am cc-ing the qt team since they are more competent to give advice.
>
> My opinion is that 'quazip' alone as both the variable name and package
> name would be nicer, for the latest Qt 6 version.
>
> Is quazip-0 still needed?  If not, it can be removed.  And then we can
> introduce a quazip-5 variable.
>
> Does that make sense?

quazip-0 is still used by a few packages. I've prepared a new series
that upgrades such packages to quazip-5.

Message #50 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Sergey Trofimov <sarg <at> sarg.org.ru>
Cc: 78360 <at> debbugs.gnu.org, Andreas Enge <andreas <at> enge.fr>,
 Zheng Junjie <z572 <at> z572.online>, Sughosha <sughosha <at> disroot.org>
Subject: Re: [bug#78360] [PATCH v1 3/6] gnu: openboard: Update quazip
 dependency.
Date: Mon, 12 May 2025 21:17:18 +0900

Hi Sergey,

Sergey Trofimov <sarg <at> sarg.org.ru> writes:

> * gnu/packages/education.scm (openboard): [inputs]: Replace quazip-0
> with quazip-5.

nitpick: There should only one semi-colon in a the GNU ChangeLog entry
(info "(standards) Style of Change Logs"), e.g.:

 --8<---------------cut here---------------start------------->8---
* gnu/packages/education.scm (openboard) [inputs]: Replace quazip-0
 with quazip-5.
 --8<---------------cut here---------------end--------------->8---

-- 
Thanks,
Maxim

Message #53 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Sergey Trofimov <sarg <at> sarg.org.ru>
Cc: 78360 <at> debbugs.gnu.org, Sharlatan Hellseher <sharlatanus <at> gmail.com>,
 Ekaitz Zarraga <ekaitz <at> elenq.tech>, Gabriel Wicki <gabriel <at> erlikon.ch>,
 Cayetano Santos <csantosb <at> inventati.org>, Andreas Enge <andreas <at> enge.fr>,
 Eric Bavier <bavier <at> posteo.net>
Subject: Re: [bug#78360] [PATCH v1 1/6] gnu: Switch quazip to qt6.
Date: Mon, 12 May 2025 21:19:47 +0900

Hi,

Sergey Trofimov <sarg <at> sarg.org.ru> writes:

> * gnu/packages/compression.scm (quazip): Link with qt6.
> (quazip-5): Inherit from quazip overriding inputs to qt5.
> (quazip-0): Inherit from quazip-5 setting version to 0.9.1.
>
> * gnu/packages/admin.scm (corectrl):
> * gnu/packages/engineering.scm (librepcb):
> * gnu/packages/geo.scm (qmapshack):
> * gnu/packages/hardware.scm (ckb-next):
> * gnu/packages/ocr.scm (gimagereader):
> [inputs]: Rename quazip to quazip-5.
> * gnu/packages/password-utils.scm (keepassxc):
> [inputs]: Remove unused quazip-0.

More GNU change log (info "(standards) Style of Change Logs") nitpicks:
When entries are stacked with same description shared, do not trail the
end of line with ':'.  So, something like:

--8<---------------cut here---------------start------------->8---
 * gnu/packages/admin.scm (corectrl)
 * gnu/packages/engineering.scm (librepcb)
 * gnu/packages/geo.scm (qmapshack)
 * gnu/packages/hardware.scm (ckb-next)
 * gnu/packages/ocr.scm (gimagereader)
[inputs]: Rename quazip to quazip-5.
--8<---------------cut here---------------end--------------->8---

Otherwise, LGTM!

-- 
Thanks,
Maxim

Message #56 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Sergey Trofimov <sarg <at> sarg.org.ru>
Cc: 78360 <at> debbugs.gnu.org, Andreas Enge <andreas <at> enge.fr>
Subject: Re: [bug#78360] [PATCH v1 0/6] Remove quazip-0. Update nomacs.
Date: Mon, 12 May 2025 21:20:31 +0900

Hi,

Sergey Trofimov <sarg <at> sarg.org.ru> writes:

> Sergey Trofimov (6):
>   gnu: Switch quazip to qt6.
>   gnu: nomacs: Update to 3.21.1.
>   gnu: openboard: Update quazip dependency.
>   gnu: krita: Update quazip dependency.
>   gnu: cvassistant: Update quazip dependency.
>   gnu: Remove quazip-0.
>
>  gnu/packages/admin.scm          |  2 +-

Apart from the GNU change log nitpicks I've mentioned, this LGTM,
although I haven't tested all the touched packages.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

-- 
Thanks,
Maxim

Message #59 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: 78360 <at> debbugs.gnu.org, Andreas Enge <andreas <at> enge.fr>,
 Zheng Junjie <z572 <at> z572.online>, Sughosha <sughosha <at> disroot.org>
Subject: Re: [bug#78360] [PATCH v1 3/6] gnu: openboard: Update quazip
 dependency.
Date: Mon, 12 May 2025 14:41:34 +0200

Hi Maxim, 

Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:

> Hi Sergey,
>
> Sergey Trofimov <sarg <at> sarg.org.ru> writes:
>
>> * gnu/packages/education.scm (openboard): [inputs]: Replace quazip-0
>> with quazip-5.
>
> nitpick: There should only one semi-colon in a the GNU ChangeLog entry
> (info "(standards) Style of Change Logs"), e.g.:
>
>  --8<---------------cut here---------------start------------->8---
> * gnu/packages/education.scm (openboard) [inputs]: Replace quazip-0
>  with quazip-5.
>  --8<---------------cut here---------------end--------------->8---

Thanks, I use magit and it adds these extra semi-colons automatically.
Looks like it started doing so from
https://github.com/magit/magit/commit/139e0fcff35cd0d71328b43ebb265823912a92fd

And the bug itself is coming from emacs (lisp/vc/log-edit.el). I'll
disable this feature for now on my machine.

Message #62 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH v2 1/7] gnu: Switch quazip to qt6.
Date: Mon, 12 May 2025 14:50:13 +0200

* gnu/packages/compression.scm (quazip): Link with qt6.
(quazip-5): Inherit from quazip overriding inputs to qt5.
(quazip-0): Inherit from quazip-5 setting version to 0.9.1.

* gnu/packages/admin.scm (corectrl)
* gnu/packages/engineering.scm (librepcb)
* gnu/packages/geo.scm (qmapshack)
* gnu/packages/hardware.scm (ckb-next)
* gnu/packages/ocr.scm (gimagereader)
[inputs]: Rename quazip to quazip-5.

Change-Id: I2632560a6795d0825b1b552d79682ed78571cb56
---
 gnu/packages/admin.scm       |  2 +-
 gnu/packages/compression.scm | 53 ++++++++++++++++++++----------------
 gnu/packages/engineering.scm |  2 +-
 gnu/packages/geo.scm         |  2 +-
 gnu/packages/hardware.scm    |  2 +-
 gnu/packages/ocr.scm         |  2 +-
 6 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 12965ebcd8..4d7b95913b 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -3495,7 +3495,7 @@ (define-public corectrl
                   qtquickcontrols2-5
                   qtsvg-5
                   qtwayland-5
-                  quazip
+                  quazip-5
                   spdlog
                   trompeloeil
                   units
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 497cea895d..cbfabd607d 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2499,26 +2499,26 @@ (define-public upx
     (properties `((lint-hidden-cve . ("CVE-2023-23456" "CVE-2023-23457"))))
     (license license:gpl2+)))
 
-(define-public quazip-0
+(define-public quazip
   (package
     (name "quazip")
-    (version "0.9.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/stachenov/quazip")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "11icgwv2xyxhd1hm1add51xv54zwkcqkg85d1xqlgiigvbm196iq"))))
+    (version "1.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/stachenov/quazip")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jsw4xm5wyaqcj1pma5zzd8f5xbgd5lcjh18ah3kg36xz5i69yi4"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f))                    ;no test
     (native-inputs
      (list doxygen))
     (inputs
-     (list qtbase-5 zlib))
+     (inputs (list qtbase qt5compat zlib)))
     (home-page "https://stachenov.github.io/quazip/index.html")
     (synopsis "Qt/C++ wrapper for Minizip")
     (description "QuaZIP is a simple C++ wrapper over Gilles Vollant's
@@ -2535,20 +2535,27 @@ (define-public quazip-0
     ;; distributed under zlib terms.
     (license (list license:lgpl2.1+ license:zlib))))
 
-(define-public quazip
+(define-public quazip-5
   (package
-    (inherit quazip-0)
+    (inherit quazip)
     (name "quazip")
     (version "1.4")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/stachenov/quazip")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1jsw4xm5wyaqcj1pma5zzd8f5xbgd5lcjh18ah3kg36xz5i69yi4"))))))
+    (inputs (list qtbase-5 zlib))))
+
+(define-public quazip-0
+  (package
+    (inherit quazip-5)
+    (name "quazip")
+    (version "0.9.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/stachenov/quazip")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "11icgwv2xyxhd1hm1add51xv54zwkcqkg85d1xqlgiigvbm196iq"))))))
 
 (define-public zchunk
   (package
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 3ed3814d5a..42904a809b 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2670,7 +2670,7 @@ (define-public librepcb
            qtdeclarative-5
            qtquickcontrols2-5
            qtsvg-5
-           quazip
+           quazip-5
            zlib))
     (native-inputs
      (list googletest
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 17b43c0397..f25707d3f2 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -3011,7 +3011,7 @@ (define-public qmapshack
            qtlocation-5
            qtwebchannel-5
            qtwebengine-5
-           quazip
+           quazip-5
            routino
            sqlite ; See wrap phase
            zlib))
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 7ee03cbd24..08bdf39043 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -530,7 +530,7 @@ (define-public ckb-next
       (inputs (list qtbase-5
                     zlib
                     libdbusmenu-qt
-                    quazip
+                    quazip-5
                     pulseaudio
                     libxcb
                     xcb-util-wm
diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm
index 8e376da78b..f5233e704f 100644
--- a/gnu/packages/ocr.scm
+++ b/gnu/packages/ocr.scm
@@ -235,7 +235,7 @@ (define-public gimagereader
            sane-backends
            qtbase-5
            qtspell
-           quazip
+           quazip-5
            tesseract-ocr))
     (home-page "https://github.com/manisandro/gImageReader")
     (synopsis "Qt front-end to tesseract-ocr")

base-commit: e923c73403b6e0dc888c12c2eaaef450bcdbb632
prerequisite-patch-id: f9cc903b8048c8c6fde576fbf38ab110263020e3
prerequisite-patch-id: b6d30068ce4971d4d8e67517229916df4e76c529
prerequisite-patch-id: c99e71b3eaa726b8ecf2d9b782d5a6a51476e702
prerequisite-patch-id: 08fa3e98a432063db118aa1502c6bd0166415bdd
prerequisite-patch-id: 95bb686bc7dc0961b89a2900a368f270de065d94
prerequisite-patch-id: f56033bf148a2fdfb5d9321315bdff877ebdb7ba
prerequisite-patch-id: 6d43f84387c6ec611389d6f16c1809cc28a29365
prerequisite-patch-id: 73fabf1570be45886923df86ca4c66e4330c3752
prerequisite-patch-id: 2ed8951b99f17bac7694d7e2c3ed0440e650b0c1
prerequisite-patch-id: 09df1d4083ee7abc4f2f346f8576be31db4d193d
prerequisite-patch-id: c506c35f577adaeac5fc9f96517c92b1ea2e1135
prerequisite-patch-id: bc918233a0b494eeddb04159bbb8545a731e6e71
-- 
2.49.0

Message #65 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH v2 2/7] gnu: openboard: Update quazip dependency.
Date: Mon, 12 May 2025 14:50:14 +0200

* gnu/packages/education.scm (openboard)[inputs]: Replace quazip-0 with
quazip-5.

Change-Id: I208bd7f420df5c57bc182814da240f5a927802ca
---
 gnu/packages/education.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 4c1401f6d7..b03066b663 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -534,7 +534,9 @@ (define-public openboard
             (lambda* (#:key inputs #:allow-other-keys)
               (substitute* "OpenBoard.pro"
                 (("/usr/include/quazip5")
-                 (search-input-directory inputs "/include/quazip5"))
+                 (search-input-directory inputs "/include/QuaZip-Qt5-1.4/quazip"))
+                (("-lquazip5")
+                 "-lquazip1-qt5")
                 (("/usr/include/poppler")
                  (search-input-directory inputs "/include/poppler")))))
           (replace 'configure
@@ -600,7 +602,7 @@ (define-public openboard
            qtwebchannel-5
            qtwebengine-5
            qtxmlpatterns
-           quazip-0
+           quazip-5
            sdl
            zlib))
     (home-page "https://openboard.ch/")
-- 
2.49.0

Message #68 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH v2 3/7] gnu: krita: Update quazip dependency.
Date: Mon, 12 May 2025 14:50:15 +0200

* gnu/packages/kde.scm (krita)[inputs]: Update quazip-0 to quazip-5.

Change-Id: Ic361a51acfc9356f289f093dfe6a5996aa8b9476
---
 gnu/packages/kde.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index c0b94c6bcf..fc21b29659 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1076,7 +1076,7 @@ (define-public krita
            qtmultimedia-5
            qtsvg-5
            qtx11extras
-           quazip-0
+           quazip-5
            sdl2
            xsimd
            zlib
-- 
2.49.0

Message #71 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH v2 4/7] gnu: cvassistant: Update quazip dependency.
Date: Mon, 12 May 2025 14:50:16 +0200

* gnu/packages/cvassistant.scm (cvassistant)
[phases]: Adjust quazip patches.
[inputs]: Replace quazip-0 with quazip-5.

Change-Id: Ic27d28bd8429592a095b8f2f5c308c1063985b87
---
 gnu/packages/cvassistant.scm | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/cvassistant.scm b/gnu/packages/cvassistant.scm
index 9af5c7976f..66f66a48f0 100644
--- a/gnu/packages/cvassistant.scm
+++ b/gnu/packages/cvassistant.scm
@@ -45,31 +45,25 @@ (define-public cvassistant
            ;; the INSTALL file.
            (lambda _
              (substitute* "controllers/mainwindow.cpp"
-               (("//(#define NO_DONATION_PROMPT)" _ line) line))
-             #t))
-         (add-after 'unpack 'fix-quazip-directory
-           (lambda _
-             (substitute* "models/resumedocument.h"
-               (("quazip(/quazipfile\\.h)" _ suffix)
-                (string-append "quazip5" suffix)))
-             #t))
-         (add-after 'fix-quazip-directory 'fix-quazip-link
-           (lambda _
-             (substitute* "CVAssistant.pro"
-               (("lquazip-qt5")
-                "lquazip5"))
-             #t))
-         (add-after 'fix-quazip-directory 'fix-install-root
+               (("//(#define NO_DONATION_PROMPT)" _ line) line))))
+         (add-after 'unpack 'fix-quazip
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((quazip
+                    (search-input-directory inputs "/include/QuaZip-Qt5-1.4")))
+
+               (substitute* "CVAssistant.pro"
+                 (("-lquazip-qt5")
+                  (format #f "-lquazip1-qt5~%INCLUDEPATH += ~a~%" quazip))))))
+         (add-after 'fix-quazip 'fix-install-root
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
                (substitute* "CVAssistant.pro"
                  (("/usr/(bin|share/)" _ suffix)
-                  (string-append out "/" suffix)))
-               #t)))
+                  (string-append out "/" suffix))))))
          (replace 'configure
            (lambda _ (invoke "qmake"))))))
     (inputs
-     (list qtbase-5 quazip-0 zlib))
+     (list qtbase-5 quazip-5 zlib))
     (home-page "https://cvassistant.sourceforge.io/")
     (synopsis "Job application organizer")
     (description "Whether you're looking for a job or trying to help
-- 
2.49.0

Message #74 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH v2 5/7] gnu: keepassxc: Remove unused input.
Date: Mon, 12 May 2025 14:50:17 +0200

* gnu/packages/password-utils.scm (keepassxc)[inputs]: Remove
quazip-0.

Change-Id: I721d17850d821239383ad9585c389322fc2fcdde
---
 gnu/packages/password-utils.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index bce4af8e5f..548629c965 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -305,7 +305,6 @@ (define-public keepassxc
            qtsvg-5
            qtwayland-5
            qtx11extras
-           quazip-0                     ; XC_KEESHARE
            readline
            wl-clipboard                 ;for 'wl-copy'
            xclip                        ;for 'xclip'
-- 
2.49.0

Message #77 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH v2 6/7] gnu: nomacs: Update to 3.21.1.
Date: Mon, 12 May 2025 14:50:18 +0200

* gnu/packages/image-viewers.scm (nomacs): Update to 3.21.1.

Change-Id: I957054430043b72e6f50c4849fbce92f12b51adc
---
 gnu/packages/image-viewers.scm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 4413b93fce..43f0be5a3e 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -1041,7 +1041,7 @@ (define-public pqiv
 (define-public nomacs
   (package
     (name "nomacs")
-    (version "3.16.224")
+    (version "3.21.1")
     (source
      (origin
        (method git-fetch)
@@ -1051,12 +1051,13 @@ (define-public nomacs
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "05d4hqg0gl3g9s2xf1hr7mc7g4cqarcap4nzxxa51fsphw2b8x16"))))
+         "1by62r1g1clji7g539zyhm5z7h1ssp8pcb6vrm33p2gvz3vba5j5"))))
     (build-system cmake-build-system)
     (arguments
      `(#:build-type "Release" ; fails to build with debug info
        #:configure-flags (list "-DENABLE_TRANSLATIONS=true"
                                "-DUSE_SYSTEM_QUAZIP=true"
+                               "-DENABLE_QUAZIP=true"
                                "-DENABLE_OPENCV=true")
        #:tests? #f ; no rule for target 'test'
        #:phases
@@ -1072,22 +1073,23 @@ (define-public nomacs
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/nomacs/nomacs-plugins")
-                 (commit "3.16")))
+                 (url "https://github.com/novomesk/nomacs-plugins")
+                 (commit "20101da282f13d3184ece873388e1c234a79b5e7")))
            (sha256
             (base32
-             "1cpdwhfvaxm970nwdc1hc13848a85pqqi176m9xpa3krla9qskml"))))
+             "0nbrsxhggy15idvm5dlhxh2z14gvki7vljxqi90hw98nmbh5ri41"))))
        ("exiv2" ,exiv2)
        ("libraw" ,libraw)
        ("libtiff" ,libtiff)
        ("opencv" ,opencv)
-       ("python" ,python-wrapper)
-       ("quazip" ,quazip-0)
-       ("qtbase" ,qtbase-5)
-       ("qtsvg-5" ,qtsvg-5)))
+       ("quazip" ,quazip)
+       ("qtimageformats" ,qtimageformats)
+       ("qtbase" ,qtbase)
+       ("qt5compat" ,qt5compat)
+       ("qtsvg" ,qtsvg)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qtlinguist" ,qttools-5)))
+       ("qttools" ,qttools)))
     (synopsis "Image viewer supporting all common formats")
     (description "Nomacs is a simple to use image lounge featuring
 semi-transparent widgets that display additional information such as metadata,
-- 
2.49.0

Message #80 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH v2 7/7] gnu: Remove quazip-0.
Date: Mon, 12 May 2025 14:50:19 +0200

* gnu/packages/compression.scm (quazip-0): Delete variable.

Change-Id: Ia952c3758fd39ce0f9c04b7a89bd9b8365af6974
---
 gnu/packages/compression.scm | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index cbfabd607d..e02d4d25ff 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2542,21 +2542,6 @@ (define-public quazip-5
     (version "1.4")
     (inputs (list qtbase-5 zlib))))
 
-(define-public quazip-0
-  (package
-    (inherit quazip-5)
-    (name "quazip")
-    (version "0.9.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/stachenov/quazip")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "11icgwv2xyxhd1hm1add51xv54zwkcqkg85d1xqlgiigvbm196iq"))))))
-
 (define-public zchunk
   (package
     (name "zchunk")
-- 
2.49.0

Message #83 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: Sergey Trofimov <sarg <at> sarg.org.ru>
Cc: 78360 <at> debbugs.gnu.org, Sharlatan Hellseher <sharlatanus <at> gmail.com>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>,
 Ekaitz Zarraga <ekaitz <at> elenq.tech>, Gabriel Wicki <gabriel <at> erlikon.ch>,
 Cayetano Santos <csantosb <at> inventati.org>, Eric Bavier <bavier <at> posteo.net>
Subject: Re: [bug#78360] [PATCH v2 1/7] gnu: Switch quazip to qt6.
Date: Mon, 12 May 2025 17:54:06 +0200

Hello,

Am Mon, May 12, 2025 at 02:50:13PM +0200 schrieb Sergey Trofimov:
> * gnu/packages/compression.scm (quazip): Link with qt6.
> (quazip-5): Inherit from quazip overriding inputs to qt5.
> (quazip-0): Inherit from quazip-5 setting version to 0.9.1.

the problem with this patch is that it creates ambiguous specifications:
We now have two packages with name "quazip" and version "1.4", one of
them built with Qt5, the other one with Qt6. This creates problems on
the commandline.

I have locally renamed one of them to quazip-qt5 (in the name field).

>      (inputs
> -     (list qtbase-5 zlib))
> +     (inputs (list qtbase qt5compat zlib)))

This cannot possibly work, since we end up with "(inputs" nested twice.

I have corrected it locally.

I am trying to build the dependent packages, will push the first patch
in the series if this succeeds, and come back to you.

Andreas

Message #86 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: Sergey Trofimov <sarg <at> sarg.org.ru>
Cc: 78360 <at> debbugs.gnu.org, Sharlatan Hellseher <sharlatanus <at> gmail.com>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>,
 Ekaitz Zarraga <ekaitz <at> elenq.tech>, Gabriel Wicki <gabriel <at> erlikon.ch>,
 Cayetano Santos <csantosb <at> inventati.org>, Eric Bavier <bavier <at> posteo.net>
Subject: Re: [bug#78360] [PATCH v2 1/7] gnu: Switch quazip to qt6.
Date: Mon, 12 May 2025 23:07:53 +0200

Hello,

I only had time to check the commits 1 to 5, which I have just pushed.
It was nice that you took the logical route of having each commit leave
the repo in a consistent state.

For commit 6, could you rework the commit message to include all
changes? There are examples in the repo.

Thanks,

Andreas

Message #89 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH v3 1/2] gnu: nomacs: Update to 3.21.1.
Date: Tue, 13 May 2025 07:29:43 +0200

* gnu/packages/image-viewers.scm (nomacs): Update to 3.21.1.
[arguments]<#:configure-flags>: Enable quazip.
[inputs], [native-inputs]: Switch to Qt6.
[inputs]<plugins>: Fetch from a fork that is updated to support Qt6.

Change-Id: I957054430043b72e6f50c4849fbce92f12b51adc
---
 gnu/packages/image-viewers.scm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 4413b93fce..43f0be5a3e 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -1041,7 +1041,7 @@ (define-public pqiv
 (define-public nomacs
   (package
     (name "nomacs")
-    (version "3.16.224")
+    (version "3.21.1")
     (source
      (origin
        (method git-fetch)
@@ -1051,12 +1051,13 @@ (define-public nomacs
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "05d4hqg0gl3g9s2xf1hr7mc7g4cqarcap4nzxxa51fsphw2b8x16"))))
+         "1by62r1g1clji7g539zyhm5z7h1ssp8pcb6vrm33p2gvz3vba5j5"))))
     (build-system cmake-build-system)
     (arguments
      `(#:build-type "Release" ; fails to build with debug info
        #:configure-flags (list "-DENABLE_TRANSLATIONS=true"
                                "-DUSE_SYSTEM_QUAZIP=true"
+                               "-DENABLE_QUAZIP=true"
                                "-DENABLE_OPENCV=true")
        #:tests? #f ; no rule for target 'test'
        #:phases
@@ -1072,22 +1073,23 @@ (define-public nomacs
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/nomacs/nomacs-plugins")
-                 (commit "3.16")))
+                 (url "https://github.com/novomesk/nomacs-plugins")
+                 (commit "20101da282f13d3184ece873388e1c234a79b5e7")))
            (sha256
             (base32
-             "1cpdwhfvaxm970nwdc1hc13848a85pqqi176m9xpa3krla9qskml"))))
+             "0nbrsxhggy15idvm5dlhxh2z14gvki7vljxqi90hw98nmbh5ri41"))))
        ("exiv2" ,exiv2)
        ("libraw" ,libraw)
        ("libtiff" ,libtiff)
        ("opencv" ,opencv)
-       ("python" ,python-wrapper)
-       ("quazip" ,quazip-0)
-       ("qtbase" ,qtbase-5)
-       ("qtsvg-5" ,qtsvg-5)))
+       ("quazip" ,quazip)
+       ("qtimageformats" ,qtimageformats)
+       ("qtbase" ,qtbase)
+       ("qt5compat" ,qt5compat)
+       ("qtsvg" ,qtsvg)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qtlinguist" ,qttools-5)))
+       ("qttools" ,qttools)))
     (synopsis "Image viewer supporting all common formats")
     (description "Nomacs is a simple to use image lounge featuring
 semi-transparent widgets that display additional information such as metadata,

base-commit: 364694773ef1c61d4c9ec73e24f73642786486ca
-- 
2.49.0

Message #92 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78360 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH v3 2/2] gnu: Remove quazip-0.
Date: Tue, 13 May 2025 07:29:44 +0200

Packages depending on old quazip were migrated to quazip 1.4.

* gnu/packages/compression.scm (quazip-0): Delete variable.

Change-Id: Ia952c3758fd39ce0f9c04b7a89bd9b8365af6974
---
 gnu/packages/compression.scm | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 230e63f981..ed5a81be19 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2542,21 +2542,6 @@ (define-public quazip-5
     (version "1.4")
     (inputs (list qtbase-5 zlib))))
 
-(define-public quazip-0
-  (package
-    (inherit quazip-5)
-    (name "quazip")
-    (version "0.9.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/stachenov/quazip")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "11icgwv2xyxhd1hm1add51xv54zwkcqkg85d1xqlgiigvbm196iq"))))))
-
 (define-public zchunk
   (package
     (name "zchunk")
-- 
2.49.0

Message #95 received at 78360 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: Andreas Enge <andreas <at> enge.fr>
Cc: 78360 <at> debbugs.gnu.org, Sharlatan Hellseher <sharlatanus <at> gmail.com>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>,
 Ekaitz Zarraga <ekaitz <at> elenq.tech>, Gabriel Wicki <gabriel <at> erlikon.ch>,
 Cayetano Santos <csantosb <at> inventati.org>, Eric Bavier <bavier <at> posteo.net>
Subject: Re: [bug#78360] [PATCH v2 1/7] gnu: Switch quazip to qt6.
Date: Tue, 13 May 2025 07:32:13 +0200

Hi Andreas,

Andreas Enge <andreas <at> enge.fr> writes:

> Hello,
>
> I only had time to check the commits 1 to 5, which I have just pushed.
> It was nice that you took the logical route of having each commit leave
> the repo in a consistent state.

Thanks for checking and amending the patches.

>
> For commit 6, could you rework the commit message to include all
> changes? There are examples in the repo.

Sure, I've sent an updated series.

Message #100 received at 78360-done <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: Sergey Trofimov <sarg <at> sarg.org.ru>
Cc: 78360-done <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: Re: [bug#78360] [PATCH v3 1/2] gnu: nomacs: Update to 3.21.1.
Date: Tue, 13 May 2025 18:01:36 +0200

Hello again,

this is now pushed, thanks again!

Andreas

Previous Next

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