From patchwork Mon May 12 12:50:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 42554 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BC0F927BC4B; Mon, 12 May 2025 13:53:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0166327BC49 for ; Mon, 12 May 2025 13:53:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uESf7-0002Yd-5b; Mon, 12 May 2025 08:53:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uESeV-0001rX-QP for guix-patches@gnu.org; Mon, 12 May 2025 08:53:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uESeV-0005lJ-Ga for guix-patches@gnu.org; Mon, 12 May 2025 08:53:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=CkjLuuZ1dLWt2UN8pT3nb7ZM0TOsLxFcky6vCU9sM94=; b=IqENIbthjn/vaQW2vf2wFCz6vT1fQSf6LXSaX3hukLBh+hWdrKW81ihSMtcdfFYdw38xHFFfQfnLoRHZMIMCFSzIe1HwQff7H3eswnYVdcshrRhPK+lIPKifKXqQDLCzEQ3qc+nqgmtdVeHoCxnujEUk+gYjGqaStDqJbW7cJp7mfP7+CCKcMPifoLEUDJ/Iab+uo1TAqjhKZ+utC5upDGMr2suK1IllT/D2RR1J/Exh130rN8LgVf5Sjmha4xqM/BO2Or/rW3kMFEvAuEBzBcV0PxzZWb5BlhQepgipiO5Umvd2IR2hUuAIsW0OTs6uXLeEDIULh6MD8XNgKY/ksw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uESeU-0002zQ-5C; Mon, 12 May 2025 08:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78360] [PATCH v2 1/7] gnu: Switch quazip to qt6. References: In-Reply-To: Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: sarg@sarg.org.ru, andreas@enge.fr, maxim.cournoyer@gmail.com, csantosb@inventati.org, ekaitz@elenq.tech, bavier@posteo.net, gabriel@erlikon.ch, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 12 May 2025 12:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78360 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78360@debbugs.gnu.org Cc: Sergey Trofimov , Sergey Trofimov , Andreas Enge , Maxim Cournoyer , Cayetano Santos , Ekaitz Zarraga , Eric Bavier , Gabriel Wicki , Sharlatan Hellseher X-Debbugs-Original-Xcc: Sergey Trofimov , Andreas Enge , Maxim Cournoyer , Cayetano Santos , Ekaitz Zarraga , Eric Bavier , Gabriel Wicki , Sharlatan Hellseher Received: via spool by 78360-submit@debbugs.gnu.org id=B78360.174705432811291 (code B ref 78360); Mon, 12 May 2025 12:53:02 +0000 Received: (at 78360) by debbugs.gnu.org; 12 May 2025 12:52:08 +0000 Received: from localhost ([127.0.0.1]:51264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uESdb-0002w2-Kq for submit@debbugs.gnu.org; Mon, 12 May 2025 08:52:08 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:53663) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uESdX-0002vK-1G for 78360@debbugs.gnu.org; Mon, 12 May 2025 08:52:04 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-43cfba466b2so50665305e9.3 for <78360@debbugs.gnu.org>; Mon, 12 May 2025 05:52:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1747054316; x=1747659116; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=CkjLuuZ1dLWt2UN8pT3nb7ZM0TOsLxFcky6vCU9sM94=; b=G5f1HryoC2WEtFlnQ3F/+JuCSUsddXAqKe3ubAFgPgXteeHoyaATkUG2UYl0rcB8vF uUMZCsdiJi5xkDIm/BIz7PZoqK34qJISbHQM61F0Bv1OVZSfPrEkXOFyNtcn+bW9UB7c UYrHBhmxhfri5YGnNxjW0i3MIYHDiSpRZAAXGD2jApX4EIwMFXSYVfFf27WeV66flcJD oRJiIbaSUHm7zIyhcmpwmhYUU2WUXBD6/yitilmxxoUWFliPzvLeUzsUWbCc5UyErXmZ buBXlxDzVC6I6tM97ZatKxUBpc/B+sbtKImGvnCSUTiHhQ6LNu9sYaTxy5yBYNDOEmLo LrOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747054316; x=1747659116; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CkjLuuZ1dLWt2UN8pT3nb7ZM0TOsLxFcky6vCU9sM94=; b=OzSdcodUBLl6KeEun05UaeoFohDmzfMqEX5g6FMouKlg2bZ2Q17/KQzqvczRj5jtcM p/F5RGWS0L6fpsFc2SpkqZfOQ5HQnlvr2f6Os75VbPSJeXaOJBWBHeaFww06WQuMtIFZ 61J+OwpuJBeC5NAH+o9GcbweDi9I5s/l9Pj/NjDPlj+kZM55wQ/D8g2cQ7VwWvlUEfiu yljKwm3chwU3sOjJRDPtQ6CQ+yfQiE2VrEGt82s2IBlcljF/A2/LhK1GQlzMfEyLY7ii lmM0O/XxDcYaNlDjmmn2HjxzjSWm79wij9cfgsOZT3dQP+G4omHQ8Vd/LIwnon+Ngq+P 1jjg== X-Gm-Message-State: AOJu0YxvXnUcoae7tjWO1Qzzl7hQp3hnT8nsmkkyEsHRoF9j/NX+5sSp LTzyDMFPPWSNXObDbFK5rTsZv6hcyfHMY+tE9zvWJjfUptH+uxbG3HOnHo34lTk7J3D1ihnweKd Bssq4yQ== X-Gm-Gg: ASbGncuDpHzkNKe4dg5yO/+89pwzIuf/N3cOYcj5TnX3JOQexXY/TL/AQ8aWNrfzuDC XPfP2/DwS+WB1scQ7MaiN0hLkTp3jjXUr1gF5Yln55EU4tzsgKkLtyMZ8Ziy2PPSRo98jGrnApx TseLBTEk4lF9ZF7o+SDkP/V2wtd8es7FyglOKQF3A1GNbINbLKBvYI3BR6WXib43uQezSzL15ZC +KHZXobDPC6ZXkdqgoiw1Vz/h15IMVEfrTAKUoePaiGX5TbACmySc8pZqUIwtZNKFntd4e5Ak6l pAtPaAut7g69Psxmik/EumjuSGGFX/ZUWOBFxSA8a6z0A0il X-Google-Smtp-Source: AGHT+IGjjVJNIZi3fqIqsAb5c9+2L1okLHiGzcx0IOlr5aMrAi2CbMVdnyixBuVjySSp5V9HuB/cGg== X-Received: by 2002:a05:600c:a418:b0:442:dc6f:7a20 with SMTP id 5b1f17b1804b1-442dc6f7bbcmr60609135e9.7.1747054315946; Mon, 12 May 2025 05:51:55 -0700 (PDT) Received: from localhost ([2a02:2454:a095:5600:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f5a4c804sm12556004f8f.95.2025.05.12.05.51.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 May 2025 05:51:55 -0700 (PDT) From: Sergey Trofimov Date: Mon, 12 May 2025 14:50:13 +0200 Message-ID: <5eb21dcbfaf6439f63fc693b6eff18fccae00cf8.1747054118.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) 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 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")