From patchwork Mon May 12 10:00:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 42547 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 1890927BC4C; Mon, 12 May 2025 11:04:13 +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 53B3A27BC4E for ; Mon, 12 May 2025 11:04:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEPzl-0003xA-H7; Mon, 12 May 2025 06:02:49 -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 1uEPzD-0003VX-IF for guix-patches@gnu.org; Mon, 12 May 2025 06:02:24 -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 1uEPzD-0001Z1-6C for guix-patches@gnu.org; Mon, 12 May 2025 06:02:15 -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:References:In-Reply-To:Date:From:To:Subject; bh=CKk9r5218XRtaFEiPzdabdP8ythgZSMP86pDXjS9YFk=; b=ShCBNfgNhIT1iqlEFw1MMAGdOfnk+H5qXv+F6ziEklqF4aNQSdymooQU6dvkg7s+zQ4xWCMnjT1AeBwdbttHRIsQ48ctsuBfUqd8qkChbn4vZJbMlqTk1+XLyFhswi0e4Nzpn+t+bPUtihu6ps/WIYtEVmvmhYLCcozTJiMIcfzY9usIWEAymu4R4d2NQtfhgSY2SeJ6UHPyf8owEO9yz6tiHLcqrNZZqcLl0CEMF3gk4973gc38tTdaDZoTtd/a2PKSgRrNrMTWHfBUDDFe5AL0LfOdGrOit50AJ6UlCf1WMIL2Z3LoOebgLabCqUaxNy/O0Yz7b9xWoyfnAiOqMA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uEPyz-0007gf-SQ; Mon, 12 May 2025 06:02:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78360] [PATCH v1 1/6] gnu: Switch quazip to qt6. 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 10:02:01 +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.174704406429389 (code B ref 78360); Mon, 12 May 2025 10:02:01 +0000 Received: (at 78360) by debbugs.gnu.org; 12 May 2025 10:01:04 +0000 Received: from localhost ([127.0.0.1]:50373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uEPy3-0007ds-BX for submit@debbugs.gnu.org; Mon, 12 May 2025 06:01:04 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:50198) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uEPxz-0007cd-2K for 78360@debbugs.gnu.org; Mon, 12 May 2025 06:00:59 -0400 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-ad2490d7838so239473566b.0 for <78360@debbugs.gnu.org>; Mon, 12 May 2025 03:00:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1747044052; x=1747648852; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CKk9r5218XRtaFEiPzdabdP8ythgZSMP86pDXjS9YFk=; b=BMaqvMV8P9tvn4uerQXztu8rPCrLwGPo2eut8MbbZNGgX5VfOguEH1TeagtvQlO3PI PJTBWzdRR/RJnSxOd4gn8eai0iuv7HxJmvigVJxTluMqWTQ85jZSFMhEbSV6KraD0Ecj /DQiLUEnyHp9HLDhHDUxhSCLoGdw3D+sfdH0zFIJb52ssZDPb9EXDROCPVcxNVIVqYrl +BBUO1Tc9ub6sbyw/C8GdkD6iikwPvav0lhkU0rZOVUH0+b01l7e/L2StKJe9pMa38/V VcvDmhAj6rG3tnortwpKQFLYs2NdFBj8vaJbD5Emxy7y6UE0SBR1rtqchAUiNwwC/k3e EpRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747044052; x=1747648852; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CKk9r5218XRtaFEiPzdabdP8ythgZSMP86pDXjS9YFk=; b=K3kecOvwjGWy0j1mQ1UBKSknW5kzHBIGcwXLxZjj+feDq//2RE2DvZQcAtSm1vym3V Ax8QMGBbmS1aDCt254M6TKyI1VrUcuvpQSmdDzWorAigL8/bssO6uKu5RvlALA9ccjSn 7MdNaM3BCGw5/3oCfIElL2fbn3w8cfWkYC+cRIfazotvn/nw9ekS/fOJfdCxrt4/0YM5 zNZy18m8vedeFSd5mhRcN7ZwD+rx6Pa5wjXfm2zqITG6AiImbK7Eu3zfsi5D5R7SmnXE fLfkwVDhvOl67rB1Q1lwqdLQSp6alfaVcYE77p/UKm7wDF5UVNOKWZOscHPcp0N3q+z+ GeRQ== X-Gm-Message-State: AOJu0Yzt1tnM006xtn8yayHdvUAklmS3VazqOJdj1CJ3ES72REGFAnIB 0LRMlRZinhmIB8oP+R5KPd5T+YHR0YCisFHOlpV/skWxB3R2L8Sq53trZ4r3I21ef6/Ps2AJvfW nmiREDQ== X-Gm-Gg: ASbGncuryFYnZeHAOAaZR5a3lALSkQ0l3SryVIy8Qe8oiXa5lHJ5tPVUBZEsduRnIbj j9J/cFYSh9ClSKemyD9P17I435uGc8lytiAML/DDvdncO7Afubm3WHYtwMM74Q015v20od7xgrG l4i8Z9UIv7gBaKBuOZkR9NcYaexiD2f/i+yItfUBzEzLLT1448ow3IcgsVrzW1+k1Peyk0GPI2P UOldlg1/8NpmguCGxtxVSwc1uxg7Ff6mPY21S8tkLZ/lr80lyy8ExScocwdrRK4jZ9VUResR5xH 3VXPZjLjHa6w6M4Ba973TAzsmZsDNLuj+V5pDlDgM0KFvYRO X-Google-Smtp-Source: AGHT+IESyama9Heauui2Uy5KuNkJE8oveI25Tj/ZnAuOLUvsLXGw7pYx4Hi/eBM1/VvJ9km/HoLUtQ== X-Received: by 2002:a17:907:6b8e:b0:ac7:cdbb:bf4a with SMTP id a640c23a62f3a-ad218ea82e1mr1240121666b.1.1747044052133; Mon, 12 May 2025 03:00:52 -0700 (PDT) Received: from localhost ([2a02:2454:a095:5600:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad219746730sm601804366b.94.2025.05.12.03.00.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 May 2025 03:00:51 -0700 (PDT) From: Sergey Trofimov Date: Mon, 12 May 2025 12:00:34 +0200 Message-ID: <96964a3ef266a16e88ffa14f364f936a9bf1c9d9.1747043933.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: 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. * 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'