From patchwork Mon May 12 10:00:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 42546 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 C793327BC49; Mon, 12 May 2025 11:04:14 +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,T_PDS_PRO_TLD,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 0DA0B27BC4B for ; Mon, 12 May 2025 11:04:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEPze-0003nn-Bd; Mon, 12 May 2025 06:02:42 -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 1uEPz7-000378-QX for guix-patches@gnu.org; Mon, 12 May 2025 06:02:11 -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 1uEPz3-0001YW-Gj for guix-patches@gnu.org; Mon, 12 May 2025 06:02:05 -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=baPc8w6yTpUz8zHeZp2C4nMwOaAjkIiWZWz0b93jCgs=; b=upO9O1axZpYYVbnnlhLJ8STHUHwghskOFVSVSlFbWB7vLj74XmQ0Vx0/sOhTQlfnr8d20XEBYM6qxzDk36/68xsc8Fxx5692p7z3Kt97HQFBMDa+wSauGZak1fn46H+JK3etDJtIo/ISEnRkZEfQ/xPoxfLNkROS6opS5v3N1Je5YPRf9ErUOVm1+97mp0IiWRRZI1Y8M1yj6KvzHzhPH7yqJaDv4rUcTE53RLp1Z4lAmuPKSEFkb0ScsYSXTV6+QqlXMI4yOvV75X6xs8vKmc2DPhTup71FcYPueL5ZZ8F6K2gmKJg2SpXgcvPAi/nfTo/Ko8ZU4sohHdlszFIFbw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uEPz2-0007hE-3X; Mon, 12 May 2025 06:02:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78360] [PATCH v1 5/6] gnu: cvassistant: Update quazip dependency. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: sarg@sarg.org.ru, andreas@enge.fr, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 12 May 2025 10:02:04 +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 X-Debbugs-Original-Xcc: Sergey Trofimov , Andreas Enge , Maxim Cournoyer Received: via spool by 78360-submit@debbugs.gnu.org id=B78360.174704407429455 (code B ref 78360); Mon, 12 May 2025 10:02:04 +0000 Received: (at 78360) by debbugs.gnu.org; 12 May 2025 10:01:14 +0000 Received: from localhost ([127.0.0.1]:50386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uEPyD-0007ez-Tu for submit@debbugs.gnu.org; Mon, 12 May 2025 06:01:14 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]:46283) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uEPy7-0007dV-KJ for 78360@debbugs.gnu.org; Mon, 12 May 2025 06:01:08 -0400 Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-5fbe7a65609so6881144a12.0 for <78360@debbugs.gnu.org>; Mon, 12 May 2025 03:01:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1747044061; x=1747648861; 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=baPc8w6yTpUz8zHeZp2C4nMwOaAjkIiWZWz0b93jCgs=; b=eZYsmKwMLIYlS/TybJuDL/38UN7Xk1oDuPvh5p/y8Zuzkn7S3Kfn1JV5Q3T5JcI4c0 vz81uLizTGR0YeYaTU3Vktc6/Rukn7KLxTF9muyyoaZs8NLsTHQGXJ9/cxlXDGnuDfb8 DFHSasEVTpCYHDfo2oZUT5EHQTlmM4a3QxdwWaPfTt27NmJFylZD1ZYlumTgLCc+ri61 K1MoqgMgi0+gH0uBwOwViWf5YkanNlZvbR1J+1S1QlDHVtouxyPcYr7uJElYfhcfM+2S ErO91kQIzs6pn8SvVaVHTEl5ro+TTAG9k4sEH7G+vGYvFO4jruoeqFrIutD673nJ2EVh EPFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747044061; x=1747648861; 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=baPc8w6yTpUz8zHeZp2C4nMwOaAjkIiWZWz0b93jCgs=; b=b1Kkck5IyF/es+VmYwFfFQAwAmOs0mDXmYAgS0MYB+qSLIFNfAkb4GXIHqL9+h1wuV EWDYtWSmQTJn63xEVy6o5KKDKdtyc/nUN4ZTO0AnHPAJx8GyNXbD7Sx56PugaeVZ0Hbb xhYjay2yIuYHBljL6dFTLRjJ69bKglmNccGtWTOIVWD2PvqXzU6dtexaCqnrauD0Iche TxkJ7OV5xKWq13PdS4nFFmXhij/wkJ+DfzKaVD5Z3+7rSzBLduKk0TyHK3NH1xXFC+bl TSd7nDzoN7xIjvvoftW8pKwwgBb7Mw3eDNgcCShIcemIzru7jiP0X+pHcqx610t5vFBZ db1w== X-Gm-Message-State: AOJu0YwDCawzMXqEoBI1b3ki1K940ylLUi+R8ryvd0TQoss0sAMwhq5n zZGPCx5/xBTfF2kdhKJZLUox6YSv7f9X0lgSvFPb/lS/mxZFmrRZfWwcQjGwwbsW3pQsRv3B2qL 9cDYEAQ== X-Gm-Gg: ASbGncu7uziIQv/CgLzAHOs9Imvb/vU+6iCASdJLq0gaxYLD8aQ17DlI+teB63Lp6zm C2+XZwYSohlwzZaU8MmPiQGjX03A3zarymncw7Cdefr9U1EmFM9nVGYUPR/KdSbfzYKUS1lF9s7 RDnfpKC8B8l+PXgtUG/nKYcVECeWgs3fM13z8U/JyaY7rw3cRhk0DxizIFDwIgzlENaDwp2XcZO ZxEs6Fmxzif8uaH7bl/yWux1zu77Z1HT3HVbHkMXv2Pa4WnoQA9vRnKnXDS+euyg/0uMrt/peyC oJ+mmM+I5oG+j4lNuBPv8eL5b6r6OrJMadWlrKFo/++u8yepWm2cAswRJGg= X-Google-Smtp-Source: AGHT+IFSktblN2aSBxQ4qJcYStorknzP0SK6j7qRD9t5Tb54PBHO2NEO5SwiDypY/Ffzx60AO+K90w== X-Received: by 2002:a17:907:c717:b0:ace:c505:3349 with SMTP id a640c23a62f3a-ad218e3f64fmr1245332766b.12.1747044061172; Mon, 12 May 2025 03:01:01 -0700 (PDT) Received: from localhost ([2a02:2454:a095:5600:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad2197bd398sm591127566b.152.2025.05.12.03.01.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 May 2025 03:01:00 -0700 (PDT) From: Sergey Trofimov Date: Mon, 12 May 2025 12:00:38 +0200 Message-ID: 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/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