From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id qKEHBGlKiGaNKwAAe85BDQ:P1 (envelope-from ) for ; Fri, 05 Jul 2024 19:32:57 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id qKEHBGlKiGaNKwAAe85BDQ (envelope-from ) for ; Fri, 05 Jul 2024 21:32:57 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=FKeRDEDP; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720207977; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=60+Ad3JYF0+kjY9U3PaUjrW7g4pHOZ5w3TGYfUyijFk=; b=mPXKg7f5LYrueq2c/3+auVh7TTUUCAd5OXx8loeZNYu5nCzrqeakVOBpptpY/N7fW3AHFQ 0IYHd50h8K0ZgSlsphgl/sNBmVYQyx3iBPGiuQVlCdn3yR8J5bLyhWXQRWxjGCny3TAiEP QjuyI0qG78CkuSVlSheKaJmPZrGr2xVfcQkH3OY7hyOFlF56MB7eZ0iS1r5gd3B55GQABf ZJWqx15/enNmh+xHEJJcf2X1XSiWyUJapDFrfXLD5sBjN9Sw0g86AD1NArCmm7qN8AYc87 jobd6aoL2aL0kG7cKsxGHcQx/L5OJODGNNr5aijQfe8j5APtcO5p1HIPU1vdFA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720207977; a=rsa-sha256; cv=none; b=Kp8N+cRAeRk+d5gsP/dh7iyE09A4zMsUTvX/q0z/q6FkwhtaalEuiSuyu4vv777gePVs4H 2pzJOCerrcDx0wNiReFof1JNM+S0l8n8pEar5Ef4LGvFg1gaBs5Ku0aAB9PLjP9EnE4eFi ZzALQntIlWp9niqJAEKMp/qFjCM73anQmS0lIs/Ggrc6SPIM4Dv8PX863vr+lBzx3nSnDR J31Ci4+szS5FCF664da9brZcUIjYIfQCDhRjOZ7EFFZUAbs+KPGUfVcLWK2Hm0hSspD+HT sF4zNGMnwcc94OgORdUktV82LIyr9XM2NJH2CTCar1+gDjgEWakUuZvpYj6i7Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=FKeRDEDP; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9E8647199F for ; Fri, 05 Jul 2024 21:32:56 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPo7C-0000gq-FA; Fri, 05 Jul 2024 14:57:02 -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 1sPo7A-0000gW-BH for guix-patches@gnu.org; Fri, 05 Jul 2024 14:57:00 -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 1sPo7A-00041S-2M for guix-patches@gnu.org; Fri, 05 Jul 2024 14:57:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sPo7B-0007rt-V1; Fri, 05 Jul 2024 14:57:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71954] [PATCH] gnu: xaos: Update to 4.3.2. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 05 Jul 2024 18:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71954 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71954@debbugs.gnu.org Cc: "Artyom V. Poptsov" , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by submit@debbugs.gnu.org id=B.172020580630215 (code B ref -1); Fri, 05 Jul 2024 18:57:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jul 2024 18:56:46 +0000 Received: from localhost ([127.0.0.1]:45014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPo6v-0007rH-Fw for submit@debbugs.gnu.org; Fri, 05 Jul 2024 14:56:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:59662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPo6t-0007rA-VF for submit@debbugs.gnu.org; Fri, 05 Jul 2024 14:56:44 -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 1sPo6q-0000db-Gl for guix-patches@gnu.org; Fri, 05 Jul 2024 14:56:40 -0400 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sPo6o-0003zk-Np for guix-patches@gnu.org; Fri, 05 Jul 2024 14:56:40 -0400 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-52ea5dc3c79so1540275e87.1 for ; Fri, 05 Jul 2024 11:56:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720205796; x=1720810596; darn=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=60+Ad3JYF0+kjY9U3PaUjrW7g4pHOZ5w3TGYfUyijFk=; b=FKeRDEDP0bdKUktGYAsg7t0aGENTNyr3CyzQzFhx+wtLhGQlZoFfew6fuMgVtf5/kV 8vMxaGHRvI+UpX3eJmsmFpgUw9T27o6ypcltWX1Vyb9RPWcN3u8/srgf2meXcQDi3gxw oJZ9xB/qMsx8ZeS7oxF9slT7ylsrCHkAnhSNOfqpCA/iyi60xVF2gK6WZX4kSmpzfGvf AJ1SM79zLsUJpLG3jPyLVWV3OFKSl1T4djU5rp57xs8AkWlhhVnnuGung6Lauy7xcn7X 3ZAsmJG271jZKTfAlRd0syHbXNv3sGxZ1j5AmxTo0mksHmZ0UrJYnBpshRiieMdopgzN f+nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720205796; x=1720810596; 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=60+Ad3JYF0+kjY9U3PaUjrW7g4pHOZ5w3TGYfUyijFk=; b=T7GqNZXaqIuvNn2Gk+h+JgQUvZPUTIQrNb/RnLVri1jlZOqFK6Q4Vs85OSYJ/OaFSn CJ64+FxZwkJ63gKubbqJoTjokZFFtTjSBYPD99Srij18grC90sSe57VQnMP39U61ewrI HQ1iCX+D9jeBndPb8Uh0JAE06raC/DXTOl5wI3V4O51/G54soP2HS6mBHu1j0JGdZ+Vu kBqIcdpRH58hEzd7O6iyQ0pH/MCq1WTIr8cmigMLIihKp8uwsSoTW1lyIQ4zrX/rxf2+ tmhhNPTzVwiPvRARANmUdhwAFj5OnrpFgxnITuIeEyoq1BP+gc9tmWqLPpKQxU1NFJZM v9hg== X-Gm-Message-State: AOJu0Yxtu6auV+sHFFZSGFVxMBopa4glTmgMKKFY82hUQNRJTIZqaaZf ChWQv3Dgr3FAy3ZowAJHIf1uNlEMqsVtvIfpOZ7Y3Nq2wYdVh+JCT4awvg== X-Google-Smtp-Source: AGHT+IGDyivOea3G4vxBHNgk8uYEgcOoj/+PXAmVetqiYwE8JUicOOL1xUUEtrBejQxhDtw5bZfqZg== X-Received: by 2002:ac2:5e24:0:b0:52c:dfa0:dca0 with SMTP id 2adb3069b0e04-52ea06e4cf3mr3396860e87.43.1720205795910; Fri, 05 Jul 2024 11:56:35 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab31676sm2880093e87.243.2024.07.05.11.56.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jul 2024 11:56:35 -0700 (PDT) From: "Artyom V. Poptsov" Date: Fri, 5 Jul 2024 21:56:27 +0300 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::131; envelope-from=poptsov.artyom@gmail.com; helo=mail-lf1-x131.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_PDS_PRO_TLD=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -0.49 X-Spam-Score: -0.49 X-Migadu-Queue-Id: 9E8647199F X-Migadu-Scanner: mx11.migadu.com X-TUID: h9hzF5g+G7YI * gnu/packages/maths.scm (xaos): Update to 4.3.2. [native-inputs]: Remove qtbase-5 and qttools-5; add qtbase and qttools. [arguments]: Use gexps. Fix "PREFIX" variable in "XaoS.pro" during "configure" phase. Change-Id: Ifae9890309368ee4131b531c9ea7b155a3cf693c --- gnu/packages/maths.scm | 84 +++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d39292e825..d00e12a084 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -7066,7 +7066,7 @@ (define-public wcalc (define-public xaos (package (name "xaos") - (version "4.2.1") + (version "4.3.2") (source (origin (method git-fetch) (uri (git-reference @@ -7075,53 +7075,53 @@ (define-public xaos (file-name (git-file-name name version)) (sha256 (base32 - "0maw5am6rrkyjrprfg113zjq37mqj0iaznkg4h2927ff7wrprc94")))) + "0a5n3g1xcsd8k65q5skm4xsdllr3mmkahh4vi59db1l0jv81v06q")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) - ("qtbase" ,qtbase-5) - ("qttools-5" ,qttools-5))) + ("qtbase" ,qtbase) + ("qttools" ,qttools))) (inputs (list libx11 zlib libpng gsl)) ;; The upstream project file ("XaoS.pro") and the Makefile it generates are ;; not enough for this package to install properly. These phases fix that. (arguments - `(#:tests? #f ;no "check" target - #:phases - (modify-phases %standard-phases - (add-before 'configure 'make-qt-deterministic - (lambda _ - ;; Make Qt deterministic. - (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") - #t)) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "XaoS.pro" - ;; The DESTDIR is originally set to install the xaos binary to - ;; the "bin" folder inside the build directory. Setting make - ;; flags doesn't seem to change this. - (("DESTDIR.*$") - (string-append "DESTDIR=" out "/bin")) - ;; Set the correct path to the lrelease binary. - (("lrelease-qt5") "lrelease")) - (substitute* "src/include/config.h" - (("/usr/share/XaoS") - (string-append out "/share/XaoS"))) - (invoke "qmake")))) - (add-after 'install 'install-data - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share"))) - (mkdir-p share) - (for-each - (lambda (folder) - (copy-recursively folder - (string-append share "/XaoS/" folder))) - '("catalogs" "examples" "tutorial")) - (install-file "xdg/xaos.png" - (string-append share "/pixmaps")) - (install-file "xdg/xaos.desktop" - (string-append share "/applications"))) - #t))))) + (list #:tests? #f ;no "check" target + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'make-qt-deterministic + (lambda _ + ;; Make Qt deterministic. + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1"))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "XaoS.pro" + ;; The DESTDIR is originally set to install the xaos binary to + ;; the "bin" folder inside the build directory. Setting make + ;; flags doesn't seem to change this. + (("DESTDIR.*$") + (string-append "DESTDIR=" out "/bin")) + (("/usr/local") + out) + ;; Set the correct path to the lrelease binary. + (("lrelease-qt6") "lrelease")) + (substitute* "src/include/config.h" + (("/usr/share/XaoS") + (string-append out "/share/XaoS"))) + (invoke "qmake")))) + (add-after 'install 'install-data + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share"))) + (mkdir-p share) + (for-each + (lambda (folder) + (copy-recursively folder + (string-append share "/XaoS/" folder))) + '("catalogs" "examples" "tutorial")) + (install-file "xdg/xaos.png" + (string-append share "/pixmaps")) + (install-file "xdg/io.github.xaos_project.XaoS.desktop" + (string-append share "/applications")))))))) (synopsis "Real-time fractal zoomer") (description "GNU XaoS is a graphical program that generates fractal patterns and allows you to zoom in and out of them infinitely in a fluid, base-commit: 922e943059050f05532ac8274e55e25ebe711cf5 -- 2.45.2