From patchwork Mon May 12 12:50:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 42551 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 2256227BC49; Mon, 12 May 2025 13:53:17 +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 6BA2127BC4B for ; Mon, 12 May 2025 13:53:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uESeY-00020G-LC; Mon, 12 May 2025 08:53:07 -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 1uESeW-0001uL-VK for guix-patches@gnu.org; Mon, 12 May 2025 08:53:05 -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 1uESeW-0005ld-4Z for guix-patches@gnu.org; Mon, 12 May 2025 08:53:04 -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=xnJSIp/d9kT4TR8AYyBqQpFxWEPmPSB+LK3bFISrEHY=; b=bQLEqYJLD73nHF9pw7658SYteISWr+5EAH1y+erFI/iPzCjxs4Jx6t5olZ39vBgDKeifxPwpgStosms2vN133tZNFAykV731d2HBibJ9oXZHc6fjVXSexrvC9S4RVMfwUHVfg2x00wHFHjjrK88M96DrEOrs+C8QwFQWuV/2PgBnO10dPTqv5P1u2iX7YIodtm3CZKc/Tkuu8JGJ4yWa/vpz2apknnQBc8ibQUUtCC41vvdTFNxr/FofTWrPkunHpBRS+8rGe6+Ys6E9FfBtyQ143Mx7A4/0uELfnTta4ThzSfECvGFi6BJNkaoyMOli9OIitpr5S9RiAVq32+pOnA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uESeV-0002zl-Ev; Mon, 12 May 2025 08:53:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78360] [PATCH v2 4/7] 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 12:53:03 +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.174705435411388 (code B ref 78360); Mon, 12 May 2025 12:53:03 +0000 Received: (at 78360) by debbugs.gnu.org; 12 May 2025 12:52:34 +0000 Received: from localhost ([127.0.0.1]:51276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uESe1-0002xa-Nf for submit@debbugs.gnu.org; Mon, 12 May 2025 08:52:34 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:45223) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uESdv-0002wb-HF for 78360@debbugs.gnu.org; Mon, 12 May 2025 08:52:28 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43cfebc343dso29518495e9.2 for <78360@debbugs.gnu.org>; Mon, 12 May 2025 05:52:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1747054340; x=1747659140; 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=xnJSIp/d9kT4TR8AYyBqQpFxWEPmPSB+LK3bFISrEHY=; b=QERX5hUSK/vI7Q7wEkSv9xX37tsABvO7Zo1aws05gWqmhrJvuin78E7ZLrkKBXfP0f UoU5+JvxoGRKrpRm9FTdy8r7V6pW/EzgHVnRFeUcSQXb7iwGQbe9wCERtljzeiYMzzjG 5fKJKkn8MzHFrQEb8QookOedRMLQw5nuzWwUciIarvKQ7Vcaw18NVlRG92AOlBioJhIT eNHMaVbZATr9m/l+/d8o5SJnGD7Uc5SlyXMitZBN8ouJ5SYviZZV4ANaqCv1DYXNHluu 68VSjp0fzyyZEZnRjjU49bga6/UDE6DXi+PY+Zes/t+tX/bsrycF8zupb25qR5qTAsmB PhRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747054340; x=1747659140; 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=xnJSIp/d9kT4TR8AYyBqQpFxWEPmPSB+LK3bFISrEHY=; b=tNQyFTpYk8dGSgT3pKbc+HgHPE7GJVUAEfYEIKbSLfs0QGfAZLOvYgY5PfyoxeBJ4m hI+ML2WNCjMuTKiYGfR34uv5iEB6b4KKNumdzMSn0K8K3XlgIn41twhIVr5AI0Nvf+NB g7uQYGXMYq4R46tA3AFjj3Ad5tNoEhTwWiX2fC3cik2AdN4MYmJJz/sXMaE0wuUUJp/7 Ya7CwWeK02pS1CwYAeXEC9KPUPbIH4B774GzUIPqWqGbH34ND1/8f/vDxdpmf3uC9n+w toi7D7yZ/7ZcYKk4HNFFgj/nMRUEXrwvhPQ+Z4dkU8SRYUgEWGBzezVCVbd6C1k4us2m zf0Q== X-Gm-Message-State: AOJu0YwMqjl8JNgwfYokAX7awQzsxaA1jXmzb5mTh8XrbRUQB/ZZ8x1I YSrCoFIppnqcGFBGHSkH2JA1rE4AIntkuxJsn8j8fCsgpCO1UfftOQUL4U1mMZnI37VoigI99Iu W1UZGfA== X-Gm-Gg: ASbGncs9Mv50AUhVsOXMewOe3W7wqQZhaCGEk1NxWlC3g1RO0UoFdVHnYNjE1CPgzV1 a0TjGix+wAbDvb5OPK34E703Qg4PVVKVvRFse+nvISGJlOFTYpn/2BwlRjf4xD6SCoo3K3LQxec YMEzDyvDMIJtAZlif89Glwmu56bsMGCgTzdJksfraH8dVrox/+/7mjQgLugUN2dL8HW8FgE2Htt WkF3TWHe6j/iXGGTJMl0rCcn3Ihsunbu0LyjDJKx3UUJ361+yUKhyAfKb0JOczb8mcgInVJ7X2O WCOXfhtWrq6s63BvIb0DCT0r/0+U+ciqWaBhGnz2oToRXazL X-Google-Smtp-Source: AGHT+IFD03YCxrJlepdIe0be5hmBb5uyLDdJ5uBOskuj3qDmuaeJe5GE9EX3KMGIvqWhH9dXZQ9kkg== X-Received: by 2002:a05:600c:4686:b0:43b:cb12:ba6d with SMTP id 5b1f17b1804b1-442d6d18b8bmr106499285e9.3.1747054340564; Mon, 12 May 2025 05:52:20 -0700 (PDT) Received: from localhost ([2a02:2454:a095:5600:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442cd34bef4sm169844075e9.24.2025.05.12.05.52.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 May 2025 05:52:19 -0700 (PDT) From: Sergey Trofimov Date: Mon, 12 May 2025 14:50:16 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: <5eb21dcbfaf6439f63fc693b6eff18fccae00cf8.1747054118.git.sarg@sarg.org.ru> References: <5eb21dcbfaf6439f63fc693b6eff18fccae00cf8.1747054118.git.sarg@sarg.org.ru> 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