andreas pushed a commit to branch master
in repository guix.
commit cab5684915d4fcb3c0d061644feb7446f8a44c59
Author: Sergey Trofimov <s...@sarg.org.ru>
AuthorDate: Mon May 12 14:50:13 2025 +0200
gnu: quazip: Switch to Qt6.
* gnu/packages/compression.scm (quazip): Link with qt6.
(quazip-5): Inherit from quazip.
[name]: Set to quazip-qt5.
(quazip-0): Inherit from quazip-5.
* 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
Signed-off-by: Andreas Enge <andr...@enge.fr>
---
gnu/packages/admin.scm | 2 +-
gnu/packages/compression.scm | 55 +++++++++++++++++++++++++-------------------
gnu/packages/engineering.scm | 2 +-
gnu/packages/geo.scm | 2 +-
gnu/packages/hardware.scm | 2 +-
gnu/packages/ocr.scm | 2 +-
6 files changed, 36 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 @@ limits.")
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..230e63f981 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2499,26 +2499,26 @@ download times, and other distribution and storage
costs.")
(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))
+ (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 @@ reading from and writing to ZIP archives.")
;; distributed under zlib terms.
(license (list license:lgpl2.1+ license:zlib))))
-(define-public quazip
+(define-public quazip-5
(package
- (inherit quazip-0)
- (name "quazip")
+ (inherit quazip)
+ (name "quazip-qt5")
(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 @@ parallel computing platforms. It also supports serial
execution.")
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 @@ data.")
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 @@ support.")
(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 @@ default. To add support for more languages, the
sane-backends
qtbase-5
qtspell
- quazip
+ quazip-5
tesseract-ocr))
(home-page "https://github.com/manisandro/gImageReader";)
(synopsis "Qt front-end to tesseract-ocr")
