From unknown Fri Jun 20 18:21:16 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#70880 <70880@debbugs.gnu.org> To: bug#70880 <70880@debbugs.gnu.org> Subject: Status: [PATCH 0/8] gnu: prusa-slicer: Update to 2.7.4. Reply-To: bug#70880 <70880@debbugs.gnu.org> Date: Sat, 21 Jun 2025 01:21:16 +0000 retitle 70880 [PATCH 0/8] gnu: prusa-slicer: Update to 2.7.4. reassign 70880 guix-patches submitter 70880 "Artyom V. Poptsov" severity 70880 normal tag 70880 moreinfo patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat May 11 13:57:13 2024 Received: (at submit) by debbugs.gnu.org; 11 May 2024 17:57:13 +0000 Received: from localhost ([127.0.0.1]:49599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5qy9-0004Dy-7G for submit@debbugs.gnu.org; Sat, 11 May 2024 13:57:13 -0400 Received: from lists.gnu.org ([209.51.188.17]:50368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5qy8-0004Ds-77 for submit@debbugs.gnu.org; Sat, 11 May 2024 13:57:12 -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 1s5qy8-0000BB-Go for guix-patches@gnu.org; Sat, 11 May 2024 13:57:12 -0400 Received: from mail-lj1-x230.google.com ([2a00:1450:4864:20::230]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s5qy7-0007S6-00 for guix-patches@gnu.org; Sat, 11 May 2024 13:57:12 -0400 Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2e3efa18e6aso28387451fa.0 for ; Sat, 11 May 2024 10:57:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715450228; x=1716055028; 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=rB0dvtPk9B8EFQI5kexazuwUu1QADeIcExJLHftPnkY=; b=BQTfu0Pu3vQSL5QWq1KoVmyj8ahYCSjhlltEIbfNhLl/V+MMT1SrfICPLYwSpnddP3 b9B+Q0g8EHbpJQAOiRpG+wncKl8jkFuZ48UDJwRHyg/qefgir7HGuj44cRpO779wRp6q nwk07I8+WcaIJNSsofRgvGnbb4AaoAVVxOSlTO+wtTb9ib1OdQ88zzTVpxi4OzkTI58u NEx+hDznzDiuHXcPrD5R//1NHJk3bRxjoc09NLzWcr/uxsMcQZ8dwufDFm/uPBnXqHVC pG3GTBiTuWyB4GmpcQb4c2oBspqyIcmSyJjIjDft2qM4AAWrzWeKNF0Z4Oh590xffTW2 ndGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715450228; x=1716055028; 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=rB0dvtPk9B8EFQI5kexazuwUu1QADeIcExJLHftPnkY=; b=MhGQR90oDuBfTNJAx9i33ztJy44ZL4pN8srI7z8X6+Xui798Vv1/TLjCMuxZ82PzBt ofudu/VMj8LKoKl4BYPcR4ND36UuwrDAP55LWGH/Vl5LQUXjn8N9b0iiFcQTaifgH9vq EVsJpRxETo4C4RcCOLuO7LsYGl4NJvDQQ8xLIWLBI8jC91v2TRF6iRnaJTivb3Jq+fCA 70IyK5iF1kmXqN4cBGrdQffS+e89X7fzaSxJPwnrxkWup0hDhCelJXCWV4fU26meeS95 GyyukUDP26MWCDoT0M6b2myXTkis2XUbNkpyp+Jqsfsu3PfcRyqyuCZYYt31TE8ro1sr UMLQ== X-Gm-Message-State: AOJu0YzmKs1Np4CwwJD+XtXLY51G0nO4x59UV7G4kfCPUfNupeWiwp54 xpX5+uVz7J/dJ3eJIjF8/laiTL32y/Qv0pIMPfl+820OM8JNtg+/hGGkpA== X-Google-Smtp-Source: AGHT+IHZ2cJpihn09dkHa+houSZEfDP3rfPbaYmZzXEN/sAs56Ezd3uLMsf1b4WWz+0e8tz6k+vDcg== X-Received: by 2002:a2e:b609:0:b0:2e5:5ea1:aeef with SMTP id 38308e7fff4ca-2e55ea1af34mr9714531fa.11.1715450227741; Sat, 11 May 2024 10:57:07 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e4d0ce9bc4sm8611051fa.56.2024.05.11.10.57.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 10:57:07 -0700 (PDT) From: "Artyom V. Poptsov" To: guix-patches@gnu.org Subject: [PATCH 0/8] gnu: prusa-slicer: Update to 2.7.4. Date: Sat, 11 May 2024 20:56:23 +0300 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::230; envelope-from=poptsov.artyom@gmail.com; helo=mail-lj1-x230.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This patch set updates PrusaSlicer to 2.7.4. Artyom V. Poptsov (8): gnu: cgal: Update to 5.6.1. gnu: glfw: Update to 3.3.10. gnu: glfw-3.4: New variable. gnu: libigl: Update to 2.4.0. gnu: heatshrink: New variable. gnu: Add prusa-libbgcode. gnu: Add prusa-wxwidgets. gnu: prusa-slicer: Update to 2.7.4. gnu/local.mk | 3 +- gnu/packages/compression.scm | 54 +++ gnu/packages/engineering.scm | 360 +++++++++++++----- gnu/packages/gl.scm | 20 +- gnu/packages/graphics.scm | 6 +- .../patches/heatshrink-add-cmake.patch | 111 ++++++ .../patches/prusa-slicer-boost-fixes.patch | 97 ----- .../prusa-slicer-with-cereal-1.3.1.patch | 52 --- 8 files changed, 450 insertions(+), 253 deletions(-) create mode 100644 gnu/packages/patches/heatshrink-add-cmake.patch delete mode 100644 gnu/packages/patches/prusa-slicer-boost-fixes.patch delete mode 100644 gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch base-commit: 014875b29e68da6357a5323e6dd1eaa74a05b753 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat May 11 14:00:01 2024 Received: (at 70880) by debbugs.gnu.org; 11 May 2024 18:00:01 +0000 Received: from localhost ([127.0.0.1]:49621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0q-0004HQ-E9 for submit@debbugs.gnu.org; Sat, 11 May 2024 14:00:01 -0400 Received: from mail-lf1-f42.google.com ([209.85.167.42]:60647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0o-0004Gr-2a for 70880@debbugs.gnu.org; Sat, 11 May 2024 13:59:59 -0400 Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-52232d0e5ceso1172806e87.0 for <70880@debbugs.gnu.org>; Sat, 11 May 2024 10:59:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715450331; x=1716055131; 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=DXYI9HN2W7SlnQgbh7SLHKpr6qw3NnggO6868wlCKZg=; b=NkLBV0YeQsFF0mMe/S2xEfB4EZsaGHWTVK4pCdZs20AosnQsCuVNb4ocmuFn/61k5H jXsRGvn+T3Efdz/jMApeCIDuWUtqHIQEtEEAZ76PTy6nOjKiOLqbQ5L0dz708g7oxiCa q8KnaeO9Pcgo6ElhxuOu+R7VaCzrMufjH5xj1TrEXCe1gL1i6mwWRAT9nhLG2r2FMBxl IjLCnAi0+rqyFo7NjatuHHVt2mSn3UPvRW2mpCSNiass2alqqQqnDMrO1bOJiST9f+Qa 69XOMRmm2w7Mk1zGtjU2qO7rcczxht7sYKlofiDAlWyA3JBJDOAy1TqX9XV2ZQ6ame4c IgaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715450331; x=1716055131; 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=DXYI9HN2W7SlnQgbh7SLHKpr6qw3NnggO6868wlCKZg=; b=HfdPLgp3tD1yQDAGIqECbgMe9tYFjgCVgCtnenY6Gt0ohpmhNLeXiXE4Up6FagTjSt bQCH/ihTdeVLhsKR9Owq2lgHtmy5Glm1WOhorIRL78snGeDnAyr+uflVaKmn3omrcwkR 1BXIwVlMibk0meI4NNTQeneULdN0t2mMgjKOnzamVEqzuk3aFPPVW2JMWCF5PE0GU6/K UydrfhMC/MM2GowE5gXrP0V1AuQWE7roySEbATz2gMa6E2Wozb0mAyhDR6RkXlEhgEDY lb99BM3UU748X5zUcq6l4DbVyP0fiKwtzG8zg2shWVBPkGrx6U6anqJkXDxSUGoQsW8S 28Ig== X-Gm-Message-State: AOJu0YxE5GfRgYmPlVWgqsGQ1ppHuMamiPMYYRdduWy/cD+Sr+QoNCQ+ PHGjeYCwuIBv1R/TQ4T2xXYTw3N9OppQLGM5uHq3oZ5fX96CJ/o+l7cW2w== X-Google-Smtp-Source: AGHT+IEEgWtzGIqwvQ4ka9LWvPl2uYQeG6d4sbUpBkvoUtUAMS/5V5msbXNH2+AkUQIXyrWZuDveDA== X-Received: by 2002:ac2:560a:0:b0:51c:ee04:3732 with SMTP id 2adb3069b0e04-5220fb77553mr3597783e87.7.1715450330857; Sat, 11 May 2024 10:58:50 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f35ad59asm1075411e87.45.2024.05.11.10.58.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 10:58:50 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH 1/8] gnu: cgal: Update to 5.6.1. Date: Sat, 11 May 2024 20:58:29 +0300 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/graphics.scm (cgal): Update to 5.6.1. Change-Id: Id909fc7be5d421496e6a3cd87d366f437f76bcfa --- gnu/packages/graphics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index ca2d74224f..cfd908be68 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -36,7 +36,7 @@ ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2023 David Thompson ;;; Copyright © 2023 Eric Bavier -;;; Copyright © 2023 Artyom V. Poptsov +;;; Copyright © 2023, 2024 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -775,7 +775,7 @@ (define-public openshadinglanguage (define-public cgal (package (name "cgal") - (version "5.2.2") + (version "5.6.1") (source (origin (method url-fetch) (uri (string-append @@ -783,7 +783,7 @@ (define-public cgal "/CGAL-" version ".tar.xz")) (sha256 (base32 - "0yjzq12ivizp23y7zqm30x20psv9gzwbcdrhyd3f7h0ds94m1c40")))) + "0dsqvnyd2ic50pr28gfz34bpnyx3i2csf1rikmc661hywdz5xcfd")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat May 11 14:00:03 2024 Received: (at 70880) by debbugs.gnu.org; 11 May 2024 18:00:03 +0000 Received: from localhost ([127.0.0.1]:49624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0r-0004Hm-7m for submit@debbugs.gnu.org; Sat, 11 May 2024 14:00:03 -0400 Received: from mail-lf1-f45.google.com ([209.85.167.45]:42018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0n-0004Gq-EW for 70880@debbugs.gnu.org; Sat, 11 May 2024 13:59:59 -0400 Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-51fa75d54a4so2704681e87.0 for <70880@debbugs.gnu.org>; Sat, 11 May 2024 10:59:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715450332; x=1716055132; 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=2AMtb208lwYep0bHpy/hhr8U8BXHYCoDAf/UrFJbZjE=; b=BKvH/vGYViwtGMmT4R8CPC6MOLog86kfLhJUuT90sMV4wyPB/pMihzuKFg/PuDj5x0 DXxaXQ2ea5ZQr3L9d23G1t0IZ4AJDzsxA+Rw+GbXtuCKNZC+LPLL4G75FeaCSLRJuieN Cz+4vIl7vSNnM2RPV6pzQ9s/JGuLBrtOxmp4goLxdG9YCP6vYMKVZsXRb3ywGkOMQRDN UmMcQlQ2jJ/sdRmuzPZCQY0Qz8TmEuILUUnwQZmv1ezbQIMGp9LUgFCkpGilq+0e79cO 7NStLK2nh4huQpDV0m6Erfah+n3vZZyFaM2pDdTeFFfzWxglzJ0MJp+JeETzOu6x4rGo upOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715450332; x=1716055132; 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=2AMtb208lwYep0bHpy/hhr8U8BXHYCoDAf/UrFJbZjE=; b=QCPKL/JnAsHC51lYkPutccmUU3WrQsY9/c1Ps59VhSUmx53llGnGYS+wwg4KwEzY7e ecg1W2CR0gy2pR1aK9L7liKHDAuil4sf0SJO+pf8DO76RJEmSFlx8qpB2rlRg4Mj8ciV HUE7dyxEpyt36+gYbBRhoS9LBioytYGsunHTQQB15QQViGSXH26GckefGlh3aMGT3hLy OP+WDCT+1L7GCet7hfAH3Q6JP1rOwwgBYDRWdIhkkrUXYpy3hljD45ajCGhmNl+arpDC 3MMnHw7vf/BPyxWFTrHxA0gXwG2HxofOjLxoMNyok639aAWPwyzdOQsn0+TjpDR9ZLAB Djig== X-Gm-Message-State: AOJu0YzetpQ+VckxUgZzxDGw0iMxg8Xx41PJbL+Z30DYnekugBzS3e3m McqfuX3XoCRNagzDcNMK5I/nIW1sAudMHpWYrgsbN7XJXH0tr1Lnkxwf2w== X-Google-Smtp-Source: AGHT+IFy2ulbT2qCMVO9Qf5wb7bERyOsw+9ExabcFqK2dKOzNb4LUfwvhv6XpNd0WDAhRUp45UbBtg== X-Received: by 2002:a05:6512:2116:b0:51f:25f8:7757 with SMTP id 2adb3069b0e04-521e155a1afmr2501827e87.32.1715450331743; Sat, 11 May 2024 10:58:51 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f35ad59asm1075411e87.45.2024.05.11.10.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 10:58:51 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH 2/8] gnu: glfw: Update to 3.3.10. Date: Sat, 11 May 2024 20:58:30 +0300 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gl.scm (glfw): Update to 3.3.10. Change-Id: I9d789fb74af4ed649102195891adc5e437883d30 --- gnu/packages/gl.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 2100bb4872..f40ddaeb86 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2023 Kaelyn Takata ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Liliana Marie Prikler +;;; Copyright © 2024 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -924,7 +925,7 @@ (define-public soil (define-public glfw (package (name "glfw") - (version "3.3.9") + (version "3.3.10") (source (origin (method url-fetch) (uri (string-append "https://github.com/glfw/glfw" @@ -932,7 +933,7 @@ (define-public glfw "/glfw-" version ".zip")) (sha256 (base32 - "023dn97n4h14n5lbjpzjv0y6a2plj254c0w3rr3wraf3z08189jm")))) + "1f5xs4cj1y5wk1jimv1mylk6n6vh7433js28mfd1kf7p2zw3whz8")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat May 11 14:00:14 2024 Received: (at 70880) by debbugs.gnu.org; 11 May 2024 18:00:14 +0000 Received: from localhost ([127.0.0.1]:49633 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0y-0004JM-GC for submit@debbugs.gnu.org; Sat, 11 May 2024 14:00:14 -0400 Received: from mail-lf1-f52.google.com ([209.85.167.52]:51596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0o-0004Gu-KZ for 70880@debbugs.gnu.org; Sat, 11 May 2024 13:59:59 -0400 Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-51f45104ef0so3173948e87.3 for <70880@debbugs.gnu.org>; Sat, 11 May 2024 10:59:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715450333; x=1716055133; 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=6FXxTwgMR0W45834W+eUPi4buGr5VuduWQ5nRe9PEGk=; b=aiMhgxlCt3uLeZ7ufNt3vMhAhlTJ2ReCdra0mMvqiX0Ac6XyGrjK4agqtwBph4M051 ziX6Tfjprc4KlaNNpOWUwBxfqrY3rM+1ZI2csgOaqxpGovQR2rbCejFwWeh6MZpmAJ2k 38PobAY6X0y3CHbk7OQCnM8J+7OQBgnZ0CnjdYr6Ov7KeNBKdioXP80JlEDBflPk71h8 v2B4CMXYbIhX0eZwyN9BBjz9y3DG5LUGFsLCy3pRA7jjRSZbXhTP//QJ4q7MqEM/RBcI x2DuTrDA9r8AZ6iA+4j5AYTBCF4VEMpO0ddYCWPkt8jEFGEZLwH8A7UZ6dX1jSz03eCT MZdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715450333; x=1716055133; 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=6FXxTwgMR0W45834W+eUPi4buGr5VuduWQ5nRe9PEGk=; b=mnadZ6GmD9wUSyV81s5TwlTTwWuTBCP27BlPgS7JWYdCxUg8TLneqmvMHaJzktx1rS 62c/1O0N90+5pFNozlN1EXe3pq/NLhOdIBhC8Xt88dwNGGBavAyKgfajVD4vUAk7nlXS ARTjmUqi5wb2wTuqm9aiLhnS6z2YuXOW2mNI4kxlxXtVptUr379zSav+fiXgiIbIAPKp FGT+5ok/b1WrJli2Z1tFd7ndaQZWKrsMdaClUWp6A+onaP1HGzwv77kJmv64iSMskFZu RrnWrDjr4uznTc026T4+oM5dPcA7dpXJdO+9K7Z58MCKsAaoUqDSyP9KSqURbjuXlalT rs2Q== X-Gm-Message-State: AOJu0YwWaNaJZ14WLxFs88K5s5y4JyuGrILMaLtFWi9eURX0ZiOar4L6 XZsc1xvb0aYA4kXtEsrhxpljhgggQQmTr/H1k6F/HT4otKsPTS3RJHFM/g== X-Google-Smtp-Source: AGHT+IEdafnHNuw8xuZtsoImDv52KNCSqxw6jJ/ZBd0MizYJzPqiO8ntIGOgYgB/WQ3GtsKnUx0Qaw== X-Received: by 2002:a19:5f0d:0:b0:51d:d4e8:c71c with SMTP id 2adb3069b0e04-5220fc6d501mr3202349e87.36.1715450332824; Sat, 11 May 2024 10:58:52 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f35ad59asm1075411e87.45.2024.05.11.10.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 10:58:52 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH 3/8] gnu: glfw-3.4: New variable. Date: Sat, 11 May 2024 20:58:31 +0300 Message-ID: <5bea79f76507d2150d32cd58c7369671ab35f8e7.1715450052.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gl.scm (glfw-3.4): New variable. Change-Id: I77f2214c78f35455436897a3fbff083331295314 --- gnu/packages/gl.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f40ddaeb86..2d684e9c80 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -995,6 +995,21 @@ (define-public glfw and surfaces, receiving input and events.") (license license:zlib))) +(define-public glfw-3.4 + (package + (inherit glfw) + (version "3.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/glfw/glfw" + "/releases/download/" version + "/glfw-" version ".zip")) + (sha256 + (base32 + "1sd396kkn53myp61kxrd18h7b1q4ix173hhxhvl0iz8j4x5h1v5m")))) + (inputs (modify-inputs (package-inputs glfw) + (prepend pkg-config))))) + (define-public nanovg-for-extempore (let ((version "0.7.1") (revision "0") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat May 11 14:00:17 2024 Received: (at 70880) by debbugs.gnu.org; 11 May 2024 18:00:17 +0000 Received: from localhost ([127.0.0.1]:49635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r14-0004JV-63 for submit@debbugs.gnu.org; Sat, 11 May 2024 14:00:17 -0400 Received: from mail-lf1-f54.google.com ([209.85.167.54]:53503) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0p-0004H0-T9 for 70880@debbugs.gnu.org; Sat, 11 May 2024 14:00:02 -0400 Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-51ffff16400so5020028e87.2 for <70880@debbugs.gnu.org>; Sat, 11 May 2024 11:00:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715450334; x=1716055134; 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=6tDDgPXawOPva5/mjmQe1mB6SdKc4kB04yjwSPs+kGA=; b=WmXE0P5s2gbsAsxoQbMEwrKF19fiEhE9445ZVG+jEQesOT3QEtwDKb0/SaYvKE/kOS 65tqAC6Ae936o60rMnraW66K9CNeJGr2hXNgVZBjtI6Z/+oEimdqtfhTrOEoTLxrjzjs jWsNhShUgxfkT66T6O9H9N9Yqz24hEvYni6t+UFjMSSXKL+QeXmXooeVdi/Zsyk5kjrN wtQ1pPztNFcaL1rF0U/zP7Ryu8I3DLdwckM1HfE982gruPNGMdcs+SA1W5hCfhDtshkD mPx99ahn1OcuHnS/9ivrscayJuTJvQsfFJvHCxttFg2SUj8zxhefb2tmCUQWuIie9k1y 2Tnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715450334; x=1716055134; 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=6tDDgPXawOPva5/mjmQe1mB6SdKc4kB04yjwSPs+kGA=; b=INC6A2D6RZmYcnKRyN2pP2lqPs01YYOgHz7v2dLRa0494oz70pByOlLogPdpV8gfYW wjq6hGcsIfTCiKPPwVdFgqvdXzLmhQEllvjPWeCZ3atovb72a/O9vCTwcXcv64321/sR Y7rloKYsuUKlTJt8KA2B2E9zGvkp8MaF3/Z4Jur5kAo0q9gKcEcIb7IikkH0n9CPdNB+ 39D6gXnyp7cSp9cb1SrvI0Zb110RcDeTdikJCPNj2NOEj/l0VUl4G8dQkzg/iXPyZ1Pj WN6bqeqgaVooiA4Uk3cI3ux95DLIGalMIivEt/13AOGJf4HxK2k8ZbJTRcXaIxSocoNs pPyg== X-Gm-Message-State: AOJu0Yy0NaTOgVm7ztnl8iEQo197Zy3O7fu/zYVWVugvffiY3Ec5IcMr PbM/CVW+A+ukMTnLA4KhvhhKO6iVBFCc3B5/wlDAOp28fxuohv2kGcJ4cQ== X-Google-Smtp-Source: AGHT+IGn+lcO7J5rfFAaVV84CkMARcNXjKDFtXAtmz5VMyUUuj69FRImX7qlwp04h887glxFdq9otw== X-Received: by 2002:a05:6512:220a:b0:522:3487:3f3b with SMTP id 2adb3069b0e04-52234874078mr2330096e87.36.1715450333987; Sat, 11 May 2024 10:58:53 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f35ad59asm1075411e87.45.2024.05.11.10.58.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 10:58:53 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH 4/8] gnu: libigl: Update to 2.4.0. Date: Sat, 11 May 2024 20:58:32 +0300 Message-ID: <78bd2eeee639dd0d324266dadb6d982405ab6242.1715450052.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (libigl): Update to 2.4.0. [arguments]: Use Gexps. Update configure flags. Disable GLFW tests as they are failing with SEGFAULT errors (see .) Update "unpack-external" phase: add new dependencies. Update "patch-cmake" phase to prevent CMake from trying to download external dependencies. Help CMake to find the package inputs. Add "fix-assertions" and "install-copyleft-modules" phase. [native-inputs]: Add catch2. [inputs]: Use glfw-3.4. Add openblas, imgui and spectra. Add libigl packages and imguizmo. Remove catch2. Change-Id: Ib4ac842dc14fe1cbc6b0b87674bae1f261a1a970 --- gnu/packages/engineering.scm | 258 ++++++++++++++++++++++++----------- 1 file changed, 179 insertions(+), 79 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 4e30772296..1a0b136952 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -33,7 +33,7 @@ ;;; Copyright © 2022 Malte Frank Gerdes ;;; Copyright © 2022 Konstantinos Agiannis ;;; Copyright © 2022 Greg Hogan -;;; Copyright © 2022 Artyom V. Poptsov +;;; Copyright © 2022-2024 Artyom V. Poptsov ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022, 2023 Felix Gruber ;;; Copyright © 2023 Theofilos Pechlivanis @@ -161,6 +161,7 @@ (define-module (gnu packages engineering) #:use-module (gnu packages text-editors) #:use-module (gnu packages time) #:use-module (gnu packages tls) + #:use-module (gnu packages toolkits) #:use-module (gnu packages tree-sitter) #:use-module (gnu packages version-control) #:use-module (gnu packages web) @@ -3531,7 +3532,7 @@ (define-public xfoil (define-public libigl (package (name "libigl") - (version "2.3.0") + (version "2.4.0") (source (origin (method git-fetch) @@ -3541,90 +3542,151 @@ (define-public libigl (file-name (git-file-name name version)) (sha256 (base32 - "004a22ifq2vibgkgvrlyihqimpsfizvq5l448204kwfg3lkycajj")))) + "0qlnpp8nxbahcky4d67dzn0ynbv3v037nbx1akq6h5rzhvkzq40x")))) (build-system cmake-build-system) (arguments - `(#:configure-flags - '("-DLIBIGL_USE_STATIC_LIBRARY=OFF" - "-DLIBIGL_BUILD_TESTS=ON" - "-DLIBIGL_BUILD_TUTORIALS=OFF" - "-DLIBIGL_EXPORT_TARGETS=ON" - ;; The following options disable tests for the corresponding libraries. - ;; The options do not affect whether the libraries are linked to - ;; libigl or not, they are used for tests. - "-DLIBIGL_WITH_COMISO=OFF" - "-DLIBIGL_WITH_CORK=OFF" - "-DLIBIGL_WITH_MATLAB=OFF" - "-DLIBIGL_WITH_MOSEK=OFF" - "-DLIBIGL_WITH_TRIANGLE=OFF" ;; Undefined reference to "triangulate". - "-DLIBIGL_WITH_OPENGL_GLFW_IMGUI=OFF") + (list #:configure-flags + #~(list "-DLIBIGL_USE_STATIC_LIBRARY=OFF" + "-DLIBIGL_BUILD_TESTS=ON" + "-DLIBIGL_BUILD_TUTORIALS=OFF" + "-DLIBIGL_INSTALL=ON" + "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" + (format #f "-DCatch2_DIR=~a/lib/cmake/catch2/" + #$(this-package-input "catch2")) + (format #f "-DSpectra_DIR=~a/share/pectra/cmake/" + #$(this-package-input "spectra")) + ;; The following options disable tests for the corresponding libraries. + ;; The options do not affect whether the libraries are linked to + ;; libigl or not, they are used for tests. + "-DLIBIGL_WITH_COMISO=OFF" + "-DLIBIGL_WITH_CORK=OFF" + "-DLIBIGL_MATLAB=OFF" + "-DLIBIGL_MOSEK=OFF" + ;; XXX: GLFW tests are failing with SEGFAULT. See + ;; + "-DLIBIGL_GLFW_TESTS=OFF") + #:build-type "Release" #:phases - (modify-phases %standard-phases + #~(modify-phases %standard-phases (add-after 'unpack 'unpack-external (lambda _ (setenv "HOME" (getcwd)) ;; cmake needs this to export modules (mkdir "external") (copy-recursively (assoc-ref %build-inputs "libigl-glad") "external/glad") - (copy-recursively (assoc-ref %build-inputs "libigl-stb") "external/stb") + (copy-recursively (assoc-ref %build-inputs "libigl-test-data") "external/test-data") + (copy-recursively (assoc-ref %build-inputs "libigl-comiso") "external/comiso") (copy-recursively (assoc-ref %build-inputs "libigl-tetgen") "external/tetgen") - (copy-recursively (assoc-ref %build-inputs "libigl-predicates") "external/predicates"))) + (copy-recursively (assoc-ref %build-inputs "libigl-predicates") "external/predicates") + (copy-recursively (assoc-ref %build-inputs "imguizmo") "external/imguizmo") + (copy-recursively (assoc-ref %build-inputs "eigen") "external/eigen"))) (add-after 'unpack-external 'patch-cmake - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) + (define (source-dir library-name) + (format #f "SOURCE_DIR \"~a\"" + (assoc-ref %build-inputs library-name))) + (define (fix-external-library cmake source) + (substitute* (format #f "cmake/recipes/external/~a.cmake" + cmake) + (("GIT_REPOSITORY.*") (source-dir source)) + (("GIT_TAG.*") ""))) ;; Fix references to external libraries - (substitute* "cmake/libigl.cmake" - (("if\\(NOT TARGET Eigen3::Eigen\\)" all) - (string-append "find_package(Eigen3 CONFIG REQUIRED)\n" all)) - (("if\\(NOT TARGET CGAL::CGAL\\)" all) - (string-append "find_package(CGAL CONFIG COMPONENTS Core)\n" all)) - (("if\\(NOT TARGET tinyxml2\\)" all) - (string-append "find_package(tinyxml2 CONFIG REQUIRED)\n" - "if (NOT TARGET tinyxml2::tinyxml2)")) - (("if\\(NOT TARGET embree\\)" all) - (string-append "find_package(embree 3 CONFIG REQUIRED)\n" all)) - (("if\\(NOT TARGET glfw\\)" all) - (string-append "find_package(glfw3 CONFIG REQUIRED)\n" all)) - (("igl_download_glad\\(\\)" all) "") - (("igl_download_stb\\(\\)" all) "") - (("igl_download_tetgen\\(\\)" all) "") - (("igl_download_triangle\\(\\)" all) "") - (("igl_download_predicates\\(\\)" all) "")) - (substitute* "tests/CMakeLists.txt" - (("igl_download_test_data\\(\\)") "") - (("set\\(IGL_TEST_DATA.*") - (format #f "set(IGL_TEST_DATA ~a)\n" - (assoc-ref %build-inputs "libigl-test-data"))) - (("igl_download_catch2\\(\\)") "find_package(Catch2 CONFIG REQUIRED)") - (("list\\(APPEND CMAKE_MODULE_PATH \\$\\{LIBIGL_EXTERNAL\\}/catch2/contrib\\)") - "") - (("add_subdirectory\\(\\$\\{LIBIGL_EXTERNAL\\}/catch2 catch2\\)") "")) - ;; Install otherwise missing headers - (substitute* "cmake/libigl.cmake" - (("install_dir_files\\(copyleft\\)" all) - (string-join (list all - "install_dir_files(copyleft/cgal)" - "install_dir_files(copyleft/opengl)" - "install_dir_files(copyleft/tetgen)" - "install_dir_files(embree)" - "install_dir_files(opengl)" - "install_dir_files(png)" - "install_dir_files(predicates)" - "install_dir_files(xml)") - "\n")))))))) + (fix-external-library "comiso" "libigl-comiso") + (fix-external-library "tetgen" "libigl-tetgen") + (fix-external-library "triangle" "libigl-triangle") + (fix-external-library "predicates" "libigl-predicates") + (fix-external-library "glad" "libigl-glad") + (fix-external-library "libigl_tests_data" "libigl-test-data") + (fix-external-library "stb" "libigl-stb") + (substitute* "cmake/recipes/external/imguizmo.cmake" + (("if\\(TARGET imguizmo::imguizmo\\)") + "if(true)") + (("target_link_libraries.*") + (format #f "include_directories(~a/include/imgui/)" + (assoc-ref inputs "imgui")))) + + (substitute* "cmake/igl/igl_add_test.cmake" + (("include\\(\".*/contrib/Catch.cmake\"\\)") + (format #f + "include(\"~a/lib/cmake/Catch2/Catch.cmake\")" + (assoc-ref inputs "catch2")))) + (substitute* "cmake/recipes/external/cgal.cmake" + (("FetchContent_Populate\\(cgal\\)") + "find_package(CGAL CONFIG COMPONENTS Core)\nreturn()")) + (substitute* "cmake/recipes/external/eigen.cmake" + (("FetchContent_Populate\\(eigen\\)") + "find_package(Eigen3 CONFIG REQUIRED)\nreturn()")) + (substitute* "cmake/recipes/external/catch2.cmake" + (("message.*") + "find_package(Catch2 CONFIG)\nreturn()")) + (substitute* "cmake/recipes/external/libigl_imgui_fonts.cmake" + (("if\\(TARGET igl::imgui_fonts\\)") + "if(true)")) + (substitute* "cmake/recipes/external/tinyxml2.cmake" + (("FetchContent_Populate\\(tinyxml2\\)") + "find_package(tinyxml2 CONFIG REQUIRED)\nreturn()")) + (substitute* "cmake/recipes/external/embree.cmake" + (("FetchContent_MakeAvailable\\(embree\\)") + (string-join (list "find_package(Embree 3 CONFIG)" + "add_library(embree::embree ALIAS embree)" + "return()") + "\n"))) + (substitute* "cmake/recipes/external/glfw.cmake" + (("FetchContent_MakeAvailable\\(glfw\\)") + (string-join + (list "find_package(glfw3 CONFIG REQUIRED)" + "add_library(glfw::glfw ALIAS glfw)" + "return()") + "\n"))) + (substitute* "cmake/recipes/external/imgui.cmake" + (("FetchContent_MakeAvailable\\(imgui\\)") + "return()")))) + + (add-after 'unpack-external 'fix-assertions + (lambda _ + ;; Current Tetgen version has a bug. + (substitute* "include/igl/copyleft/tetgen/tetgenio_to_tetmesh.cpp" + (("assert\\(out.numberofpoints == out.numberofpointmarkers\\);") + ";")) + ;; CGAL has a bug in assertion as well. + (substitute* "include/igl/copyleft/cgal/trim_with_solid.cpp" + (("assert\\(I.size\\(\\) == Vr.rows\\(\\)\\);") + ";")))) + + ;; XXX: Install modules as CMake fails to install them. + (add-after 'install 'install-includes + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (include-dir (string-append out "/include/igl/"))) + (for-each (lambda (module) + (copy-recursively (format #f "../source/include/igl/~a" + module) + (format #f "~a/~a" include-dir module))) + (list "copyleft/cgal" + "copyleft/opengl2" + "copyleft/tetgen" + "embree" + "opengl" + "predicates" + "xml")))))))) + + (native-inputs (list catch2)) ;; XXX: Inputs are currently only used to build tests. ;; We would need to patch the CMake recipe to build a shared library ;; with all of these. (inputs `(("boost" ,boost) - ("catch2" ,catch2) ("cgal" ,cgal) ("eigen" ,eigen) ("embree" ,embree) - ("glfw" ,glfw) + ("glfw" ,glfw-3.4) ("gmp" ,gmp) ("mesa" ,mesa) ("mpfr" ,mpfr) ("tbb" ,tbb) ("tinyxml2" ,tinyxml2) + ("openblas" ,openblas) + ("imgui" ,imgui) + ("spectra" ,spectra) ;; When updating this package, update commit fields below according to ;; the hashes listed in "cmake/LibiglDownloadExternal.cmake". ("libigl-test-data" @@ -3636,13 +3698,16 @@ (define-public libigl (file-name (git-file-name "libigl-test-data" version)) (sha256 (base32 "1wxglrxw74xw4a4jmmjpm8719f3mnlbxbwygjb4ddfixxxyya4i2")))) ("libigl-glad" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libigl/libigl-glad") - (commit "09b4969c56779f7ddf8e6176ec1873184aec890f"))) - (file-name (git-file-name "libigl-glad" version)) - (sha256 (base32 "0rwrs7513ylp6gxv7crjzflapcg9p7x04nzfvywgl665vl53rawk")))) + ,(let* ((commit "ead2d21fd1d9f566d8f9a9ce99ddf85829258c7a") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/libigl-glad") + (commit commit))) + (file-name (git-file-name "libigl-glad" version)) + (sha256 (base32 "079fd5yrbd713nq7slhhgq79wns85pc564ydlkjl9gf43d3220ay"))))) ("libigl-stb" ,(origin (method git-fetch) @@ -3652,22 +3717,57 @@ (define-public libigl (file-name (git-file-name "libigl-stb" version)) (sha256 (base32 "0wwlb370z40y63ic3ny6q7lxibhixg2k1pjdkl4ymzv79zld28kj")))) ("libigl-predicates" + ,(let* ((commit "50c2149e7a520d13cd10e9aeff698bd68edd5a4f") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/libigl-predicates.git") + (commit commit))) + (file-name (git-file-name "libigl-predicates" version)) + (sha256 (base32 "0yiqhzry2qhb1p0v9sldlnpqsn4y8cln8r6y08lafkc9kc4qy8jz"))))) + ;; TODO: Package tetgen separately from + ("libigl-tetgen" + ,(let* ((commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/tetgen.git") + (commit commit))) + (file-name (git-file-name "libigl-tetgen" version)) + (sha256 (base32 "1k724syssw37py7kwmibk3sfwkkgyjyy7qkijnhn6rjm91g8qxsg"))))) + ("libigl-comiso" + ,(let* ((commit "562efe333edc8e649dc101469614f43378b1eb55") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/comiso.git") + (commit commit))) + (file-name (git-file-name "libigl-comiso" version)) + (sha256 (base32 "048zryh9ydd1dqwzs14vj7r3fd6yyq6n4zl6d1b0yb1iwrqfy6ba"))))) + ("libigl-triangle" ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/libigl/libigl-predicates.git") - (commit "488242fa2b1f98a9c5bd1441297fb4a99a6a9ae4"))) - (file-name (git-file-name "libigl-predicates" version)) - (sha256 (base32 "13bd98g8lgcq37i3crj66433z09grnb2xjrcqpwqmyn147rp5wyh")))) - ;; TODO: Package tetgen separately from - ("libigl-tetgen" + (url "https://github.com/libigl/triangle.git") + (commit "6bbd92c7ddd6c803c403e005e1132eadb38fbe68"))) + (file-name (git-file-name "libigl-triangle" version)) + (sha256 (base32 "0d35mfqwdk99xn1lpjzz9w5axq016r6xy5vr00lb4mvb05limxl3")))) + ;; XXX: This is a source-only library which is currently required only for + ;; libigl. + ("imguizmo" ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/libigl/tetgen.git") - (commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6"))) - (file-name (git-file-name "libigl-tetgen" version)) - (sha256 (base32 "1k724syssw37py7kwmibk3sfwkkgyjyy7qkijnhn6rjm91g8qxsg")))))) + (url "https://github.com/CedricGuillemet/ImGuizmo") + (commit "1.83"))) + (file-name (git-file-name "imguizmo" version)) + (sha256 (base32 "14ywf96nvxf5c081pwypyzjwx9vyq78glbzinc81558v1sxiy2v0")))))) (home-page "https://libigl.github.io/") (synopsis "Simple C++ geometry processing library") (description "This library provides functionality for shape modelling, -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat May 11 14:00:18 2024 Received: (at 70880) by debbugs.gnu.org; 11 May 2024 18:00:18 +0000 Received: from localhost ([127.0.0.1]:49637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r17-0004Ks-Le for submit@debbugs.gnu.org; Sat, 11 May 2024 14:00:17 -0400 Received: from mail-lf1-f44.google.com ([209.85.167.44]:45528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0s-0004H5-0w for 70880@debbugs.gnu.org; Sat, 11 May 2024 14:00:03 -0400 Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-520f9d559f6so3412994e87.3 for <70880@debbugs.gnu.org>; Sat, 11 May 2024 11:00:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715450336; x=1716055136; 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=K6TAoGD8f1hmJ6TolsQv6L2vnVh5C0QgbdMYkY1tbQ8=; b=O/U0iIWK8N8i8EJKxjP7NB2uz31Zg86mlS+HJVrL4noWXNpFYXQTzni8DQL4NTfCvy BN5dr19nx2XlBNNQCo5PgnAP2Hri70bijYk67lwX4YoAxP6dSBjkUfCOCBO8VOGPVYW1 OoH4l4ZCOuuX+fpNPzfr/fpfPWcipbXktZE7KMajZxoW8MOhBZXxXv+cewd0IZy4cnDY Gze4cB/Zz+89kDLncq8PCITzlYfutUisHazXK+WmVfklr2B22uY/HImkueZTdO6M/UZY awrTrhdR4oGt4NtWC4AveOsbfZ0wloAWyZi1ASsFOPEIbjhf9OTy6j+t2MfeqKfAY1qX mNOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715450336; x=1716055136; 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=K6TAoGD8f1hmJ6TolsQv6L2vnVh5C0QgbdMYkY1tbQ8=; b=sWdmqdlXJUHQYrvSOZufbyvtbpx+knvnlrauSFU8UHfQSksZebzCqq/tXjRVDk5mxP h7TmumqMs9TBWNy1WmuwETIqATHoW3KQ9uraF2EkJn5QOd8+a9R1U3hTspexSUeCajZL Mxaehq+QeZ0LxDJ5vmIfGVuQkdVLCD/CpkaW/HmF54y4VGCMjzfrdTxH1rmQblGLTl70 na7Nj8Eyc3ORaOr7m4aVRQ9N415BqXuuiEpv+hud2srrviTyz3sh6rU+znM5tYKNGJcI lNjmPnwBxTmBvpXHeFGk5mkycOQONl4lCDX5zGjresyVFvmW2VI5mw5ApdgxucPZBccy yX8w== X-Gm-Message-State: AOJu0YzGh8+p2vrWvBGZNugeq/8wFxz8h55UAL1TZW+s7QFMf7rgTT+x HFdSESOeuT0eS/4hokIrRQwBYc7QOVncaBmPIwvHJIOT78toHgX8oT/wFg== X-Google-Smtp-Source: AGHT+IEowLLdJf/d2xFqQda8/6GxpvgQKuJD/uPihom3EZ5tcywG19dvdJkis6r3Gx8ibT6K2vIvIw== X-Received: by 2002:a19:8c1a:0:b0:51a:f3b9:f774 with SMTP id 2adb3069b0e04-5220fb74698mr3635849e87.21.1715450336450; Sat, 11 May 2024 10:58:56 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f35ad59asm1075411e87.45.2024.05.11.10.58.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 10:58:55 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH 6/8] gnu: Add prusa-libbgcode. Date: Sat, 11 May 2024 20:58:34 +0300 Message-ID: <15e75ed6a8a2c035194ca4ee66c0fb48b04a48d7.1715450052.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (prusa-libbgcode): New variable. Change-Id: I1f18c399d0fe36987c613ce4c0c3845c803beb45 --- gnu/packages/engineering.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 1a0b136952..b1776484b5 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3774,6 +3774,30 @@ (define-public libigl visualization, matrix manipulation.") (license (list license:gpl3 license:mpl2.0)))) +(define-public prusa-libbgcode + (let ((commit "8ae75bd0eea622f0e34cae311b3bd065b55eae9b") + (revision "0")) + (package + (name "prusa-libbgcode") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prusa3d/libbgcode") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 (base32 "0fjx2ijz9zqpqs486lcrrrhqvmfzrpb8j6v57l0jiynavwv3kznw")))) + (native-inputs (list catch2)) + (propagated-inputs + (list zlib boost heatshrink)) + (build-system cmake-build-system) + (home-page "https://github.com/prusa3d/libbgcode") + (synopsis "Prusa Block & Binary G-code reader/writer/converter") + (description + "Prusa Block & Binary G-code reader/writer/converter.") + (license license:agpl3)))) + (define-public prusa-slicer (package (name "prusa-slicer") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat May 11 14:00:18 2024 Received: (at 70880) by debbugs.gnu.org; 11 May 2024 18:00:18 +0000 Received: from localhost ([127.0.0.1]:49639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r18-0004Kz-0W for submit@debbugs.gnu.org; Sat, 11 May 2024 14:00:18 -0400 Received: from mail-lf1-f54.google.com ([209.85.167.54]:55555) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0q-0004H4-V3 for 70880@debbugs.gnu.org; Sat, 11 May 2024 14:00:04 -0400 Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-51aa6a8e49aso3888907e87.3 for <70880@debbugs.gnu.org>; Sat, 11 May 2024 11:00:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715450335; x=1716055135; 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=4YMGQxA4eSB9RGJ46/w1eSURcG2bdMeyZvFvwZx4m0g=; b=fJOuIEr54BEkTt5Texr6ASqR9C/gx4xEvRzwaAxP/Rj5rEf+FPdiVxXKDNGNzKkcXR r3Nuv0XsHmTPt0ILfUT4Vbrkz73CkmRVl3b9igFwBzd8YdUAy3ihPtgYSbjEj25qIyYv 1Dc69UZyrtHbdGfQkqreqqwa21BkwxG9S69lTax/cbuBHxuKvs8ns1yTXgInhnzKkz6J L/t176Furu5jYO++smgkPpdmnPdilaq0YklUDQwxQW0Cwx0Ib9jHkkBuxUwmYlRRQ2oa MKJCSe30ZYk+ziUZbCgC1+asQWMrB7AJz1Pjjm6ZWJq6o+cGjsMklLgiMfymZaeWn4Fl K6Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715450335; x=1716055135; 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=4YMGQxA4eSB9RGJ46/w1eSURcG2bdMeyZvFvwZx4m0g=; b=B0uR+vTixsf+yrVGbwGKAzTptPJ/w+N78ruhTerLXXYHP+S5TR7noBW+wVR55UFJGD 7NYiBxHjPyzLJ1t+t0urS0ZwNw8n7t5p2WRUBCuy5NppjxU+JxSEabiu1Dy66ciS2CLJ un5tiEbmm3zqsz6Sj4I1y2EMRfSmj2RdKsub/VDuIXCML0fOD/URjsvYquYvNztEtRPs q+F9VM8VKdkrw8MxhOMSYphIuQrh8RKsv009OYWOj9/YeHoMpWz3o68vX37Auwgz8ZTk 5243VE2WhCQRE3mVOsb3kvEgfPeMP7wLjpnc4wxmyIWJGmJXWwwskr2K6PWXsb1IeMcD Ii0A== X-Gm-Message-State: AOJu0Ywb8oO9xJRFiPxbAIogcbnABVIXhrgapw+9D/l3yLkrLbzYA+oH zILaHVMtCu7/trB30acDxNVCM/OGJlvq9Mj7YQZwjtpiUO1XmSv/PaNChg== X-Google-Smtp-Source: AGHT+IGmNwEkHNJyCeXUDFSsSuA8TdOZR5XyKj7p0Lu0YRuJwRgwlAr7fAklWS/ndsRVQU26yE/6Aw== X-Received: by 2002:a05:6512:2389:b0:520:ed4e:220f with SMTP id 2adb3069b0e04-5220fa7187amr5064348e87.2.1715450335210; Sat, 11 May 2024 10:58:55 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f35ad59asm1075411e87.45.2024.05.11.10.58.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 10:58:54 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH 5/8] gnu: heatshrink: New variable. Date: Sat, 11 May 2024 20:58:33 +0300 Message-ID: <5ed96653a085765c79a2bf6b0150ddab179339f9.1715450052.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/compression.scm (heatshrink): New variable. * gnu/packages/patches/heatshrink-add-cmake.patch: New file. * gnu/local.mk (dist_patch_DATA): Add "heatshrink-add-cmake.patch". Change-Id: I0beccdcaed22e47ac6bfe522497e0759a315813d --- gnu/local.mk | 1 + gnu/packages/compression.scm | 54 +++++++++ .../patches/heatshrink-add-cmake.patch | 111 ++++++++++++++++++ 3 files changed, 166 insertions(+) create mode 100644 gnu/packages/patches/heatshrink-add-cmake.patch diff --git a/gnu/local.mk b/gnu/local.mk index edd546f81d..3ba9253ae2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1455,6 +1455,7 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-remove-gctp.patch \ %D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ + %D%/packages/patches/heatshrink-add-cmake.patch \ %D%/packages/patches/heimdal-CVE-2022-45142.patch \ %D%/packages/patches/helm-fix-gcc-9-build.patch \ %D%/packages/patches/highlight-gui-data-dir.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 55784a70de..187bc73f2f 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2022 Zhu Zihao ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2024 Vinicius Monego +;;; Copyright © 2024 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -570,6 +571,59 @@ (define-public xz (license (list license:gpl2+ license:lgpl2.1+)) ; bits of both (home-page "https://tukaani.org/xz/"))) +(define-public heatshrink + (package + (name "heatshrink") + (version "0.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/atomicobject/heatshrink/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sdhvk27yz8kahw18j8pddbpkgl78v8rh8fx6wspc3acj7w7yvrn")) + ;; Add CMake build script, wanted by prusa-slicer and libbgcode, which are the + ;; only users of this library. + ;; + ;; See + ;; + (patches (search-patches "heatshrink-add-cmake.patch")))) + (build-system cmake-build-system) + (arguments + (list + ;; XXX: No tests available with CMake. + ;; See + #:tests? #f)) + (home-page "https://github.com/atomicobject/heatshrink/") + (synopsis "Data compression library for embedded/real-time systems") + (description + "A data compression/decompression library for embedded/real-time systems. + +Key features: +@itemize +@item Low memory usage (as low as 50 bytes.) + +It is useful for some cases with less than 50 bytes, and useful for many general +cases with < 300 bytes. + +@item Incremental, bounded CPU use. + +You can chew on input data in arbitrarily tiny bites. This is a useful property in +hard real-time environments. + +@item Can use either static or dynamic memory allocation. + +The library doesn't impose any constraints on memory management. + +@item ISC license. + +You can use it freely, even for commercial purposes. +@end itemize +") + (license license:isc))) + (define-public lhasa (package (name "lhasa") diff --git a/gnu/packages/patches/heatshrink-add-cmake.patch b/gnu/packages/patches/heatshrink-add-cmake.patch new file mode 100644 index 0000000000..f67f87126e --- /dev/null +++ b/gnu/packages/patches/heatshrink-add-cmake.patch @@ -0,0 +1,111 @@ +From 0886e9ca76552b8e325841e2b820b4563e5d5aba Mon Sep 17 00:00:00 2001 +From: tamasmeszaros +Date: Thu, 27 Jul 2023 23:11:25 +0200 +Subject: [PATCH] Add CMake build script + +--- + CMakeLists.txt | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ + Config.cmake.in | 5 +++ + 2 files changed, 87 insertions(+) + create mode 100644 CMakeLists.txt + create mode 100644 Config.cmake.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +new file mode 100644 +index 0000000..5b840eb +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,82 @@ ++cmake_minimum_required(VERSION 3.10) ++ ++project(heatshrink C) ++ ++add_library(${PROJECT_NAME} heatshrink_decoder.c heatshrink_encoder.c) ++add_library(${PROJECT_NAME}_dynalloc heatshrink_decoder.c heatshrink_encoder.c) ++ ++find_library(MATH_LIBRARY m) # Business as usual ++if(MATH_LIBRARY) ++ target_link_libraries(${PROJECT_NAME} PUBLIC ${MATH_LIBRARY}) ++endif() ++ ++target_include_directories(${PROJECT_NAME} PUBLIC $) ++target_include_directories(${PROJECT_NAME}_dynalloc PUBLIC $) ++ ++target_compile_definitions(${PROJECT_NAME} PUBLIC HEATSHRINK_DYNAMIC_ALLOC=0) ++target_compile_definitions(${PROJECT_NAME}_dynalloc PUBLIC HEATSHRINK_DYNAMIC_ALLOC=1) ++ ++if (UNIX) ++ add_executable(${PROJECT_NAME}_cmd heatshrink.c) ++ target_link_libraries(${PROJECT_NAME}_cmd ${PROJECT_NAME}_dynalloc) ++ set_target_properties(${PROJECT_NAME}_cmd PROPERTIES OUTPUT_NAME ${PROJECT_NAME}) ++endif () ++ ++# Installation and export: ++ ++include(CMakePackageConfigHelpers) ++ ++write_basic_package_version_file( ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" ++ VERSION 0.4.1 ++ COMPATIBILITY AnyNewerVersion ++) ++ ++set(_exported_targets ${PROJECT_NAME} ${PROJECT_NAME}_dynalloc) ++if (UNIX) ++ list(APPEND _exported_targets ${PROJECT_NAME}_cmd) ++endif () ++ ++install(TARGETS ${_exported_targets} ++ EXPORT ${PROJECT_NAME}Targets ++) ++ ++export(EXPORT ${PROJECT_NAME}Targets ++ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake" ++ NAMESPACE ${PROJECT_NAME}:: ++) ++ ++include(GNUInstallDirs) ++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) ++ ++configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" ++ INSTALL_DESTINATION ${ConfigPackageLocation} ++) ++ ++install( ++ FILES ++ heatshrink_common.h ++ heatshrink_config.h ++ heatshrink_encoder.h ++ heatshrink_decoder.h ++ DESTINATION ++ include/${PROJECT_NAME} ++ ) ++ ++install(EXPORT ${PROJECT_NAME}Targets ++ FILE ++ ${PROJECT_NAME}Targets.cmake ++ NAMESPACE ++ ${PROJECT_NAME}:: ++ DESTINATION ++ ${ConfigPackageLocation} ++) ++ ++install( ++ FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" ++ DESTINATION ++ ${ConfigPackageLocation} ++) +diff --git a/Config.cmake.in b/Config.cmake.in +new file mode 100644 +index 0000000..0809ba9 +--- /dev/null ++++ b/Config.cmake.in +@@ -0,0 +1,5 @@ ++@PACKAGE_INIT@ ++ ++if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake) ++ include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") ++endif () -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat May 11 14:00:19 2024 Received: (at 70880) by debbugs.gnu.org; 11 May 2024 18:00:19 +0000 Received: from localhost ([127.0.0.1]:49641 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r18-0004L8-Ok for submit@debbugs.gnu.org; Sat, 11 May 2024 14:00:19 -0400 Received: from mail-lf1-f43.google.com ([209.85.167.43]:57820) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0t-0004H6-6r for 70880@debbugs.gnu.org; Sat, 11 May 2024 14:00:04 -0400 Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-51f72a29f13so3834269e87.3 for <70880@debbugs.gnu.org>; Sat, 11 May 2024 11:00:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715450337; x=1716055137; 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=bsv/66EDUWe1oxd7hS4dv/aOYRUZ8kN/Kvt0dUrd8vk=; b=ByQPRJpYawxkPQOa6kyyZd4heAHD4i2EHfMF3VEcWPjc2IxvIcXxU3+P/41Pq9xjK4 AkmiTOK/uue9NbeWVw2ZAnNctZaMgHNyF4HqKVx74GPD/pgB1t4Y7OoIQCEKR7N5Xn9W vnl8ug9q/o5XHCj2XVvK4kLNd42NXPLqJ9Gjen4sBO3qie7JLM77BsIMhCqnqIyoSvtE 0PXfdG+/U0mQtbYELnN+rWzlQc2ThGolLmB8lRcrYSXeir7k6G3FFoIcmOv7EiNXIGC+ x8uHSdSEo82/8ZY2DRjCWrsRfCogYfxgHvdD9OrZXHWHRJyPjXk3HD5MKJqUWMkI0lvB TXiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715450337; x=1716055137; 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=bsv/66EDUWe1oxd7hS4dv/aOYRUZ8kN/Kvt0dUrd8vk=; b=lCgh9E3FvRrACS1MRYe8ybwewfbMoOWI73pwAsMzwLBD8m3Pd38LGtWskPmyl/1d2u RbQhddoZSvZHgEJKsJp3gtmSHy4K2dg1933nm2X1iX3G9jMPHg99gSCzN5FKRZInQvq6 E2pAUUl431dkr+OfhWOsO2InVWLp1lZGUmdjq57bdByldOd4kfUEDcMN6c8u7scjl7pf egCrmetLT/e01F5E+RaJn7U1f60Sqwc4O7kxf1CV3sXSG51OqXP+Bcv9W018dFq1YCZr GYyKaJk0obkkj0RWvryuKdRrRqEUkM4d5EcfkT3ec2iEG6SsskNp13FKAmG079SrBDsq SpdA== X-Gm-Message-State: AOJu0YwQxGwyS7DjyRqd15DfI5W0N2RG1DkuDtunbr/ZeORWEOeqRRDY N6xYmku9hA8wo8dFUdhRxw11DteI804IUZ1rGFZ17Hs8PAws8G9MNf23TA== X-Google-Smtp-Source: AGHT+IF0I+2wWPRIv7i4sImkOMkBXHD9KiIdCh2pD7QDjAPNC13CifuHIHLkubgzMrvmFXM13/zHyA== X-Received: by 2002:ac2:46ec:0:b0:516:d259:245e with SMTP id 2adb3069b0e04-5220ff72105mr3957656e87.9.1715450337397; Sat, 11 May 2024 10:58:57 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f35ad59asm1075411e87.45.2024.05.11.10.58.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 10:58:56 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH 7/8] gnu: Add prusa-wxwidgets. Date: Sat, 11 May 2024 20:58:35 +0300 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" , Nikita Domnitskii X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (prusa-wxwidgets): New variable. Co-authored-by: Nikita Domnitskii Change-Id: I9043c2acc95986275ee24d9c5d944e5fe2702e99 --- gnu/packages/engineering.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index b1776484b5..08ff06fa94 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3798,6 +3798,33 @@ (define-public prusa-libbgcode "Prusa Block & Binary G-code reader/writer/converter.") (license license:agpl3)))) +(define-public prusa-wxwidgets + ;; There is no tag/release, all patches are in separate branch. + (let ((commit "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26")) + (package + (inherit wxwidgets) + (name "prusa-wxwidgets") + (version "3.2.0") + (home-page "https://github.com/prusa3d/wxWidgets") + (source + (origin + (inherit (package-source wxwidgets)) + (method git-fetch) + (uri + (git-reference + (url home-page) + (commit commit) + (recursive? #t))) + (file-name (git-file-name name version)) + (patches (search-patches "prusa-wxwidgets-makefile-fix.patch")) + (sha256 + (base32 + "02nd07c23xbclnf1jjfbv6r5vqjb80gsdy2l559c5qzgdcvfd2xd")))) + (arguments + (substitute-keyword-arguments (package-arguments wxwidgets) + ((#:configure-flags flags) + #~(cons "--disable-glcanvasegl" #$flags))))))) + (define-public prusa-slicer (package (name "prusa-slicer") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat May 11 14:00:20 2024 Received: (at 70880) by debbugs.gnu.org; 11 May 2024 18:00:20 +0000 Received: from localhost ([127.0.0.1]:49643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r19-0004LJ-4Q for submit@debbugs.gnu.org; Sat, 11 May 2024 14:00:19 -0400 Received: from mail-lj1-f181.google.com ([209.85.208.181]:49318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0u-0004H8-Dx for 70880@debbugs.gnu.org; Sat, 11 May 2024 14:00:06 -0400 Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2e43c481b53so37070271fa.2 for <70880@debbugs.gnu.org>; Sat, 11 May 2024 11:00:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715450339; x=1716055139; 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=tz/dyCuv3E+bxdzHtr2O90bdua5His85y83hDt99BYI=; b=Meu33TCbQ9HMSWSokn9lYFdDReUvyAi/oXCZRLcIhVG6+RhwV4ZmM4T4cRLXaIXDD/ CUtlk0yf6ZJWXbA7X7/VVPxSUspb8Cc3iATa3uunTRiu69v2nIHo4mMZc/knW0YNwwo6 UCfWHtzb0ndSJ8eR8NFnsIK+HveECJM4OtrSijhUT1Z37pfqZNXLuqnD6tpIWNP9FtYM ZqtQOdfT2i0Hx5ONtOXrmeY6pv61MGIlg1lUAXdD/6kfC96sgOg63rceYdwrO9HbzvdT o+zrSlwIeQ48GEqGKo0NUmwBl7fklXyhlKwZpss6E4UR+H8iDiVCuGAUcEfhqVK1p8fE 0awg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715450339; x=1716055139; 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=tz/dyCuv3E+bxdzHtr2O90bdua5His85y83hDt99BYI=; b=LIYH9mWKXRON3k/dCbNbTEj/j7y+xXbiXkSJ+YV1lnn+BRddkKo7V4j2pB76NUiAl6 /WJ4DjaVGvDaF33oAsE1u25R5TtcCYKtYDkXG1w41xbToAlQYQj5+XX1X6t+2D83vm7v MWbcwazXsky2QoKcGDbg12CAQjTm6k3r/ZtJNwLMa0LNX1+EGKsaT77bQR0m7hNqxI/F jwXtQQ3AH53hf/KZjwCvtZ62xPwC3imRwnBbo1iZoMDVOIW7R2TcET116ymdMdlJfsq1 sB2hPti346OZuiv1DoacMat0/TZRPnaTvJRsqXHH7Y24ZINNaf1mjDscwxHU1dTiL5mB yT/w== X-Gm-Message-State: AOJu0YzxRFlqu63rEjyrF0THdi12CRgmNZ4iBagnljpo/aMI56iRU+K5 Vbwl3mqOCEP0IrqFMCBePTijiIdED3OGLLT4TA5Liy0f4DjhM8TuOahD9Q== X-Google-Smtp-Source: AGHT+IFVm7ptt0zf2qRuzS23A0qlGWOgOkEoUUOTMtXDAaBYl02uY2wBNxP8D2Fs1mK6D/zs4CeXGg== X-Received: by 2002:a19:ca47:0:b0:51e:fa8c:47cc with SMTP id 2adb3069b0e04-5220fc7ef13mr3469141e87.30.1715450338638; Sat, 11 May 2024 10:58:58 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f35ad59asm1075411e87.45.2024.05.11.10.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 10:58:57 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH 8/8] gnu: prusa-slicer: Update to 2.7.4. Date: Sat, 11 May 2024 20:58:36 +0300 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (prusa-slicer): Update to 2.7.4. [source]: Add "prusa-slicer-boost-fixes.patch". Move some part of the snippet code to custom build phases. [arguments]: In configure flags add paths to external libraries. Add "fix-include-paths" phase. [native-inputs]: Add "catch2". [inputs]: Use "prusa-wxwidgets" instead of "wxwidgets" to fix segfaults. Ad "qhull", "nanosvg", "heatshrink" and "prusa-libbgcode". * gnu/packages/patches/prusa-slicer-boost-fixes.patch, gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch: Remove unused patches. * gnu/local.mk (dist_patch_DATA): Remove unused "prusa-slicer" patches. Change-Id: I15e85d63c9ad6c731c8040ef2d8ec8b2f31f2ab7 --- gnu/local.mk | 2 - gnu/packages/engineering.scm | 51 ++++++---- .../patches/prusa-slicer-boost-fixes.patch | 97 ------------------- .../prusa-slicer-with-cereal-1.3.1.patch | 52 ---------- 4 files changed, 33 insertions(+), 169 deletions(-) delete mode 100644 gnu/packages/patches/prusa-slicer-boost-fixes.patch delete mode 100644 gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3ba9253ae2..3b61666803 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1816,9 +1816,7 @@ dist_patch_DATA = \ %D%/packages/patches/pokerth-boost.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/procps-strtod-test.patch \ - %D%/packages/patches/prusa-slicer-boost-fixes.patch \ %D%/packages/patches/prusa-slicer-fix-tests.patch \ - %D%/packages/patches/prusa-slicer-with-cereal-1.3.1.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/python-3.12-fix-tests.patch \ %D%/packages/patches/python-accupy-use-matplotx.patch \ diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 08ff06fa94..99f7c82d7d 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3828,7 +3828,7 @@ (define-public prusa-wxwidgets (define-public prusa-slicer (package (name "prusa-slicer") - (version "2.5.2") + (version "2.7.4") (source (origin (method git-fetch) @@ -3837,13 +3837,11 @@ (define-public prusa-slicer (url "https://github.com/prusa3d/PrusaSlicer") (commit (string-append "version_" version)))) (file-name (git-file-name name version)) - (sha256 (base32 "02qcrw3fa0d8ldbp73hp14l1qxbp3f4608j4csc07ny00ra42151")) - (patches (search-patches "prusa-slicer-boost-fixes.patch" - "prusa-slicer-fix-tests.patch" - "prusa-slicer-with-cereal-1.3.1.patch")) + (sha256 (base32 "0s1cfvhfilyv0y98asr61c6rwlgyr1hf5v5hg8q9zwmzm2bkcql3")) + (patches (search-patches "prusa-slicer-fix-tests.patch")) (modules '((guix build utils))) (snippet - '(begin + `(begin ;; Prusa slicer bundles a lot of dependencies in src/ directory. ;; Most of them contain prusa-specific modifications (e.g. avrdude), ;; but others do not. Here we replace the latter with Guix packages. @@ -3851,10 +3849,12 @@ (define-public prusa-slicer (delete-file-recursively "src/hidapi") (delete-file-recursively "src/eigen") (delete-file-recursively "src/libigl/igl") + (substitute* "CMakeLists.txt" + (("add_library\\(libexpat INTERFACE\\)") + "")) + (substitute* "src/libigl/CMakeLists.txt" + (("target_link_libraries\\(libigl INTERFACE igl::core\\)") "")) (substitute* "src/CMakeLists.txt" - (("add_subdirectory\\(libigl\\)" all) - (string-append - all "\ninclude_directories(libigl INTERFACE libigl::core)")) (("add_subdirectory\\(hidapi\\)") "pkg_check_modules(HIDAPI REQUIRED hidapi-hidraw)") (("include_directories\\(hidapi/include\\)") @@ -3867,13 +3867,24 @@ (define-public prusa-slicer (("\\bhidapi\\b") "${HIDAPI_LIBRARIES}")))))) (build-system cmake-build-system) (arguments - `(#:configure-flags - '("-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard. - "-DSLIC3R_GTK=3" ;; Use GTK+ - ;; Use wxWidgets 3.0.x.x to prevent GUI crashes when adding support enforcers. - "-DSLIC3R_WX_STABLE=1"))) + (list #:configure-flags + #~(list "-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard. + "-DSLIC3R_GTK=3" ;; Use GTK+ + ;; Use wxWidgets 3.0.x.x to prevent GUI crashes when adding support enforcers. + "-DSLIC3R_WX_STABLE=1" + (format #f "-Dlibigl_DIR=~a/lib/cmake/igl/" + #$(this-package-input "libigl")) + (format #f "-DCatch2_DIR=~a/lib/cmake/catch2/" + #$(this-package-input "catch2"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-include-paths + (lambda _ + (substitute* "tests/libslic3r/test_quadric_edge_collapse.cpp" + (("#include ") + "#include "))))))) (native-inputs - (list pkg-config)) + (list pkg-config catch2)) (inputs (list boost cereal @@ -3899,9 +3910,13 @@ (define-public prusa-slicer pango tbb eudev - ;; prusa-slicer 2.5 segfaults on startup with wxwidgets 3.2 - ;; See https://github.com/prusa3d/PrusaSlicer/issues/8299 - wxwidgets-3.0 + qhull + nanosvg + heatshrink + ;; XXX: Using Prusa wxWidgets fork as PrusaSlicer segfaults when compiled + ;; with regular wxwidgets. + prusa-wxwidgets + prusa-libbgcode zlib)) (home-page "https://www.prusa3d.com/prusaslicer/") (synopsis "G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)") diff --git a/gnu/packages/patches/prusa-slicer-boost-fixes.patch b/gnu/packages/patches/prusa-slicer-boost-fixes.patch deleted file mode 100644 index 5bca271625..0000000000 --- a/gnu/packages/patches/prusa-slicer-boost-fixes.patch +++ /dev/null @@ -1,97 +0,0 @@ -Fixes for Boost compatibility. -This patch comes from Gentoo: - portage/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch - ---- a/src/hints/HintsToPot.cpp -+++ b/src/hints/HintsToPot.cpp -@@ -1,6 +1,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -9,7 +10,7 @@ - - bool write_to_pot(boost::filesystem::path path, const std::vector>& data) - { -- boost::filesystem::ofstream file(std::move(path), std::ios_base::app); -+ boost::nowide::ofstream file(std::move(path), std::ios_base::app); - for (const auto& element : data) - { - //Example of .pot element ---- a/src/libslic3r/Preset.cpp -+++ b/src/libslic3r/Preset.cpp -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -84,7 +85,7 @@ ConfigFileType guess_config_file_type(const ptree &tree) - VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path, bool load_all) - { - ptree tree; -- boost::filesystem::ifstream ifs(path); -+ boost::nowide::ifstream ifs(path); - boost::property_tree::read_ini(ifs, tree); - return VendorProfile::from_ini(tree, path, load_all); - } ---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp -+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp -@@ -10,6 +10,7 @@ - #include "libslic3r/Platform.hpp" - #include "libslic3r/Config.hpp" - -+#include - #include - #include - #include -@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog() - - } // namespace GUI - } // namespace Slic3r --#endif // __linux__ -\ No newline at end of file -+#endif // __linux__ ---- a/src/slic3r/GUI/GUI_App.cpp -+++ b/src/slic3r/GUI/GUI_App.cpp -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/src/slic3r/GUI/HintNotification.cpp -+++ b/src/slic3r/GUI/HintNotification.cpp -@@ -15,6 +15,7 @@ - #include "libslic3r/PrintConfig.hpp" - - #include -+#include - #include - #include - #include -@@ -65,7 +66,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f - - void write_used_binary(const std::vector& ids) - { -- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary); -+ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary); - cereal::BinaryOutputArchive archive(file); - HintsCerealData cd { ids }; - try -@@ -84,7 +85,7 @@ void read_used_binary(std::vector& ids) - BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string(); - return; - } -- boost::filesystem::ifstream file(path); -+ boost::nowide::ifstream file(path); - cereal::BinaryInputArchive archive(file); - HintsCerealData cd; - try diff --git a/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch b/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch deleted file mode 100644 index affa506b1c..0000000000 --- a/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix for building with cereal>=1.3.1. -This patch comes from Gentoo: - portage/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch - ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -127,7 +127,7 @@ - set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer") - endif () - --target_link_libraries(PrusaSlicer libslic3r cereal) -+target_link_libraries(PrusaSlicer libslic3r libcereal) - - if (APPLE) - # add_compile_options(-stdlib=libc++) ---- a/src/slic3r/CMakeLists.txt -+++ b/src/slic3r/CMakeLists.txt -@@ -260,7 +260,7 @@ - - encoding_check(libslic3r_gui) - --target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) -+target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) - - if (MSVC) - target_link_libraries(libslic3r_gui Setupapi.lib) ---- a/src/libslic3r/CMakeLists.txt -+++ b/src/libslic3r/CMakeLists.txt -@@ -395,7 +395,7 @@ - target_link_libraries(libslic3r - libnest2d - admesh -- cereal -+ libcereal - libigl - miniz - boost_libs ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -446,6 +446,12 @@ - - # Find the Cereal serialization library - find_package(cereal REQUIRED) -+add_library(libcereal INTERFACE) -+if (NOT TARGET cereal::cereal) -+ target_link_libraries(libcereal INTERFACE cereal) -+else() -+ target_link_libraries(libcereal INTERFACE cereal::cereal) -+endif() - - # l10n - set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 08 10:27:55 2024 Received: (at submit) by debbugs.gnu.org; 8 Jun 2024 14:27:55 +0000 Received: from localhost ([127.0.0.1]:39185 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sFx2w-0007Xz-Ox for submit@debbugs.gnu.org; Sat, 08 Jun 2024 10:27:55 -0400 Received: from lists.gnu.org ([209.51.188.17]:36538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sFx2s-0007Xp-JI for submit@debbugs.gnu.org; Sat, 08 Jun 2024 10:27:53 -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 1sFx2c-0004H2-9n for guix-patches@gnu.org; Sat, 08 Jun 2024 10:27:34 -0400 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sFx2a-0000Xc-Bp for guix-patches@gnu.org; Sat, 08 Jun 2024 10:27:34 -0400 Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-52bc0a9cea4so1180057e87.0 for ; Sat, 08 Jun 2024 07:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717856850; x=1718461650; darn=gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=BFNzkyGVYTPDdRYAleAFwrLuQ7fl9wLb1m8QeG9hxzo=; b=MXQoY3y7fAOtWsipJuKz/abGNiTedLkgbiVQ8FbkVuXNsIri+FmGJVE3oda2SrH0lq Pa08vRGKRdp/yA195+wgcvBTbpr5ruiNFrjZSO/obH7EtEV1W1goFi8/SAS7wWJXlyQi 0kkzxXzNhuJ76PV6F8pZC6B/5MWDr+KdCC0Y0B0QFyeAO/C0eJhjhMHudOKF+FzhEsW4 +lvBx9e+OtlUBt5Rgce4+5iOakAXPhLxoOJ8Gs4iwxzlB7R/VC+6H74Bd2R54reZ7Yc3 MxK44C7rCXq3GyQYWhLGIvcB6lg6pOiWHkW8IM9UCOLp3YHdbf4FIrZWRHtqYla47yr6 RThA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717856850; x=1718461650; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=BFNzkyGVYTPDdRYAleAFwrLuQ7fl9wLb1m8QeG9hxzo=; b=emrtPs7EDRuIZNQGS7frcd1uRQUtbEnkqjunhXOE7xLiHcYxiy15XNKEXl1ESvMnPY 39w/CbPq/IIGywp4ka059iLGBUvb03iawk5jaVOWT2OCcH4ElENMd8N7PG2cGwM1QUgr PTVIaQ+yNBV1lYfApxZ5v3HeN55Vxuy80tdcfjxsdK+crFqTTa1lSeyMvxgTaY+8buRm ip7H97BHamyDOgKm9eU6lBS3PCox/u42FMC1lDbsM3vQsJwmbjwkQnx/fhhqzZht0gcV Eh9Z/Bi/h5Tr+uTNYHzCj7sV6jJVlBLHMEiGkzlT7BD1+aWLRDMSMLpY0dFQNFZany/Y w2xg== X-Gm-Message-State: AOJu0Yz5K1hZe4D1+y/9Eq+ktf2cv5x3cYDdWw7RhE+qWvDuxiT9SQ92 65GW0EwmurNtzC2xsqYEQPJoajebKLJOyd96WAepAYnA8972y5Eohq836A== X-Google-Smtp-Source: AGHT+IHQkUOje5CjkNB5K9lpPXke5fEa/g2XBfljcw3XrQbHz7zGe2H/UfE8MP6oxWUFqZxGhde51g== X-Received: by 2002:a05:6512:10cd:b0:52c:72b4:1b24 with SMTP id 2adb3069b0e04-52c72b41c1fmr684470e87.12.1717856849735; Sat, 08 Jun 2024 07:27:29 -0700 (PDT) Received: from elephant ([95.79.11.228]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52bb41e1d6esm852239e87.11.2024.06.08.07.27.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jun 2024 07:27:29 -0700 (PDT) From: "Artyom V. Poptsov" To: guix-patches@gnu.org Subject: Re: [PATCH 0/8] gnu: prusa-slicer: Update to 2.7.4. In-Reply-To: (Artyom V. Poptsov's message of "Sat, 11 May 2024 20:56:23 +0300") References: Date: Sat, 08 Jun 2024 17:27:15 +0300 Message-ID: <87a5jv7bng.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a00:1450:4864:20::12f; envelope-from=poptsov.artyom@gmail.com; helo=mail-lf1-x12f.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_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hello! Could anyone review this patchset? It's been more than 3 weeks since it was sent and I'd love to hear any feedback. Thanks! =2D avp =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJNBAEBCgA3FiEEAf2F9Bp7f4IFgwalk16+BzbchX4FAmZkakwZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRCTXr4HNtyFfpQOEAC4jy2ccLNoMFtyyZeY1MgQ wFg87+uIetxAqsrulupP/tYAFDRTU8V707L5PXfT+h7PWqW1SxpUKMwswlsYu0eo TKspxE4onRm6+4kN+leCJn0tl4N1XTf/DvAWjcVvPPgbOBRw5HEUc1gyehJ1zRqK FoEt2TwZ9b+EH7oRv2e6BJw+HISrBE2+dnjXg7VuRHo6UCIyYrxrzpRWck5N+kG1 Cg0wkbx1N+nORD86R59QgW4ZGKxMmSNfe3oylwx64xayuJAdappNGtD0aoDlZWc0 QRHhj0eI9Jn0uAG3HCwIENa0PJiEaLOEaH4RSAX4BWHDXejyHiq8V9SqqfqdQzOm duUJsD7KFCJV7VsJZd7fEx2C3dKGrxqkNrbZD3FlAAIpsPqWJiaUepilhD1LGkPp 7B1bkpLBTMMXHous6+sro8yzoBWD+2cyA3543PClsQse5BgTEDmsayJoElwE4et3 fdj2L38M3Jd7p2A6aQsb8ngPPdD7TdWPa8oCmDwysqWMCSH55v0/xYQ5RDOVQP2P w9GYIxZ+8howTSOJz9udI1uFZTKko04h1eQntpzGk16NsS0DOfuSjRO2Dq79TGaf GZxVg0UWp0OOrY3kXgeCLwDJoevPyaywZyQW6SuwSyKE5Acar0OJRtP6c7m/T4LS JWw/m8dU43BYbCX5Dk3rwQ== =7Imq -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 23 23:19:37 2024 Received: (at 70880) by debbugs.gnu.org; 24 Jun 2024 03:19:37 +0000 Received: from localhost ([127.0.0.1]:35773 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLaEy-0003bp-Vp for submit@debbugs.gnu.org; Sun, 23 Jun 2024 23:19:37 -0400 Received: from mail-qt1-f182.google.com ([209.85.160.182]:46420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLaEx-0003bX-Am for 70880@debbugs.gnu.org; Sun, 23 Jun 2024 23:19:35 -0400 Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-444c0d2d503so15964831cf.1 for <70880@debbugs.gnu.org>; Sun, 23 Jun 2024 20:19:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719199108; x=1719803908; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=oSqmKowTTgcAg9vvDtNA+NLTaK964kk0hJfxw8Z7V+M=; b=bVrV8B0HHZ9NSdBlJg9jQ25GzHQ0C3Gy0qZVqbuayxk7hL7cSh/N4MDNHAL26tsTZu U6pV4ZqqoiDGIxiga8MAw0bKG/Zo+azAhP0gLFyUD3cFU80KtCoSv0TbFoQhI7liuBbj G2X5VMr3HVKBAZONkuZf0REHvhk0As5Mv+YIg1xnXxSax8o4gFwjf0lwhVcmDLpqCsot 9I20PNBg7I1gS2xcuwvED3w/ATqF6z8GzWO5fMqbUD6tU0VutlkzMbK6N1XZIWj/XyfB ZTziEjAfxE0dh2/bH7O9sngpZj9UOaFGye/Qgwe7R1XhP5qFqAvg/zuizZYFff0ZCivh /vpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719199108; x=1719803908; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=oSqmKowTTgcAg9vvDtNA+NLTaK964kk0hJfxw8Z7V+M=; b=LB6c2KKRChzS96MGBndtjRT1Del4BWFgZH6TZImnemQ7dH7x/fx8uzOGb8xtJ0F81n 8x/1nXhUtJ6iStTIfjfn9fOsHYDuyLnyIl8gkb7lLmOrJpk2UaQrjUqEI1ELDLhyz/Ae yckd7JQB6c6EM4EfOLz9lKnDDIhFfaDDnMJtdcmtpNNgJsRZkOSDQLmKUGqDPkE9UHpE IT944theiidKG8Rl7q0iQIPMEV3FTs8QHa+nd91cE/H9325eaaHXnUicez4DOXHc9j6l SHdQJFvECtk/JaxJuySABYlafJA6114TSPg0tgHtIEC0S3Sks+f7YAP4I7IAb9vftLzN DRcw== X-Gm-Message-State: AOJu0YyrSWB7WFQDL7wCivBdmDVBE4nJQS9gHuKPKvlxma5oU+9/uFYe gjbRFrDVggM3NxwB+MBxFJYv7lT/wkQ4dAylnZJiiK6OA3/b1UiuAu3RcqBG9wU= X-Google-Smtp-Source: AGHT+IGej4KblaMpvG9jwLRgU83g0NYahZKapIrc+9sAN9P/FihPoRKiVMJlfzb7McfIoTgBUXHGyA== X-Received: by 2002:a05:622a:190a:b0:441:45bf:9702 with SMTP id d75a77b69052e-444d646670cmr50767791cf.3.1719199108141; Sun, 23 Jun 2024 20:18:28 -0700 (PDT) Received: from hurd (dsl-205-233-124-241.b2b2c.ca. [205.233.124.241]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-444c2c429a3sm37728841cf.69.2024.06.23.20.18.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 20:18:27 -0700 (PDT) From: Maxim Cournoyer To: "Artyom V. Poptsov" Subject: Re: [bug#70880] [PATCH 6/8] gnu: Add prusa-libbgcode. In-Reply-To: <15e75ed6a8a2c035194ca4ee66c0fb48b04a48d7.1715450052.git.poptsov.artyom@gmail.com> (Artyom V. Poptsov's message of "Sat, 11 May 2024 20:58:34 +0300") References: <15e75ed6a8a2c035194ca4ee66c0fb48b04a48d7.1715450052.git.poptsov.artyom@gmail.com> Date: Sun, 23 Jun 2024 23:18:26 -0400 Message-ID: <874j9j3u65.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, "Artyom V. Poptsov" writes: > * gnu/packages/engineering.scm (prusa-libbgcode): New variable. > > Change-Id: I1f18c399d0fe36987c613ce4c0c3845c803beb45 > --- > gnu/packages/engineering.scm | 24 ++++++++++++++++++++++++ > 1 file changed, 24 insertions(+) > > diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm > index 1a0b136952..b1776484b5 100644 > --- a/gnu/packages/engineering.scm > +++ b/gnu/packages/engineering.scm > @@ -3774,6 +3774,30 @@ (define-public libigl > visualization, matrix manipulation.") > (license (list license:gpl3 license:mpl2.0)))) > > +(define-public prusa-libbgcode > + (let ((commit "8ae75bd0eea622f0e34cae311b3bd065b55eae9b") > + (revision "0")) > + (package > + (name "prusa-libbgcode") > + (version (git-version "0.0.0" revision commit)) > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/prusa3d/libbgcode") > + (commit commit))) > + (file-name (git-file-name name version)) > + (sha256 (base32 "0fjx2ijz9zqpqs486lcrrrhqvmfzrpb8j6v57l0jiynavwv3kznw")))) > + (native-inputs (list catch2)) > + (propagated-inputs > + (list zlib boost heatshrink)) > + (build-system cmake-build-system) > + (home-page "https://github.com/prusa3d/libbgcode") > + (synopsis "Prusa Block & Binary G-code > reader/writer/converter") s/&/and/ > + (description > + "Prusa Block & Binary G-code reader/writer/converter.") This needs to be fleshed out more (what are Prusa Block and Binary G-code? Any features that stand out?). Currently it's a duplicate of the synopsis. > + (license license:agpl3)))) Just checking, it's agpl3 only, not + (or later) ? -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 23 23:19:42 2024 Received: (at control) by debbugs.gnu.org; 24 Jun 2024 03:19:42 +0000 Received: from localhost ([127.0.0.1]:35777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLaF4-0003c6-BW for submit@debbugs.gnu.org; Sun, 23 Jun 2024 23:19:42 -0400 Received: from mail-qv1-f47.google.com ([209.85.219.47]:48347) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLaF2-0003bf-L6 for control@debbugs.gnu.org; Sun, 23 Jun 2024 23:19:41 -0400 Received: by mail-qv1-f47.google.com with SMTP id 6a1803df08f44-6b4fc5c2f08so17046936d6.0 for ; Sun, 23 Jun 2024 20:19:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719199113; x=1719803913; darn=debbugs.gnu.org; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=dEwtlNy5Ri7zGbh4PAox4paJaviZp5fihKeIERWT+fE=; b=RM1NsuRTq7JZrGmrN+DG90SO+o6kjzMk5dFp5wTV6JgoqjLf0l/pCnJPkTVhqZjjsd liRVDv2oRxqc4a4kH5XQ57234avGROo7/XiDA2Ru25NIiGTTrACWL0ZTjdaw2cwEs75t HoOvfpZ7F78BLNkvZAoXzLnta5bO5auKyMXnsHzVDlf0y2UzfltY8zuo0MISPiet1O+p CZjs8+9Z4GYvdQMpPKtvQeXKqxv/4mHgFfE+PLCWQ+RXhtvrtoYuw9Im9G9GBXJRkXuN kyvP1kbdr/45U5pTOVyuq4DIonV/mOB2QqUeNU6qfy9W/PwRg5oPjKvQYNoWTYrITa64 ACvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719199113; x=1719803913; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dEwtlNy5Ri7zGbh4PAox4paJaviZp5fihKeIERWT+fE=; b=RNS8efP/aZxnzdbuA2rNMdcX8xF1SMmKXvqjTF0tXU/24u8o0AFi8iMysCOSrcuBz7 BRvvgRqkVieluZX+m/Sw58qa6JXZbAHhJapw4SvbKrEpX7nv5tQLiEWARHqRkAfMsldY K+eU+XMzPI0GKZfLev9YPSdwit0T+sOElXNausD1etBJRlWxWJK8qBi734Tp7UcGy4i2 y4vaXqJHVcPLei34t9WLk79ylZhlAQbGICxU8i1b6jiezzwKc54Pl/1j4t9VJqQSpAo2 EMqLMY3RsvBSDcjcekIscB1F8Yq0ISLZXsJpfYM0TputxDcPLR1FYPqfrgaEi2RqXkiW H4Bg== X-Gm-Message-State: AOJu0Yz00XZtObRke4qh+iZZtWPSpJPjsoH4ZDn1Okb6aU3TLoht2ee5 OeELv4Ntp1SJJJoJ+5zg5STId6oe2m7qXmMl7ctdTHFlupjIUQ34hl6LmhQSc5Q= X-Google-Smtp-Source: AGHT+IHfgkeKxp3cKh1wcj+YDdQD8zjraoDxbgyDP8SBLhypETU05rw6kha2eZtpkslJqJDNFLT1QA== X-Received: by 2002:a0c:eb88:0:b0:6b5:4098:abe2 with SMTP id 6a1803df08f44-6b54098ad9amr38028326d6.52.1719199113373; Sun, 23 Jun 2024 20:18:33 -0700 (PDT) Received: from hurd (dsl-205-233-124-241.b2b2c.ca. [205.233.124.241]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b51ef497c1sm29816376d6.103.2024.06.23.20.18.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 20:18:32 -0700 (PDT) Date: Sun, 23 Jun 2024 23:18:32 -0400 Message-Id: <8734p33u5z.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #70880 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) tags 70880 + moreinfo quit From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 23 23:24:05 2024 Received: (at 70880) by debbugs.gnu.org; 24 Jun 2024 03:24:05 +0000 Received: from localhost ([127.0.0.1]:35931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLaJI-0003mY-Ty for submit@debbugs.gnu.org; Sun, 23 Jun 2024 23:24:05 -0400 Received: from mail-qk1-f176.google.com ([209.85.222.176]:47490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLaJG-0003lw-60 for 70880@debbugs.gnu.org; Sun, 23 Jun 2024 23:24:03 -0400 Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-797f222c9f9so246434185a.3 for <70880@debbugs.gnu.org>; Sun, 23 Jun 2024 20:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719199375; x=1719804175; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+xxhw4IQZ2eM7dETiZMI0gn1KLejfigVn610vc7Ui+M=; b=e9FX26OPA+dVYUKG4bMRHipx9/1kSnQnK7iTD3uP9bWnxUa4nsBOsKbLfkjsjPlL2e nW0kRdzTkk9rIe39vZPbYJZjNudHx5bEggyD0CtlWCILjdbzersZdki2IZpAdHMTqifr tAqksr37liVGpyLujKTQVJhklMk2DLs/dq8kxP5mIFGYQoqxhig7VAKIjhjQzmkytPtE lHfyGkMpZ2fVwe0tujd5dcC5hlvIbJp+CXwIZ5PjW5xvCrVgbvO43zYYY7tlPERAwQng n3eOB8hSZY8nCfb8Oykb/Bu+5mcGIGTKQBQ+h+MT4aCSZG1Rjpr77+jsD0Y8y48h+rfD vzIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719199375; x=1719804175; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+xxhw4IQZ2eM7dETiZMI0gn1KLejfigVn610vc7Ui+M=; b=c/VGmICsXZD7oQsSVIIczH7rAlEsWu8RUU7cHNkZAiUjADY9ozdN/8HAGMz0jgEoNE pKhV9QHcnsA9eOZXO4sbS9uTK+aR1TaJagQi0mY0wDDAo6ApR65NMFdtYYbBn9sKycOV P8L41NvzUOVL5TJxyKLEHVOh5zFLfP1k/xGYocx8fU1ADiDXwEbA/rApifopIcgF1H5f GFHK2H8ePsqf/TKaQ/ozky0EFp0w7nJ6PnRdTS8XK6KsGZzpHxeCRMOhNdU5fln6GVpA aZWmPgmPsbjz4dnovdA0CfgEdamauL8Qnn8SQG30zs6lRieEvEtvfEZzKNFnMbA0Pj/j fJTA== X-Gm-Message-State: AOJu0YwaG/Siv6KN5mdq2K3BJH59I4Z7rLOxde8D6j2EBYegFBpizZgX LL/mgsc/FHXOEyKeqR8UduhH6RQkr7Ytj4cvTXIBLW0j1BlP3SnJTDLniz+Q4ok= X-Google-Smtp-Source: AGHT+IFImbf8qXdFEImq84lGaqmDB1L/7mifeiKysADbiq9CkLSChwfLx38Rmg4NXGJwmqhRY2oyuw== X-Received: by 2002:ad4:5966:0:b0:6b0:7eaf:febb with SMTP id 6a1803df08f44-6b53bcda265mr57184976d6.31.1719199374856; Sun, 23 Jun 2024 20:22:54 -0700 (PDT) Received: from hurd (dsl-205-233-124-241.b2b2c.ca. [205.233.124.241]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b51ecfe944sm30528306d6.16.2024.06.23.20.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 20:22:54 -0700 (PDT) From: Maxim Cournoyer To: "Artyom V. Poptsov" Subject: Re: [bug#70880] [PATCH 5/8] gnu: heatshrink: New variable. In-Reply-To: <5ed96653a085765c79a2bf6b0150ddab179339f9.1715450052.git.poptsov.artyom@gmail.com> (Artyom V. Poptsov's message of "Sat, 11 May 2024 20:58:33 +0300") References: <5ed96653a085765c79a2bf6b0150ddab179339f9.1715450052.git.poptsov.artyom@gmail.com> Date: Sun, 23 Jun 2024 23:22:53 -0400 Message-ID: <87y16v2fea.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, "Artyom V. Poptsov" writes: > * gnu/packages/compression.scm (heatshrink): New variable. > * gnu/packages/patches/heatshrink-add-cmake.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add "heatshrink-add-cmake.patch". > > Change-Id: I0beccdcaed22e47ac6bfe522497e0759a315813d > --- > gnu/local.mk | 1 + > gnu/packages/compression.scm | 54 +++++++++ > .../patches/heatshrink-add-cmake.patch | 111 ++++++++++++++++++ > 3 files changed, 166 insertions(+) > create mode 100644 gnu/packages/patches/heatshrink-add-cmake.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index edd546f81d..3ba9253ae2 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1455,6 +1455,7 @@ dist_patch_DATA =3D \ > %D%/packages/patches/hdf-eos5-remove-gctp.patch \ > %D%/packages/patches/hdf-eos5-fix-szip.patch \ > %D%/packages/patches/hdf-eos5-fortrantests.patch \ > + %D%/packages/patches/heatshrink-add-cmake.patch \ > %D%/packages/patches/heimdal-CVE-2022-45142.patch \ > %D%/packages/patches/helm-fix-gcc-9-build.patch \ > %D%/packages/patches/highlight-gui-data-dir.patch \ > diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm > index 55784a70de..187bc73f2f 100644 > --- a/gnu/packages/compression.scm > +++ b/gnu/packages/compression.scm > @@ -39,6 +39,7 @@ > ;;; Copyright =C2=A9 2022 Zhu Zihao > ;;; Copyright =C2=A9 2021 Foo Chuan Wei > ;;; Copyright =C2=A9 2024 Vinicius Monego > +;;; Copyright =C2=A9 2024 Artyom V. Poptsov > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -570,6 +571,59 @@ (define-public xz > (license (list license:gpl2+ license:lgpl2.1+)) ; bits of both > (home-page "https://tukaani.org/xz/"))) >=20=20 > +(define-public heatshrink > + (package > + (name "heatshrink") > + (version "0.4.1") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/atomicobject/heatshrink/") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "0sdhvk27yz8kahw18j8pddbpkgl78v8rh8fx6wspc3acj7w7yvrn")) > + ;; Add CMake build script, wanted by prusa-slicer and libbgcode, = which are the > + ;; only users of this library. > + ;; > + ;; See > + ;; > + (patches (search-patches "heatshrink-add-cmake.patch")))) > + (build-system cmake-build-system) > + (arguments > + (list > + ;; XXX: No tests available with CMake. > + ;; See > + #:tests? #f)) > + (home-page "https://github.com/atomicobject/heatshrink/") > + (synopsis "Data compression library for embedded/real-time systems") > + (description > + "A data compression/decompression library for embedded/real-time sy= stems. > + > +Key features: I'd use complete sentences, such as "Among its features are: " > +@itemize > +@item Low memory usage (as low as 50 bytes.) > + > +It is useful for some cases with less than 50 bytes, and useful for many= general > +cases with < 300 bytes. > + > +@item Incremental, bounded CPU use. > + > +You can chew on input data in arbitrarily tiny bites. This is a useful = property in > +hard real-time environments. > + > +@item Can use either static or dynamic memory allocation. > + > +The library doesn't impose any constraints on memory management. > + > +@item ISC license. > + > +You can use it freely, even for commercial purposes. There's no need to add text to package descriptions boasting about their freeness; that's ensured by Guix :-). The rest looks good to me. Could you please send a v2? --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 23 23:25:15 2024 Received: (at 70880) by debbugs.gnu.org; 24 Jun 2024 03:25:16 +0000 Received: from localhost ([127.0.0.1]:35976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLaKR-0003pV-Iz for submit@debbugs.gnu.org; Sun, 23 Jun 2024 23:25:15 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:55589) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLaKQ-0003pG-4J for 70880@debbugs.gnu.org; Sun, 23 Jun 2024 23:25:14 -0400 Received: by mail-qt1-f172.google.com with SMTP id d75a77b69052e-44055ca3103so19235651cf.3 for <70880@debbugs.gnu.org>; Sun, 23 Jun 2024 20:25:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719199447; x=1719804247; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=3Ck7uYLzkM89iyCQkLsL5mLEU8fECJXHqWpUU9t3SNk=; b=fCvHpWelXET3kvdAPe1ANdb+JXTvdoKuXi43E33N67k0GgFWNZ5NMRhTWN6jLMXQKu uowY9/mRYre3la+IWrNSvyZlmsT5iSizJ4nONx+PlxhAqA1sIsptP3duz9/NZiVZOMAQ mxadrKEtJz8uPlDonIfUsazxlxjJnfkqgmMYanDmk73lB4GPBAVWrd2SZBc05/gBXjYC yoRpUE52z1EWikYvzKITJUXn2pjSjN9ys+8PFW/5BiDvu03FZ2SihldlsdFklMxVbgCy AsWEf63YaxgcFdWD8K/6lcncKS/9RiPax4OrQUQnE9+RgtRIKbfBc1ji8UbC0xH7horG i2dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719199447; x=1719804247; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=3Ck7uYLzkM89iyCQkLsL5mLEU8fECJXHqWpUU9t3SNk=; b=Rb9akhAV9xbVsKSXzzcvH92pGDJqPg61s9PhhtlaZ1Luavj+POSh5zl27SMOliNNmA nblWIwLyu213QR+QlAjgtcfjBGVtG/xLFexC7QfGcSQjI/nMeukq8x9iQ/iGUvcennC4 Qg4AqVoS+7TjhNKz2EjUaMXr3PHI++0euT7lvfGZMUGDUjDAIKKN4GR5SlArFyPDQ6j3 8uGCMh4I8/WMZ53AZC40FmeG/Pu6J9La1xALpfK0m23U/MhqIOQ0Fl64xOBh/cMjsC0t 5kz5+j+a2/lZy+ks87KqsTiwY/2wXqXz/xJjE335krVp+FY2g3W2EAgoFAMMu5rMXMkR dXOQ== X-Gm-Message-State: AOJu0YwWNh7MUh48Yfyh3q4+z7dZkD+I/3sqZVUKj+cWYWFBdfeBtxsO LDB8RLofSV3aiz7yPpLoVqHYqXar8j3mltvFILeR29m6jKswm6fuqeGn+AUT7NA= X-Google-Smtp-Source: AGHT+IG3NCVg5soEdxz7mdpX5/ME7Ydsvu/ED2bqHqaIP/IreDN4VforRm3dlVZkdnEogOPEX0nSUg== X-Received: by 2002:a05:622a:164a:b0:441:37b:cd5e with SMTP id d75a77b69052e-444d91e35fbmr48950681cf.5.1719199446908; Sun, 23 Jun 2024 20:24:06 -0700 (PDT) Received: from hurd (dsl-205-233-124-241.b2b2c.ca. [205.233.124.241]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-444c2b6aadcsm37731211cf.25.2024.06.23.20.24.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 20:24:06 -0700 (PDT) From: Maxim Cournoyer To: "Artyom V. Poptsov" Subject: Re: [bug#70880] [PATCH 5/8] gnu: heatshrink: New variable. In-Reply-To: <5ed96653a085765c79a2bf6b0150ddab179339f9.1715450052.git.poptsov.artyom@gmail.com> (Artyom V. Poptsov's message of "Sat, 11 May 2024 20:58:33 +0300") References: <5ed96653a085765c79a2bf6b0150ddab179339f9.1715450052.git.poptsov.artyom@gmail.com> Date: Sun, 23 Jun 2024 23:24:05 -0400 Message-ID: <87tthj2fca.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Another nitpick: the commit summary line should read 'gnu: Add heatshrink.' -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 23 23:30:03 2024 Received: (at 70880) by debbugs.gnu.org; 24 Jun 2024 03:30:04 +0000 Received: from localhost ([127.0.0.1]:36142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLaP4-0003zQ-DF for submit@debbugs.gnu.org; Sun, 23 Jun 2024 23:30:03 -0400 Received: from mail-qv1-f53.google.com ([209.85.219.53]:60793) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLaP2-0003yv-Gf for 70880@debbugs.gnu.org; Sun, 23 Jun 2024 23:30:01 -0400 Received: by mail-qv1-f53.google.com with SMTP id 6a1803df08f44-6aedd5167d1so17140476d6.1 for <70880@debbugs.gnu.org>; Sun, 23 Jun 2024 20:29:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719199734; x=1719804534; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=tGg/r7dQBcXxzuYk/FNr7jqw+bNwP+YqIwb9NzF4Vtw=; b=Lr3ynPGT0XHShSygFF90DeGq0B7vKpkxc64PA+yg8BoNcnGCJPFJdhNjdwaKby1Krh O1RWWwNOG98ezFY5nElzIbDk6V24D1zwFnJdYDnRH2HpZYKshFEMxmVNFcVN6pPDMCRn 9izbRgHakahtQo8eSwEqwIZxs0bdVzbH0tnKWBjBUANgZaG2DlR2nxa7G9l3lmxjxsKf V/+u0vUGKU60bZ5hfPHZr4hZ2NRKbKqFFHWLtARbi5PucXj6RCXNIr73tt3Vxwl9BJgN 7sM9s7DmSHv2w2NN6axg48ty60cyx0qTPu/y3xqnwss3Brc13KxOGakMH8qWvarQwb5u fFYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719199734; x=1719804534; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=tGg/r7dQBcXxzuYk/FNr7jqw+bNwP+YqIwb9NzF4Vtw=; b=TIK5p4y2nRrNRHiKFRLPxTjqiRG4CuCnkdDdqJT532hwFbzMMgBJdF/xKZ+nCXusbA tEzdzju1NjCJo6v/uuBrX3QUQvKik15BLuDQVFwSEs1Raegg4Outvz05nzGWv6t8ELN5 7jS7uixG4tfy5S01coxET3DxKrQUB1zH2oehgJ39B0koENeTl8YjDw04tA1z35fUk9mL yuQNjITeev6mJyaKalWWB9CqaIEpcv+lgkSriTfyzd1V8ZyLaNUPmHm0ZZ2qvzHllZ+8 Jh9nWFyhoatcZo8wsMlXE8TFnS2URjeXPBoNdr6OJ1BXeB4xIX62ZKvhMMf3DB19qiCf DcCA== X-Gm-Message-State: AOJu0YzHP8uLXj6rpKSLy9vnQw9eQt0ETNLdnv9Rtf/yvqk7hhikxO3r 0GeVFBZTgrJfkvVFk5jybdPuid6cI2E5mJRidZOzmYPCrP8ex6XWkPSiXHzHOWg= X-Google-Smtp-Source: AGHT+IHCi44ww8GYMyj3yrfoonsTL42q885cRLNdrWPU09on+ccFQRrhLlXxHI/Sw5nz5aaLZsumAA== X-Received: by 2002:a05:6214:20e2:b0:6b5:24b:f430 with SMTP id 6a1803df08f44-6b540a91d2emr42682536d6.40.1719199734217; Sun, 23 Jun 2024 20:28:54 -0700 (PDT) Received: from hurd (dsl-205-233-124-241.b2b2c.ca. [205.233.124.241]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b51ef30eebsm30554166d6.97.2024.06.23.20.28.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 20:28:53 -0700 (PDT) From: Maxim Cournoyer To: "Artyom V. Poptsov" Subject: Re: [bug#70880] [PATCH 7/8] gnu: Add prusa-wxwidgets. In-Reply-To: (Artyom V. Poptsov's message of "Sat, 11 May 2024 20:58:35 +0300") References: Date: Sun, 23 Jun 2024 23:28:52 -0400 Message-ID: <87pls72f4b.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org, Nikita Domnitskii X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, "Artyom V. Poptsov" writes: > * gnu/packages/engineering.scm (prusa-wxwidgets): New variable. > > Co-authored-by: Nikita Domnitskii > Change-Id: I9043c2acc95986275ee24d9c5d944e5fe2702e99 > --- > gnu/packages/engineering.scm | 27 +++++++++++++++++++++++++++ > 1 file changed, 27 insertions(+) > > diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm > index b1776484b5..08ff06fa94 100644 > --- a/gnu/packages/engineering.scm > +++ b/gnu/packages/engineering.scm > @@ -3798,6 +3798,33 @@ (define-public prusa-libbgcode > "Prusa Block & Binary G-code reader/writer/converter.") > (license license:agpl3)))) > > +(define-public prusa-wxwidgets > + ;; There is no tag/release, all patches are in separate branch. > + (let ((commit "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26")) > + (package > + (inherit wxwidgets) Due to not being delayed, inherit fields should only be used with values defined in the same module. So you should move prusa-wxwidgets to where wxwidgets comes from. See (info '(guix) Cyclic Module Dependencies'). > + (name "prusa-wxwidgets") > + (version "3.2.0") > + (home-page "https://github.com/prusa3d/wxWidgets") > + (source > + (origin > + (inherit (package-source wxwidgets)) > + (method git-fetch) > + (uri > + (git-reference > + (url home-page) > + (commit commit) > + (recursive? #t))) Recursive checkouts often mean bundled libraries are pulled and built as part of the same package, which should be avoided in Guix if the build system has supports for it. For this reason, we always leave a comment explaining why it's needed. > + (file-name (git-file-name name version)) > + (patches (search-patches "prusa-wxwidgets-makefile-fix.patch")) > + (sha256 > + (base32 > + "02nd07c23xbclnf1jjfbv6r5vqjb80gsdy2l559c5qzgdcvfd2xd")))) > + (arguments > + (substitute-keyword-arguments (package-arguments wxwidgets) > + ((#:configure-flags flags) Is this done to match upstream configuration? Perhaps add a comment. > + #~(cons "--disable-glcanvasegl" #$flags))))))) > + > (define-public prusa-slicer > (package > (name "prusa-slicer") Could you please send a v2? -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 23 23:31:12 2024 Received: (at 70880) by debbugs.gnu.org; 24 Jun 2024 03:31:12 +0000 Received: from localhost ([127.0.0.1]:36190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLaQB-0006mr-NN for submit@debbugs.gnu.org; Sun, 23 Jun 2024 23:31:12 -0400 Received: from mail-qk1-f169.google.com ([209.85.222.169]:49306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLaQ9-0006Xr-8g for 70880@debbugs.gnu.org; Sun, 23 Jun 2024 23:31:09 -0400 Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-797f1287aa3so258470785a.2 for <70880@debbugs.gnu.org>; Sun, 23 Jun 2024 20:31:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719199803; x=1719804603; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=7mHbYfAI57yNAY8nhk5UsgF1WvXCcOlf/p0utwOMLgs=; b=OVmSGL5BsyF61C4Pwpx3nPqRhu8pOTdNqD3ucI7KeH0Eo3Zj39TUznfowFPlUs4Ort 7QkSxD319p3XEYd9eZCxV3YfWcampJOhUYv85cCWBFhvB0/LHwjvwthgfLRnkUme5XYX iqQ0vt2X3j/BtKgMk+vWtHlEfWk0qzW7lTD5A8yL61ztAxGKERuAl8ZaN57NrSjRIDvv g0VLy+ieKEUzTUlqLNFIwWhzIYypGSRJl5qgVhvG4nFdOMMSxFXGfDLWft08Lq4MskK7 C0DJKu8Z2LeDXjI4rzNkYzoW+NPXDUigKXUDFgUTbdVZRfWzqtYWaZ52G3/5H5Z59FAo 7A0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719199803; x=1719804603; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7mHbYfAI57yNAY8nhk5UsgF1WvXCcOlf/p0utwOMLgs=; b=r3PZi/Z1g13wDUjDWweZiywp2Re/LV12Ilv42M9gocGJ34qd8s8iQ3ydSZRh70rwOM 0P4LI2BwL5OERczs/Dt+XV9w4tlWlBC5OTQlNhCdCfwhgHv9EFnIDyXspRwJaBzaNTQY xLUxAJLXcg9alP54GpH9vRlzqKIjM+sGBAEdcBsJ1vug2Qs97+Hx+b1S6Y+4+Te0+pq9 hpEE0WC2ODno+mLyZmBoX9snzpxHYpKHoDxx9DexUtwGRtPa4l+YVoa37bwoJ9zaAIVm eqPeXV1DHv3MoSeXS1/pjZhIL0vqrIh/k6SHqNCfVT4El8DjUc9xdi4uyGDzjZBrPZGR roaQ== X-Gm-Message-State: AOJu0YyhcsPdR44qZOu83IXn3dKo0Cw9cGNdlYS8vX8YMZTHYpOMVJb7 J6kPQIGN4yS0UJOW15rsYyheUPJlY09Kknz7jT+VfRVu1sVW9/q9 X-Google-Smtp-Source: AGHT+IH2RGFa707DW2TAnw6T8RDfQXzbvlrJAwnnCIFk74V/5+82CedzbP3/eV2uZozO02baUibh3w== X-Received: by 2002:a05:620a:2984:b0:79b:e70f:3950 with SMTP id af79cd13be357-79be70f3ce4mr529156985a.14.1719199802923; Sun, 23 Jun 2024 20:30:02 -0700 (PDT) Received: from hurd (dsl-205-233-124-241.b2b2c.ca. [205.233.124.241]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79bce8b2c18sm278290385a.30.2024.06.23.20.30.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 20:30:02 -0700 (PDT) From: Maxim Cournoyer To: "Artyom V. Poptsov" Subject: Re: [bug#70880] [PATCH 7/8] gnu: Add prusa-wxwidgets. In-Reply-To: (Artyom V. Poptsov's message of "Sat, 11 May 2024 20:58:35 +0300") References: Date: Sun, 23 Jun 2024 23:30:01 -0400 Message-ID: <87le2v2f2e.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org, Nikita Domnitskii X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, "Artyom V. Poptsov" writes: > * gnu/packages/engineering.scm (prusa-wxwidgets): New variable. > > Co-authored-by: Nikita Domnitskii > Change-Id: I9043c2acc95986275ee24d9c5d944e5fe2702e99 > --- > gnu/packages/engineering.scm | 27 +++++++++++++++++++++++++++ > 1 file changed, 27 insertions(+) > > diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm > index b1776484b5..08ff06fa94 100644 > --- a/gnu/packages/engineering.scm > +++ b/gnu/packages/engineering.scm > @@ -3798,6 +3798,33 @@ (define-public prusa-libbgcode > "Prusa Block & Binary G-code reader/writer/converter.") > (license license:agpl3)))) > > +(define-public prusa-wxwidgets > + ;; There is no tag/release, all patches are in separate branch. > + (let ((commit "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26")) > + (package > + (inherit wxwidgets) > + (name "prusa-wxwidgets") > + (version "3.2.0") > + (home-page "https://github.com/prusa3d/wxWidgets") > + (source > + (origin > + (inherit (package-source wxwidgets)) > + (method git-fetch) > + (uri > + (git-reference > + (url home-page) > + (commit commit) > + (recursive? #t))) > + (file-name (git-file-name name version)) > + (patches (search-patches > "prusa-wxwidgets-makefile-fix.patch")) Another thing: patches should be registered within the gnu/local.mk file, so as to be included in the 'make dist' archive. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 23 23:39:26 2024 Received: (at 70880) by debbugs.gnu.org; 24 Jun 2024 03:39:26 +0000 Received: from localhost ([127.0.0.1]:36479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLaY9-00078g-7H for submit@debbugs.gnu.org; Sun, 23 Jun 2024 23:39:25 -0400 Received: from mail-qv1-f50.google.com ([209.85.219.50]:54508) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLaY7-00078P-Kj for 70880@debbugs.gnu.org; Sun, 23 Jun 2024 23:39:24 -0400 Received: by mail-qv1-f50.google.com with SMTP id 6a1803df08f44-6b4ff803ef2so18197706d6.0 for <70880@debbugs.gnu.org>; Sun, 23 Jun 2024 20:39:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719200296; x=1719805096; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=GRvvhf0nZjHVDcFJXURWqS0LhRYz8Sc8JYgc4ge9Xpw=; b=ZB4AapaGpZzK3qlapzlmX4JcwGOSroBlROkLj0QO9vIFlUw7zUS6qojDhs/oh/liDF oaXEMxvJ0aZPkXnh8ds+XPKwhM5CFpn8CipxxHhKr8Ld7U9eJ7H3JtbV3PgScfsj11Zu 3hMA8siVZBJOETRBZ4b4t6NczlBnJGvv6QYYvXwZKj6f8eI1nBcRf4WMSbdezsJXcQ7u zgEwerRkpvDyDcQZ3CVKbTzCqsgN0RMTVgumFvwtCCqIVvDTLwP2BqBrOQyj0JsKaSfd NsZya6kKELxL9yJgDZOYilQ3baw7pTR1ejfoYz/aFB8z9GQCkIN7EOai/6DubzfJ9rPW A2Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719200296; x=1719805096; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=GRvvhf0nZjHVDcFJXURWqS0LhRYz8Sc8JYgc4ge9Xpw=; b=xU+ITIqsMCzMnoSnbWKLvi0GLo/ztDsGpCinBXYMx5pJ+zG2Wai8+Li2nXcpYv07Qo GRkXHsc9YSgkd0TI7FHSyRIa6fHqdgego5ADvTm6OKMzscIhIdXDW5znw63bsATtjHt4 K3V98uTtqlsWfoPX2mSX9F5sa0GBtFqn2vlCg9a4rb+clTyxk6PCwzU7iRApKLLTBdTo TiCQ3lJkZxUyydVkM6mg2HMi94olNsEwN9cIM+F4eh8bYqpceTw7/l1qTSnS7NVlX+xl 5Rrc2d1y2plS7h25txUCG9qjEmrSQyCHJ3ZXQx2ELjaqCqPQaq23YIq6mGpK5AGVr6t7 SCKQ== X-Gm-Message-State: AOJu0YzSENDCQ0O7l8ZPdWTgcwvxceIdYycj+6mSOCR2juMGlSRolcW8 BrQqQILTVpGNz5SOkf1crftIToY7h4Zr6EQO0PgsEOwvl43ot5NGVguYRg8eXVo= X-Google-Smtp-Source: AGHT+IGGGz2zp+oiJpnc9jq4T4bLF6wS7H7T2VHVUNHIu/kW+PFjZ1cIrGfMmDsVYAWG59WiJXmgww== X-Received: by 2002:a0c:e112:0:b0:6b2:b00f:a13c with SMTP id 6a1803df08f44-6b540cebbfamr34043236d6.58.1719200296227; Sun, 23 Jun 2024 20:38:16 -0700 (PDT) Received: from hurd (dsl-205-233-124-241.b2b2c.ca. [205.233.124.241]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b51ef67092sm30461496d6.129.2024.06.23.20.38.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 20:38:15 -0700 (PDT) From: Maxim Cournoyer To: "Artyom V. Poptsov" Subject: Re: [bug#70880] [PATCH 8/8] gnu: prusa-slicer: Update to 2.7.4. In-Reply-To: (Artyom V. Poptsov's message of "Sat, 11 May 2024 20:58:36 +0300") References: Date: Sun, 23 Jun 2024 23:38:14 -0400 Message-ID: <87h6dj2eop.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Artyom, "Artyom V. Poptsov" writes: > * gnu/packages/engineering.scm (prusa-slicer): Update to 2.7.4. > [source]: Add "prusa-slicer-boost-fixes.patch". I think you meant 'remove' rather than 'add' here; and another patch was removed as well. > Move some part of the > snippet code to custom build phases. > [arguments]: In configure flags add paths to external libraries. > Add "fix-include-paths" phase. > [native-inputs]: Add "catch2". > [inputs]: Use "prusa-wxwidgets" instead of "wxwidgets" to fix segfaults. > Ad "qhull", "nanosvg", "heatshrink" and "prusa-libbgcode". > * gnu/packages/patches/prusa-slicer-boost-fixes.patch, > gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch: Remove unused > patches. > * gnu/local.mk (dist_patch_DATA): Remove unused "prusa-slicer" patches. Nitpick: I typically use 'Register / De-register' wording for adding or removing entries to local.mk. > > Change-Id: I15e85d63c9ad6c731c8040ef2d8ec8b2f31f2ab7 > --- > gnu/local.mk | 2 - > gnu/packages/engineering.scm | 51 ++++++---- > .../patches/prusa-slicer-boost-fixes.patch | 97 ------------------- > .../prusa-slicer-with-cereal-1.3.1.patch | 52 ---------- > 4 files changed, 33 insertions(+), 169 deletions(-) > delete mode 100644 gnu/packages/patches/prusa-slicer-boost-fixes.patch > delete mode 100644 gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 3ba9253ae2..3b61666803 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1816,9 +1816,7 @@ dist_patch_DATA = \ > %D%/packages/patches/pokerth-boost.patch \ > %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ > %D%/packages/patches/procps-strtod-test.patch \ > - %D%/packages/patches/prusa-slicer-boost-fixes.patch \ > %D%/packages/patches/prusa-slicer-fix-tests.patch \ > - %D%/packages/patches/prusa-slicer-with-cereal-1.3.1.patch \ > %D%/packages/patches/pthreadpool-system-libraries.patch \ > %D%/packages/patches/python-3.12-fix-tests.patch \ > %D%/packages/patches/python-accupy-use-matplotx.patch \ > diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm > index 08ff06fa94..99f7c82d7d 100644 > --- a/gnu/packages/engineering.scm > +++ b/gnu/packages/engineering.scm > @@ -3828,7 +3828,7 @@ (define-public prusa-wxwidgets > (define-public prusa-slicer > (package > (name "prusa-slicer") > - (version "2.5.2") > + (version "2.7.4") > (source > (origin > (method git-fetch) > @@ -3837,13 +3837,11 @@ (define-public prusa-slicer > (url "https://github.com/prusa3d/PrusaSlicer") > (commit (string-append "version_" version)))) > (file-name (git-file-name name version)) > - (sha256 (base32 "02qcrw3fa0d8ldbp73hp14l1qxbp3f4608j4csc07ny00ra42151")) > - (patches (search-patches "prusa-slicer-boost-fixes.patch" > - "prusa-slicer-fix-tests.patch" > - "prusa-slicer-with-cereal-1.3.1.patch")) > + (sha256 (base32 "0s1cfvhfilyv0y98asr61c6rwlgyr1hf5v5hg8q9zwmzm2bkcql3")) > + (patches (search-patches "prusa-slicer-fix-tests.patch")) > (modules '((guix build utils))) > (snippet > - '(begin > + `(begin > ;; Prusa slicer bundles a lot of dependencies in src/ directory. > ;; Most of them contain prusa-specific modifications (e.g. avrdude), > ;; but others do not. Here we replace the latter with Guix packages. > @@ -3851,10 +3849,12 @@ (define-public prusa-slicer > (delete-file-recursively "src/hidapi") > (delete-file-recursively "src/eigen") > (delete-file-recursively "src/libigl/igl") > + (substitute* "CMakeLists.txt" > + (("add_library\\(libexpat INTERFACE\\)") > + "")) > + (substitute* "src/libigl/CMakeLists.txt" > + (("target_link_libraries\\(libigl INTERFACE igl::core\\)") "")) > (substitute* "src/CMakeLists.txt" > - (("add_subdirectory\\(libigl\\)" all) > - (string-append > - all "\ninclude_directories(libigl INTERFACE libigl::core)")) > (("add_subdirectory\\(hidapi\\)") > "pkg_check_modules(HIDAPI REQUIRED hidapi-hidraw)") > (("include_directories\\(hidapi/include\\)") > @@ -3867,13 +3867,24 @@ (define-public prusa-slicer > (("\\bhidapi\\b") "${HIDAPI_LIBRARIES}")))))) > (build-system cmake-build-system) > (arguments > - `(#:configure-flags > - '("-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard. > - "-DSLIC3R_GTK=3" ;; Use GTK+ > - ;; Use wxWidgets 3.0.x.x to prevent GUI crashes when adding support enforcers. > - "-DSLIC3R_WX_STABLE=1"))) > + (list #:configure-flags > + #~(list "-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard. > + "-DSLIC3R_GTK=3" ;; Use GTK+ > + ;; Use wxWidgets 3.0.x.x to prevent GUI crashes when adding support enforcers. > + "-DSLIC3R_WX_STABLE=1" > + (format #f "-Dlibigl_DIR=~a/lib/cmake/igl/" > + #$(this-package-input "libigl")) > + (format #f "-DCatch2_DIR=~a/lib/cmake/catch2/" > + #$(this-package-input "catch2"))) This may be possible to express via e.g (search-input-directory %build-inputs "lib/cmake/igl"), if only one package provides that. The benefit is that then that's a runtime thing that plays better with inherited variants and package rewriting. > + #:phases > + #~(modify-phases %standard-phases > + (add-after 'unpack 'fix-include-paths > + (lambda _ > + (substitute* "tests/libslic3r/test_quadric_edge_collapse.cpp" > + (("#include ") > + "#include "))))))) > (native-inputs > - (list pkg-config)) > + (list pkg-config catch2)) Please sort in alphabetical order. > (inputs > (list boost > cereal > @@ -3899,9 +3910,13 @@ (define-public prusa-slicer > pango > tbb > eudev > - ;; prusa-slicer 2.5 segfaults on startup with wxwidgets 3.2 > - ;; See https://github.com/prusa3d/PrusaSlicer/issues/8299 > - wxwidgets-3.0 > + qhull > + nanosvg > + heatshrink > + ;; XXX: Using Prusa wxWidgets fork as PrusaSlicer segfaults when compiled > + ;; with regular wxwidgets. > + prusa-wxwidgets > + prusa-libbgcode Likewise. Otherwise LGTM. Could you please send a v2? -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 01 12:27:13 2024 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 16:27:13 +0000 Received: from localhost ([127.0.0.1]:34197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOJrx-0000vv-O7 for submit@debbugs.gnu.org; Mon, 01 Jul 2024 12:27:13 -0400 Received: from mail-lf1-f44.google.com ([209.85.167.44]:49525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOJrm-0000vF-41 for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 12:27:07 -0400 Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-52e7693c369so4234901e87.3 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 09:26:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719851151; x=1720455951; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Rq8xf5L/zxVAem6CtCyCkblkJdoPRKIc7ExZn8v23Ak=; b=g+S8wYutye46nA0LgyYIW5WrG/DrprdXBE4s1D0llus9mufSOVIJcesLLpXSGfecyW Cwv7jX+dzyK0x/n4/JwPYBf5WyZJQFo1iiqkyzzSXH3sUOYqWAdHnwSuTaaeohZ2qfCh gHuFQMisNlYGLneQw85yf/YnHwffzwy6N3K5eZ9NTCne828hQRyx/JksJ0z9URbuzKnG UBNK/m89OoOoRp7Rjhag2n00GhT37diymGnD3tRfULyn6DyaJcv9d1jkzNcgMyL/87Od 6QCO/EgPZMvkFt7g1ymAuGT+P7Mn8kPWxN0LBkcLkfS1/rteZfeLeZDj2i3c1t22Qv+I 8GSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719851151; x=1720455951; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Rq8xf5L/zxVAem6CtCyCkblkJdoPRKIc7ExZn8v23Ak=; b=s8a90EoNSbCt67sSd77G1oP7e5G/oJHwUhOWElPXZFr5bf36EQOWEXRbrOIMnjzrIY 2/d/GCVwo2aYkEVFOlgSG02AbSxYLWq8EAPYsLheqhOnfY+j8yh5ZPSCq+DbyoH4vfS/ 0W6Xx5u/E32oic7za871rcEfk5rbMDsYaVDCuYESLJC5hVtoHXbw9yCbbaXrOrrNsszw RspQqAf6KJ3v/SgdxNxKbN4xrq/VCxKiWFcN8eStEWZ1xllkA0/NkKcG/ClcagEH/24t OyoFfGruKGbrx2X/91IZOqnL8J4F5nVrgrATo1n2ijn9ERDKZdxjlVI2Mz2xFziw+FyS OJJw== X-Gm-Message-State: AOJu0YyfCd6rOWYOcDKFdqHPDlUxLERMUv4Tah2dJDziaGri7cnSwvhe ArfdffD2WKP8WjCogxkcV1+P667P9mpVuybYOzfjlw4WuPQ8C8N+pwK50g== X-Google-Smtp-Source: AGHT+IHUqDEJ3Q4AiSRiRR7ep+jZXae6VcARwVlsow51Y/lR8ScmgU83kv3h2GoQDbLq8n3nO20tPg== X-Received: by 2002:a05:6512:b11:b0:52c:7f12:61d1 with SMTP id 2adb3069b0e04-52e82643bdemr4908571e87.1.1719851150633; Mon, 01 Jul 2024 09:25:50 -0700 (PDT) Received: from elephant ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab27b14sm1492093e87.125.2024.07.01.09.25.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 09:25:49 -0700 (PDT) From: "Artyom V. Poptsov" To: Maxim Cournoyer Subject: Re: [bug#70880] [PATCH 6/8] gnu: Add prusa-libbgcode. In-Reply-To: <874j9j3u65.fsf@gmail.com> (Maxim Cournoyer's message of "Sun, 23 Jun 2024 23:18:26 -0400") References: <15e75ed6a8a2c035194ca4ee66c0fb48b04a48d7.1715450052.git.poptsov.artyom@gmail.com> <874j9j3u65.fsf@gmail.com> Date: Mon, 01 Jul 2024 19:25:38 +0300 Message-ID: <87cynxnkot.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hello Maxim, first of all, thanks for reviewing my patches! > s/&/and/ Fixed. > This needs to be fleshed out more (what are Prusa Block and Binary > G-code? Any features that stand out?). Currently it's a duplicate of > the synopsis. Expanded the description using information from > Just checking, it's agpl3 only, not + (or later) ? It turns out you're right -- this library is under "AGPL3 or later", according to this file: Fixed. =2D avp =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJNBAEBCgA3FiEEAf2F9Bp7f4IFgwalk16+BzbchX4FAmaC2IkZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRCTXr4HNtyFfnrjD/9oMOOwcgg7K0yazVsDjk0B 3cJiCLhR7/ik2gTk8opcOlSjGI/rR7+ubA850EaNHHMxb4NQkUCSFKyaIcq+bLEd 0ULhD79g9jusYYlDeodJn8wbRCkHYQS8VoW9YilSJyfMEDn3EL+8ghUQgeWTCzL7 CKR+gtqOHjYwc1sZEFcWvmXv4Lp9rtP1MFZqsUBe3sPUofxqT4GQ2Ogys8tF3WAx 0q3WW6Aou69XFIyME3uYZYYstf25j5MEGjb6ASnPhWLarILF/ZKs+4vEy4pL+N5B HfjDcVYpU1nEAS40rRHt9iYbvc01ZKlvYXgwRrH37rNImZ+n7P6g61kr6NU3zL0t jLP1ED2w914MfkIUkMVyw0JhfUMnIIKOV5Jan9zZorfjU3x582XcU7inH9RQML7u 4xCfjExcAUPl1MurgXTaHEkpBeo6TMsUL7zjnolOAPuVLLuXrY4gXK+ccISC2ATf eOQOQC716CxCSDmilZHINeO9sIcahhKJHqavuT32WSkgS9nSxcjE9wB85UTKNTpO E255UysUxZuEkQzJtqCvQ8qlRDbP1Fu0xbKjgfcBMXuEaqYF9UqAD89ZGRXBUqPs 9YKQV2+3pyx8cVUBAgPrjci758V5KRFKixNb6UMjrSIrIvSG4qCrl9awEW8b6FEA X+8B3cVtA6xspDgAmfRB/A== =KGCt -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 01 13:08:36 2024 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 17:08:36 +0000 Received: from localhost ([127.0.0.1]:34343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKW4-0004w6-CR for submit@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:36 -0400 Received: from mail-lf1-f46.google.com ([209.85.167.46]:60728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKW2-0004vw-Ix for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:35 -0400 Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-52ce6c8db7bso4870457e87.1 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 10:08:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719853653; x=1720458453; 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=9lwmqNGasvk7wwxlnxUrJ3M6Nr5BohUT2D7rI09Fgwk=; b=Ase560hjl2PPAaeyxrCTKTADwqxxHDnjq68fZZnCfioBLNJvFGOFc2JOvBgOGcO4KS D/NrSSUXJf3VWgRfuEZCaUD6OPKeVe/fcDh78GNb/XQiPT0oPaW4bKv1+rc0bBOSdQ9q /MoIHP0rRqyAcPvr63rTpdu5DXkFmAafpIJ+TWtvYqXoTwB/8NtKvhXDpMfCPHLVyiUg ims3B014LoP+/cKDxyehL4/ggBGyxNN44pWpyW8Ue6CF+E3c+YAwye7DPF6/LkCwVCXq XBF1k+YeBinZIcgfk9KZ4XrgmPB/xZgykaDf3oab6glVbbEXrAjeUYZQiyZgQBGkSMmr z8Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719853653; x=1720458453; 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=9lwmqNGasvk7wwxlnxUrJ3M6Nr5BohUT2D7rI09Fgwk=; b=EgfFteNXtMUXs1lI+uk/dPdLebWjuZ4vQ8qFlBxwIgUkiYPpMAbxx7aXUu63LbK+0S JQlzzsa2oMpR6FgVvYCB79yHwHdUWw5hgzFIyxlPG+veun9QIjJDhVT0p3XeOV20Hjbe inZ3b2Jry1OiPjdzXfJBu4yO4PvaeWV50pHJaj5D/TDAf5c12Qa4NCvXl5ZrAKPksHTx 0cntqQLTTYdu81yuWRunJEhiHyIBe0EPQtVIUHM58yAu7YCInEpVYaoBPEwQHMW4sGFZ BYGUB+zUxXr0Wi1zzFrRZNLaUXTbkdN19uG/eUU0sq3VEt05TnU9SUGph7BxUL4GEWU5 Z+2A== X-Gm-Message-State: AOJu0Yw/nmPWgXSmLGjvzN8wOdSXWue6dVxdmZVG7vm5dXpHAYdSruLD vIkMCYhaVGB/FRhOU/lOntdU0hbiPxlyXaXkDQXMwNNMHketLJp618joCg== X-Google-Smtp-Source: AGHT+IGOzttKXyBG9RWPAve0SJL0qb9+f9leAazDOTpdtc+d4mwiqR7zBndHoOpCHQGOZBXJRfnlpA== X-Received: by 2002:a05:6512:2213:b0:52c:db28:4d92 with SMTP id 2adb3069b0e04-52e82651a59mr4530230e87.11.1719853652231; Mon, 01 Jul 2024 10:07:32 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab2793fsm1497282e87.123.2024.07.01.10.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 10:07:31 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH v2 3/8] gnu: glfw-3.4: New variable. Date: Mon, 1 Jul 2024 20:07:05 +0300 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gl.scm (glfw-3.4): New variable. Change-Id: I77f2214c78f35455436897a3fbff083331295314 --- gnu/packages/gl.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f40ddaeb86..2d684e9c80 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -995,6 +995,21 @@ (define-public glfw and surfaces, receiving input and events.") (license license:zlib))) +(define-public glfw-3.4 + (package + (inherit glfw) + (version "3.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/glfw/glfw" + "/releases/download/" version + "/glfw-" version ".zip")) + (sha256 + (base32 + "1sd396kkn53myp61kxrd18h7b1q4ix173hhxhvl0iz8j4x5h1v5m")))) + (inputs (modify-inputs (package-inputs glfw) + (prepend pkg-config))))) + (define-public nanovg-for-extempore (let ((version "0.7.1") (revision "0") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 01 13:08:40 2024 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 17:08:40 +0000 Received: from localhost ([127.0.0.1]:34347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKW7-0004wQ-MC for submit@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:39 -0400 Received: from mail-lf1-f48.google.com ([209.85.167.48]:45482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKW6-0004vt-0S for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:38 -0400 Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-52e829086f3so2886481e87.3 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 10:08:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719853651; x=1720458451; 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=DaACwQmu09jkpS9TjCtkeocIfpStWzpiPMu5xwaiDA4=; b=k3qx200E7KzDG7TxlJmol/cNvOVkEGJmvw3xkah0X3dHRkbqQdu19+rc6AGI7whmwQ xs4J3im8HiYNsgl+yOc0KyewuSmkLX5DyYnrsRz8MWW9vOxXMI3Dd8w7NeiMIO4gyQ10 AJnXpACv1jaLXr4b8zJ3vyRIYNMdEmgxrthq15fdjU25tOfJFb2VVW6r61Vio29Fai02 CsTdy9DCGzdHTPX4qklCysMgJAWMTFEbBxfEmGcf6NO1BRrGJ4gleGQ9UW7B6MjzO7NF QZdU2wMkt+k77S/ubIqKdwcM9dyKFlC6bo/flNFYoMCrTponok6cyok4VMuUCvMRtu+M sAuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719853651; x=1720458451; 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=DaACwQmu09jkpS9TjCtkeocIfpStWzpiPMu5xwaiDA4=; b=czmGoN/oWwd5FcoYLShsS7NW3FuCm/2bjf4rMfdTOzlCeBtTmU76LjruN7WK9KOqUF gSgpKbrq97AwAnmFON5IdP3RlUJ0WvjBB5yHkAvrLbHuyIqPL0C+aDtmWNskmA2COxAM Lwfh0Bp8O6Z05XfOnHETR4BfIWTbXQquArUgfLkVQZq4EqSDjn3jG6nYHiKhmSij2Emn l+zL2/W6iHR+DBl3/QQsE0uLAv/suMkTp3VJvqUJ+MG5pBplW4N7kheHt+cBuV6D+ZcT ACxUVBs8TFj+LOw1A/AUKMuyYJCx1BPEBmvJVZg6kXmop0JL30G1GSN1P/IbsSs/NAME HI/g== X-Gm-Message-State: AOJu0Yxo1cqgjeVKjlJ14Flp9DoZwvtKoY+Flp5Ruvnn1EVUSTs7fW/n OSmIkc0/qBJ8WMT3GrmpA9XcsGujr3oU3UaJxNpGamj/gR6FTb3k/9w6nw== X-Google-Smtp-Source: AGHT+IEsMpC8DEFCUDluhz9baHwJkJeOmOMO/tab8nOpYubcLswyORrQep5OURYXoFh8uErxpOFgDg== X-Received: by 2002:a05:6512:3baa:b0:52c:d943:300f with SMTP id 2adb3069b0e04-52e8268b961mr3942175e87.38.1719853650358; Mon, 01 Jul 2024 10:07:30 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab2793fsm1497282e87.123.2024.07.01.10.07.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 10:07:29 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH v2 1/8] gnu: cgal: Update to 5.6.1. Date: Mon, 1 Jul 2024 20:07:03 +0300 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/graphics.scm (cgal): Update to 5.6.1. Change-Id: Id909fc7be5d421496e6a3cd87d366f437f76bcfa --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index f609118c01..066cb550ff 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -775,7 +775,7 @@ (define-public openshadinglanguage (define-public cgal (package (name "cgal") - (version "5.2.2") + (version "5.6.1") (source (origin (method url-fetch) (uri (string-append @@ -783,7 +783,7 @@ (define-public cgal "/CGAL-" version ".tar.xz")) (sha256 (base32 - "0yjzq12ivizp23y7zqm30x20psv9gzwbcdrhyd3f7h0ds94m1c40")))) + "0dsqvnyd2ic50pr28gfz34bpnyx3i2csf1rikmc661hywdz5xcfd")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 01 13:08:42 2024 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 17:08:42 +0000 Received: from localhost ([127.0.0.1]:34351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWA-0004wf-0D for submit@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:42 -0400 Received: from mail-lf1-f44.google.com ([209.85.167.44]:50674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKW6-0004vu-Se for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:40 -0400 Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-52cdbc20faeso4693859e87.1 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 10:08:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719853652; x=1720458452; 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=nFgjmxOZb/xzWS8aygv1VObJd+lGV1N0fSe28oOkwaw=; b=lNm7k1YBngWtsmXcoyGrCy0Jw0XHrEZZSBsaH+PBFOzVfoMx0KtI/jXc6I8HQQw/bz TF21HNoqPveMeMTVTqqqlJCY8pZ4Yrfg2GZWt4JzQ4bkfz+kvpnLwoDlhK0CzqFZx3g9 9WYB/d7tmd4ixujHX5GwBF3MCf+6AzsacMfiGWUvtawA92RZcDvFmX1OGEHX8x2Fj9SW PKkoNkcJSgchInf3d4PJwH8SQ2JmZGg2MjQwWV3+d5n8HA/s+vOFkhtx8l6ajFJ+0Kwd rpVTyxFq+tJqEyPyIistSbTXgB77whL2rhZPRlkxdwUIw+MPZL63nDRueDwOr9M25KPj phvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719853652; x=1720458452; 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=nFgjmxOZb/xzWS8aygv1VObJd+lGV1N0fSe28oOkwaw=; b=sWcpkCkq+k5h+cPfBsB9w6OR7dqnkTQxH49+tO0QfQdr0VUf6EOeFXuHxAxz4vJkCf oFTqOx27dQffCKe6wGh980krE8iU8dNMSefHM96V86Lszze6q1zKiTVEAo2YP/yJT+Ml J+TRrcjwQVwfTxvqfhLCk0GSwWa2OObZPy9WqAs9+2+hnZ+hNYNKlJLyPv4n/CThKz6i jmN8l1Rb6VKzYNWycaDizmWMq39LTYz2cqKqzO7OGI94iUofq36zON/24M+kuJ/pV63Q OTN59+UY1CHgvOftDDrkwNe6CNcaoOMwU6809Kyew5VeFvbvLzZEoCVV8Q1OR4fTUATx BOSA== X-Gm-Message-State: AOJu0Yyfcyy1sqPSnTiQa1T3T979oYGrjA/pMbVT6eecFOju2loYqrZg 3udy2MW9Gb6+5kKEui7OutrRP9Z1yzaz5gH3kRfzsD99E1h7iHMNLt5bvA== X-Google-Smtp-Source: AGHT+IEg1odPD1MBDsBidBr2gIHNd/53Ddo9HPBG9dynyBDwF76DgJkcssA490+YNqPKCPU3UAcQeQ== X-Received: by 2002:a05:6512:33d1:b0:52c:e3af:7c5c with SMTP id 2adb3069b0e04-52e82686b63mr4003473e87.34.1719853651295; Mon, 01 Jul 2024 10:07:31 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab2793fsm1497282e87.123.2024.07.01.10.07.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 10:07:30 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH v2 2/8] gnu: glfw: Update to 3.3.10. Date: Mon, 1 Jul 2024 20:07:04 +0300 Message-ID: <164af041e8271a27109c164ba5a1c57b6cd81140.1719853592.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gl.scm (glfw): Update to 3.3.10. Change-Id: I9d789fb74af4ed649102195891adc5e437883d30 --- gnu/packages/gl.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 2100bb4872..f40ddaeb86 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2023 Kaelyn Takata ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Liliana Marie Prikler +;;; Copyright © 2024 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -924,7 +925,7 @@ (define-public soil (define-public glfw (package (name "glfw") - (version "3.3.9") + (version "3.3.10") (source (origin (method url-fetch) (uri (string-append "https://github.com/glfw/glfw" @@ -932,7 +933,7 @@ (define-public glfw "/glfw-" version ".zip")) (sha256 (base32 - "023dn97n4h14n5lbjpzjv0y6a2plj254c0w3rr3wraf3z08189jm")))) + "1f5xs4cj1y5wk1jimv1mylk6n6vh7433js28mfd1kf7p2zw3whz8")))) (build-system cmake-build-system) (arguments (list -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 01 13:08:45 2024 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 17:08:45 +0000 Received: from localhost ([127.0.0.1]:34354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWB-0004x4-KL for submit@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:44 -0400 Received: from mail-lf1-f54.google.com ([209.85.167.54]:51330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKW8-0004vy-KM for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:42 -0400 Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-52cdcd26d61so3589958e87.2 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 10:08:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719853654; x=1720458454; 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=7u7kFIeSqQza0LSdt1reuoeJIpYJKVy6p9ZeF5lWdwk=; b=GdE7AK+SRRkjLFro1nEyuoEsAAJ06dJUaqGESn6fajqOFqw+u1tFPrcElxEOyz19bQ vXcFO6yRrlyAEAa84I0WvT8MGfshAT18w/n/2yD+PGVUwJltCGK14jhQwYnX7iRX1AAE M6j6oX2rLdJD0+DI9Dh/MB4AUjjKeWBtnce1S4KRqsKzxLAky3EjG/cyNeKvD/O0CJfM HjUO9X2bzx2PV+eJODSlsCk2SZHFuo49e/c2u6yj1WWq+72RJbZYkIZdmjGKVep5kaTL sbrhhvyS+YT6cVJApkHC1ihX8xWpmYe7ZBlT1DCCTtSJBpEXP+goaPPHQD4H3ModWGtf G+ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719853654; x=1720458454; 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=7u7kFIeSqQza0LSdt1reuoeJIpYJKVy6p9ZeF5lWdwk=; b=rpGgWdsnTVtpDoTb7Cz00n9qa45T7eVk14JDTfH53ckgbau7jtA20qkf4Ems8Vjd8q Rd7+O4puTuBNu3F1YyDhJftHQie3k/od5OvSK/nkYGG9H1agO0uUJF/mEg7kZ8s1Q3Aa uDzSeEa1RuZH8VuyXR0blXnp18SD+LzhiG5zUVLK+r84n/MoMtk6vmyiUp4MOejyDiW7 7M/v8gOfaQbjcGJ0cMU9/OEie1BKGAORbIkRG9nXOdz9fT0bt9D+gRKYbbTHaxkIXpky b7MOXijgnZl0Ib0X3OFH0ywjzypjJvz7AccbWnF1TPkVLReGBv3CBfDIJigFw2ED48WX 7M9w== X-Gm-Message-State: AOJu0YzwRptt/aYRtNWTOO/8xg/TjXXi9CKax6Ma/LcIh6vkptMFeVBa vMbSmi4pH22dHFFfYLZeXxuttTdu6veSn5ogVwDaEV3/QTjEZU3sXah/PA== X-Google-Smtp-Source: AGHT+IEIx5XYueGejWBkZVSl+5BsoJFHm1DHt3Vvl1AU7LcxSQ78ZI9K6QPxzyUnn5nLamrkCsqRXw== X-Received: by 2002:a05:6512:3194:b0:52c:e101:1ae7 with SMTP id 2adb3069b0e04-52e826865c4mr4510363e87.31.1719853653241; Mon, 01 Jul 2024 10:07:33 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab2793fsm1497282e87.123.2024.07.01.10.07.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 10:07:32 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH v2 4/8] gnu: libigl: Update to 2.4.0. Date: Mon, 1 Jul 2024 20:07:06 +0300 Message-ID: <09e99660acf1973e62ba21b25e5d3e2cceaa5921.1719853592.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (libigl): Update to 2.4.0. [arguments]: Use Gexps. Update configure flags. Disable GLFW tests as they are failing with SEGFAULT errors (see .) Update "unpack-external" phase: add new dependencies. Update "patch-cmake" phase to prevent CMake from trying to download external dependencies. Help CMake to find the package inputs. Add "fix-assertions" and "install-copyleft-modules" phase. [native-inputs]: Add catch2. [inputs]: Use glfw-3.4. Add openblas, imgui and spectra. Add libigl packages and imguizmo. Remove catch2. Change-Id: Ib4ac842dc14fe1cbc6b0b87674bae1f261a1a970 --- gnu/packages/engineering.scm | 258 ++++++++++++++++++++++++----------- 1 file changed, 179 insertions(+), 79 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index fcb73eab12..7f29e2c365 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -33,7 +33,7 @@ ;;; Copyright © 2022 Malte Frank Gerdes ;;; Copyright © 2022 Konstantinos Agiannis ;;; Copyright © 2022 Greg Hogan -;;; Copyright © 2022 Artyom V. Poptsov +;;; Copyright © 2022-2024 Artyom V. Poptsov ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022, 2023 Felix Gruber ;;; Copyright © 2023 Theofilos Pechlivanis @@ -162,6 +162,7 @@ (define-module (gnu packages engineering) #:use-module (gnu packages text-editors) #:use-module (gnu packages time) #:use-module (gnu packages tls) + #:use-module (gnu packages toolkits) #:use-module (gnu packages tree-sitter) #:use-module (gnu packages version-control) #:use-module (gnu packages web) @@ -3510,7 +3511,7 @@ (define-public xfoil (define-public libigl (package (name "libigl") - (version "2.3.0") + (version "2.4.0") (source (origin (method git-fetch) @@ -3520,90 +3521,151 @@ (define-public libigl (file-name (git-file-name name version)) (sha256 (base32 - "004a22ifq2vibgkgvrlyihqimpsfizvq5l448204kwfg3lkycajj")))) + "0qlnpp8nxbahcky4d67dzn0ynbv3v037nbx1akq6h5rzhvkzq40x")))) (build-system cmake-build-system) (arguments - `(#:configure-flags - '("-DLIBIGL_USE_STATIC_LIBRARY=OFF" - "-DLIBIGL_BUILD_TESTS=ON" - "-DLIBIGL_BUILD_TUTORIALS=OFF" - "-DLIBIGL_EXPORT_TARGETS=ON" - ;; The following options disable tests for the corresponding libraries. - ;; The options do not affect whether the libraries are linked to - ;; libigl or not, they are used for tests. - "-DLIBIGL_WITH_COMISO=OFF" - "-DLIBIGL_WITH_CORK=OFF" - "-DLIBIGL_WITH_MATLAB=OFF" - "-DLIBIGL_WITH_MOSEK=OFF" - "-DLIBIGL_WITH_TRIANGLE=OFF" ;; Undefined reference to "triangulate". - "-DLIBIGL_WITH_OPENGL_GLFW_IMGUI=OFF") + (list #:configure-flags + #~(list "-DLIBIGL_USE_STATIC_LIBRARY=OFF" + "-DLIBIGL_BUILD_TESTS=ON" + "-DLIBIGL_BUILD_TUTORIALS=OFF" + "-DLIBIGL_INSTALL=ON" + "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" + (format #f "-DCatch2_DIR=~a/lib/cmake/catch2/" + #$(this-package-input "catch2")) + (format #f "-DSpectra_DIR=~a/share/pectra/cmake/" + #$(this-package-input "spectra")) + ;; The following options disable tests for the corresponding libraries. + ;; The options do not affect whether the libraries are linked to + ;; libigl or not, they are used for tests. + "-DLIBIGL_WITH_COMISO=OFF" + "-DLIBIGL_WITH_CORK=OFF" + "-DLIBIGL_MATLAB=OFF" + "-DLIBIGL_MOSEK=OFF" + ;; XXX: GLFW tests are failing with SEGFAULT. See + ;; + "-DLIBIGL_GLFW_TESTS=OFF") + #:build-type "Release" #:phases - (modify-phases %standard-phases + #~(modify-phases %standard-phases (add-after 'unpack 'unpack-external (lambda _ (setenv "HOME" (getcwd)) ;; cmake needs this to export modules (mkdir "external") (copy-recursively (assoc-ref %build-inputs "libigl-glad") "external/glad") - (copy-recursively (assoc-ref %build-inputs "libigl-stb") "external/stb") + (copy-recursively (assoc-ref %build-inputs "libigl-test-data") "external/test-data") + (copy-recursively (assoc-ref %build-inputs "libigl-comiso") "external/comiso") (copy-recursively (assoc-ref %build-inputs "libigl-tetgen") "external/tetgen") - (copy-recursively (assoc-ref %build-inputs "libigl-predicates") "external/predicates"))) + (copy-recursively (assoc-ref %build-inputs "libigl-predicates") "external/predicates") + (copy-recursively (assoc-ref %build-inputs "imguizmo") "external/imguizmo") + (copy-recursively (assoc-ref %build-inputs "eigen") "external/eigen"))) (add-after 'unpack-external 'patch-cmake - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) + (define (source-dir library-name) + (format #f "SOURCE_DIR \"~a\"" + (assoc-ref %build-inputs library-name))) + (define (fix-external-library cmake source) + (substitute* (format #f "cmake/recipes/external/~a.cmake" + cmake) + (("GIT_REPOSITORY.*") (source-dir source)) + (("GIT_TAG.*") ""))) ;; Fix references to external libraries - (substitute* "cmake/libigl.cmake" - (("if\\(NOT TARGET Eigen3::Eigen\\)" all) - (string-append "find_package(Eigen3 CONFIG REQUIRED)\n" all)) - (("if\\(NOT TARGET CGAL::CGAL\\)" all) - (string-append "find_package(CGAL CONFIG COMPONENTS Core)\n" all)) - (("if\\(NOT TARGET tinyxml2\\)" all) - (string-append "find_package(tinyxml2 CONFIG REQUIRED)\n" - "if (NOT TARGET tinyxml2::tinyxml2)")) - (("if\\(NOT TARGET embree\\)" all) - (string-append "find_package(embree 3 CONFIG REQUIRED)\n" all)) - (("if\\(NOT TARGET glfw\\)" all) - (string-append "find_package(glfw3 CONFIG REQUIRED)\n" all)) - (("igl_download_glad\\(\\)" all) "") - (("igl_download_stb\\(\\)" all) "") - (("igl_download_tetgen\\(\\)" all) "") - (("igl_download_triangle\\(\\)" all) "") - (("igl_download_predicates\\(\\)" all) "")) - (substitute* "tests/CMakeLists.txt" - (("igl_download_test_data\\(\\)") "") - (("set\\(IGL_TEST_DATA.*") - (format #f "set(IGL_TEST_DATA ~a)\n" - (assoc-ref %build-inputs "libigl-test-data"))) - (("igl_download_catch2\\(\\)") "find_package(Catch2 CONFIG REQUIRED)") - (("list\\(APPEND CMAKE_MODULE_PATH \\$\\{LIBIGL_EXTERNAL\\}/catch2/contrib\\)") - "") - (("add_subdirectory\\(\\$\\{LIBIGL_EXTERNAL\\}/catch2 catch2\\)") "")) - ;; Install otherwise missing headers - (substitute* "cmake/libigl.cmake" - (("install_dir_files\\(copyleft\\)" all) - (string-join (list all - "install_dir_files(copyleft/cgal)" - "install_dir_files(copyleft/opengl)" - "install_dir_files(copyleft/tetgen)" - "install_dir_files(embree)" - "install_dir_files(opengl)" - "install_dir_files(png)" - "install_dir_files(predicates)" - "install_dir_files(xml)") - "\n")))))))) + (fix-external-library "comiso" "libigl-comiso") + (fix-external-library "tetgen" "libigl-tetgen") + (fix-external-library "triangle" "libigl-triangle") + (fix-external-library "predicates" "libigl-predicates") + (fix-external-library "glad" "libigl-glad") + (fix-external-library "libigl_tests_data" "libigl-test-data") + (fix-external-library "stb" "libigl-stb") + (substitute* "cmake/recipes/external/imguizmo.cmake" + (("if\\(TARGET imguizmo::imguizmo\\)") + "if(true)") + (("target_link_libraries.*") + (format #f "include_directories(~a/include/imgui/)" + (assoc-ref inputs "imgui")))) + + (substitute* "cmake/igl/igl_add_test.cmake" + (("include\\(\".*/contrib/Catch.cmake\"\\)") + (format #f + "include(\"~a/lib/cmake/Catch2/Catch.cmake\")" + (assoc-ref inputs "catch2")))) + (substitute* "cmake/recipes/external/cgal.cmake" + (("FetchContent_Populate\\(cgal\\)") + "find_package(CGAL CONFIG COMPONENTS Core)\nreturn()")) + (substitute* "cmake/recipes/external/eigen.cmake" + (("FetchContent_Populate\\(eigen\\)") + "find_package(Eigen3 CONFIG REQUIRED)\nreturn()")) + (substitute* "cmake/recipes/external/catch2.cmake" + (("message.*") + "find_package(Catch2 CONFIG)\nreturn()")) + (substitute* "cmake/recipes/external/libigl_imgui_fonts.cmake" + (("if\\(TARGET igl::imgui_fonts\\)") + "if(true)")) + (substitute* "cmake/recipes/external/tinyxml2.cmake" + (("FetchContent_Populate\\(tinyxml2\\)") + "find_package(tinyxml2 CONFIG REQUIRED)\nreturn()")) + (substitute* "cmake/recipes/external/embree.cmake" + (("FetchContent_MakeAvailable\\(embree\\)") + (string-join (list "find_package(Embree 3 CONFIG)" + "add_library(embree::embree ALIAS embree)" + "return()") + "\n"))) + (substitute* "cmake/recipes/external/glfw.cmake" + (("FetchContent_MakeAvailable\\(glfw\\)") + (string-join + (list "find_package(glfw3 CONFIG REQUIRED)" + "add_library(glfw::glfw ALIAS glfw)" + "return()") + "\n"))) + (substitute* "cmake/recipes/external/imgui.cmake" + (("FetchContent_MakeAvailable\\(imgui\\)") + "return()")))) + + (add-after 'unpack-external 'fix-assertions + (lambda _ + ;; Current Tetgen version has a bug. + (substitute* "include/igl/copyleft/tetgen/tetgenio_to_tetmesh.cpp" + (("assert\\(out.numberofpoints == out.numberofpointmarkers\\);") + ";")) + ;; CGAL has a bug in assertion as well. + (substitute* "include/igl/copyleft/cgal/trim_with_solid.cpp" + (("assert\\(I.size\\(\\) == Vr.rows\\(\\)\\);") + ";")))) + + ;; XXX: Install modules as CMake fails to install them. + (add-after 'install 'install-includes + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (include-dir (string-append out "/include/igl/"))) + (for-each (lambda (module) + (copy-recursively (format #f "../source/include/igl/~a" + module) + (format #f "~a/~a" include-dir module))) + (list "copyleft/cgal" + "copyleft/opengl2" + "copyleft/tetgen" + "embree" + "opengl" + "predicates" + "xml")))))))) + + (native-inputs (list catch2)) ;; XXX: Inputs are currently only used to build tests. ;; We would need to patch the CMake recipe to build a shared library ;; with all of these. (inputs `(("boost" ,boost) - ("catch2" ,catch2) ("cgal" ,cgal) ("eigen" ,eigen) ("embree" ,embree) - ("glfw" ,glfw) + ("glfw" ,glfw-3.4) ("gmp" ,gmp) ("mesa" ,mesa) ("mpfr" ,mpfr) ("tbb" ,tbb) ("tinyxml2" ,tinyxml2) + ("openblas" ,openblas) + ("imgui" ,imgui) + ("spectra" ,spectra) ;; When updating this package, update commit fields below according to ;; the hashes listed in "cmake/LibiglDownloadExternal.cmake". ("libigl-test-data" @@ -3615,13 +3677,16 @@ (define-public libigl (file-name (git-file-name "libigl-test-data" version)) (sha256 (base32 "1wxglrxw74xw4a4jmmjpm8719f3mnlbxbwygjb4ddfixxxyya4i2")))) ("libigl-glad" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libigl/libigl-glad") - (commit "09b4969c56779f7ddf8e6176ec1873184aec890f"))) - (file-name (git-file-name "libigl-glad" version)) - (sha256 (base32 "0rwrs7513ylp6gxv7crjzflapcg9p7x04nzfvywgl665vl53rawk")))) + ,(let* ((commit "ead2d21fd1d9f566d8f9a9ce99ddf85829258c7a") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/libigl-glad") + (commit commit))) + (file-name (git-file-name "libigl-glad" version)) + (sha256 (base32 "079fd5yrbd713nq7slhhgq79wns85pc564ydlkjl9gf43d3220ay"))))) ("libigl-stb" ,(origin (method git-fetch) @@ -3631,22 +3696,57 @@ (define-public libigl (file-name (git-file-name "libigl-stb" version)) (sha256 (base32 "0wwlb370z40y63ic3ny6q7lxibhixg2k1pjdkl4ymzv79zld28kj")))) ("libigl-predicates" + ,(let* ((commit "50c2149e7a520d13cd10e9aeff698bd68edd5a4f") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/libigl-predicates.git") + (commit commit))) + (file-name (git-file-name "libigl-predicates" version)) + (sha256 (base32 "0yiqhzry2qhb1p0v9sldlnpqsn4y8cln8r6y08lafkc9kc4qy8jz"))))) + ;; TODO: Package tetgen separately from + ("libigl-tetgen" + ,(let* ((commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/tetgen.git") + (commit commit))) + (file-name (git-file-name "libigl-tetgen" version)) + (sha256 (base32 "1k724syssw37py7kwmibk3sfwkkgyjyy7qkijnhn6rjm91g8qxsg"))))) + ("libigl-comiso" + ,(let* ((commit "562efe333edc8e649dc101469614f43378b1eb55") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/comiso.git") + (commit commit))) + (file-name (git-file-name "libigl-comiso" version)) + (sha256 (base32 "048zryh9ydd1dqwzs14vj7r3fd6yyq6n4zl6d1b0yb1iwrqfy6ba"))))) + ("libigl-triangle" ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/libigl/libigl-predicates.git") - (commit "488242fa2b1f98a9c5bd1441297fb4a99a6a9ae4"))) - (file-name (git-file-name "libigl-predicates" version)) - (sha256 (base32 "13bd98g8lgcq37i3crj66433z09grnb2xjrcqpwqmyn147rp5wyh")))) - ;; TODO: Package tetgen separately from - ("libigl-tetgen" + (url "https://github.com/libigl/triangle.git") + (commit "6bbd92c7ddd6c803c403e005e1132eadb38fbe68"))) + (file-name (git-file-name "libigl-triangle" version)) + (sha256 (base32 "0d35mfqwdk99xn1lpjzz9w5axq016r6xy5vr00lb4mvb05limxl3")))) + ;; XXX: This is a source-only library which is currently required only for + ;; libigl. + ("imguizmo" ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/libigl/tetgen.git") - (commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6"))) - (file-name (git-file-name "libigl-tetgen" version)) - (sha256 (base32 "1k724syssw37py7kwmibk3sfwkkgyjyy7qkijnhn6rjm91g8qxsg")))))) + (url "https://github.com/CedricGuillemet/ImGuizmo") + (commit "1.83"))) + (file-name (git-file-name "imguizmo" version)) + (sha256 (base32 "14ywf96nvxf5c081pwypyzjwx9vyq78glbzinc81558v1sxiy2v0")))))) (home-page "https://libigl.github.io/") (synopsis "Simple C++ geometry processing library") (description "This library provides functionality for shape modelling, -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 01 13:08:46 2024 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 17:08:46 +0000 Received: from localhost ([127.0.0.1]:34358 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWC-0004x7-Uk for submit@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:45 -0400 Received: from mail-lf1-f54.google.com ([209.85.167.54]:54687) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKW9-0004w5-IU for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:42 -0400 Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-52cdfb69724so4099640e87.1 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 10:08:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719853655; x=1720458455; 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=lj+wUu7b2paQBw2jHeY694G4Zx2J+MECWZIv2KVCVM4=; b=PtzlEwe4ssXu1/Jce0Ej8shOfsynvUMrkmAMx9+4R3D5Gop78DgCtwx4H53bhN32X9 2ctuyvSfTQ9GpsndY0YS4LP6iNmlkvhwjHAGWsQC2L66ROg4BtTUVxvpgL9iP5nC1gYe xtK4Yga68OMw2eq2f+kXXrHOghHOVwdJm1rug+S/NfgJQyoENx1iTdeZDTQZy/3opQa4 sSwCYO6xdx1TWfwSiBJmBqmpB70RgKdG7JRLnZpYj97la71Ca/kIIX7QZC5+VJJQaSDB 2Ln1bX6klcMbi9Z+ONWu+bHUwEDkzdMrvR5eKJ5T0sUef24Fbs/D2TrxHrjCND6/mvM3 /dpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719853655; x=1720458455; 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=lj+wUu7b2paQBw2jHeY694G4Zx2J+MECWZIv2KVCVM4=; b=jXVpJ841MeoxNWXvvOyU6DBaGCYGF2vTHzq16urYCj/yfUk4J44MCgb1MWRZI9k0OJ SIQOAHsJMuSwlrgEolE2KvisgkDEAzYOIClcNndyfjZ89RGHGJiLbQOwt7k6VhHHGiiz DAVz2miN5c0TnZG6Re6T+NKkUphZ5muKgGyTTxIqfpWYXIkwGZdL17xq+IB73iHE23vZ 2scBcCm4EqXyeBFPzMXRYpEleIpXSmE54jLkgvID6r+V4g9GOzXH127y86hr/Y7IV2rQ 8VhtGLTHvhQB58j1r1himdcVFtfQEoZ6mSTE1cjJpkGDWc7fmrDuF7Npf/G/LTUnlLhv o2gg== X-Gm-Message-State: AOJu0YyrPqK9+m8o5kDg8kdPlqlxYBtRHU09f7O2GUVmrmPzFRn8C55E JK6AeWs0rTlt7mxP0xaqtRg37rStHXFf1ilFFzzDpq+0Fga8HcG4b3OKvA== X-Google-Smtp-Source: AGHT+IELZX7+j2NvGABA/J94bfJvvSJkLm+JE4R98FYgLowmofRFhvtewwUNGPGT7sEyILj2FUGQQg== X-Received: by 2002:a19:c50f:0:b0:52c:de9e:194 with SMTP id 2adb3069b0e04-52e826736a5mr3398509e87.28.1719853654325; Mon, 01 Jul 2024 10:07:34 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab2793fsm1497282e87.123.2024.07.01.10.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 10:07:33 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH v2 5/8] gnu: Add heatshrink. Date: Mon, 1 Jul 2024 20:07:07 +0300 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/compression.scm (heatshrink): New variable. * gnu/packages/patches/heatshrink-add-cmake.patch: New file. * gnu/local.mk (dist_patch_DATA): Add "heatshrink-add-cmake.patch". Change-Id: I0beccdcaed22e47ac6bfe522497e0759a315813d --- gnu/local.mk | 1 + gnu/packages/compression.scm | 42 +++++++ .../patches/heatshrink-add-cmake.patch | 111 ++++++++++++++++++ 3 files changed, 154 insertions(+) create mode 100644 gnu/packages/patches/heatshrink-add-cmake.patch diff --git a/gnu/local.mk b/gnu/local.mk index e20ed2be7e..e263261986 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1474,6 +1474,7 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-remove-gctp.patch \ %D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ + %D%/packages/patches/heatshrink-add-cmake.patch \ %D%/packages/patches/heimdal-CVE-2022-45142.patch \ %D%/packages/patches/helm-fix-gcc-9-build.patch \ %D%/packages/patches/highlight-gui-data-dir.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index ac025e0e3d..0a028f1490 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2024 Vinicius Monego ;;; Copyright © 2024 David Elsing +;;; Copyright © 2024 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -574,6 +575,47 @@ (define-public xz (license (list license:gpl2+ license:lgpl2.1+)) ; bits of both (home-page "https://tukaani.org/xz/"))) +(define-public heatshrink + (package + (name "heatshrink") + (version "0.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/atomicobject/heatshrink/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sdhvk27yz8kahw18j8pddbpkgl78v8rh8fx6wspc3acj7w7yvrn")) + ;; Add CMake build script, wanted by prusa-slicer and libbgcode, which are the + ;; only users of this library. + ;; + ;; See + ;; + (patches (search-patches "heatshrink-add-cmake.patch")))) + (build-system cmake-build-system) + (arguments + (list + ;; XXX: No tests available with CMake. + ;; See + #:tests? #f)) + (home-page "https://github.com/atomicobject/heatshrink/") + (synopsis "Data compression library for embedded/real-time systems") + (description + "A data compression/decompression library for embedded/real-time systems. + +Among its features are: +@itemize +@item Low memory usage (as low as 50 bytes.) It is useful for some cases with less +than 50 bytes, and useful for many general cases with less than 300 bytes. +@item Incremental, bounded CPU use. It can be used to chew on input data in +arbitrarily tiny bites. This is a useful property in hard real-time environments. +@item Can use either static or dynamic memory allocation. +@end itemize +") + (license license:isc))) + (define-public lhasa (package (name "lhasa") diff --git a/gnu/packages/patches/heatshrink-add-cmake.patch b/gnu/packages/patches/heatshrink-add-cmake.patch new file mode 100644 index 0000000000..f67f87126e --- /dev/null +++ b/gnu/packages/patches/heatshrink-add-cmake.patch @@ -0,0 +1,111 @@ +From 0886e9ca76552b8e325841e2b820b4563e5d5aba Mon Sep 17 00:00:00 2001 +From: tamasmeszaros +Date: Thu, 27 Jul 2023 23:11:25 +0200 +Subject: [PATCH] Add CMake build script + +--- + CMakeLists.txt | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ + Config.cmake.in | 5 +++ + 2 files changed, 87 insertions(+) + create mode 100644 CMakeLists.txt + create mode 100644 Config.cmake.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +new file mode 100644 +index 0000000..5b840eb +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,82 @@ ++cmake_minimum_required(VERSION 3.10) ++ ++project(heatshrink C) ++ ++add_library(${PROJECT_NAME} heatshrink_decoder.c heatshrink_encoder.c) ++add_library(${PROJECT_NAME}_dynalloc heatshrink_decoder.c heatshrink_encoder.c) ++ ++find_library(MATH_LIBRARY m) # Business as usual ++if(MATH_LIBRARY) ++ target_link_libraries(${PROJECT_NAME} PUBLIC ${MATH_LIBRARY}) ++endif() ++ ++target_include_directories(${PROJECT_NAME} PUBLIC $) ++target_include_directories(${PROJECT_NAME}_dynalloc PUBLIC $) ++ ++target_compile_definitions(${PROJECT_NAME} PUBLIC HEATSHRINK_DYNAMIC_ALLOC=0) ++target_compile_definitions(${PROJECT_NAME}_dynalloc PUBLIC HEATSHRINK_DYNAMIC_ALLOC=1) ++ ++if (UNIX) ++ add_executable(${PROJECT_NAME}_cmd heatshrink.c) ++ target_link_libraries(${PROJECT_NAME}_cmd ${PROJECT_NAME}_dynalloc) ++ set_target_properties(${PROJECT_NAME}_cmd PROPERTIES OUTPUT_NAME ${PROJECT_NAME}) ++endif () ++ ++# Installation and export: ++ ++include(CMakePackageConfigHelpers) ++ ++write_basic_package_version_file( ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" ++ VERSION 0.4.1 ++ COMPATIBILITY AnyNewerVersion ++) ++ ++set(_exported_targets ${PROJECT_NAME} ${PROJECT_NAME}_dynalloc) ++if (UNIX) ++ list(APPEND _exported_targets ${PROJECT_NAME}_cmd) ++endif () ++ ++install(TARGETS ${_exported_targets} ++ EXPORT ${PROJECT_NAME}Targets ++) ++ ++export(EXPORT ${PROJECT_NAME}Targets ++ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake" ++ NAMESPACE ${PROJECT_NAME}:: ++) ++ ++include(GNUInstallDirs) ++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) ++ ++configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" ++ INSTALL_DESTINATION ${ConfigPackageLocation} ++) ++ ++install( ++ FILES ++ heatshrink_common.h ++ heatshrink_config.h ++ heatshrink_encoder.h ++ heatshrink_decoder.h ++ DESTINATION ++ include/${PROJECT_NAME} ++ ) ++ ++install(EXPORT ${PROJECT_NAME}Targets ++ FILE ++ ${PROJECT_NAME}Targets.cmake ++ NAMESPACE ++ ${PROJECT_NAME}:: ++ DESTINATION ++ ${ConfigPackageLocation} ++) ++ ++install( ++ FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" ++ DESTINATION ++ ${ConfigPackageLocation} ++) +diff --git a/Config.cmake.in b/Config.cmake.in +new file mode 100644 +index 0000000..0809ba9 +--- /dev/null ++++ b/Config.cmake.in +@@ -0,0 +1,5 @@ ++@PACKAGE_INIT@ ++ ++if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake) ++ include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") ++endif () -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 01 13:08:46 2024 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 17:08:46 +0000 Received: from localhost ([127.0.0.1]:34360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWD-0004xO-W0 for submit@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:46 -0400 Received: from mail-lf1-f44.google.com ([209.85.167.44]:58448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWA-0004wE-H8 for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:42 -0400 Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-52e743307a2so3716136e87.0 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 10:08:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719853655; x=1720458455; 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=mSNHZjNwhp32sxiWq1HK3+sBUtao9DktGjDSbybn5g0=; b=Hjw9FxzAW1PSDNK3Ma4sx8TI7aVsAhZ6ZosMWEv0OaY0OCrJWMEVt7V5iTHhxuojGB YsSJn1NfiiTkwu8Bs1J2Ob3hlJAMmpOALI9OpB3qtPj4v303rNrw/hzhY1nTTSl9SaNe jDqTlqW5iCVtD7xQ33i1GdaTn4MqKjiNOXLGddACwD5kPMIdZC+mABwZEMovVWEEHYzY 1ttKyxsH/iEZHvt917Kvqgz3POwBZqLO73QpqnPsVO2x6hFGszN3IQmHzxBiQwiD9tnF +3djM3nBKJz00/uRSJLB6aaGYRZdBB32gmMInvS+kpsueCYAyvrWRZoeEejpkNweoiuU EzbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719853655; x=1720458455; 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=mSNHZjNwhp32sxiWq1HK3+sBUtao9DktGjDSbybn5g0=; b=fJUNvMpliRj40GTho5YikKuUFv4XntILo26PGB+GSbZOIGFJRNbvDdJOTj2hDlADF5 ITTnGF0ov1vwva6CgzOU7DOZP9M2yj6IMRcX7BuZf1x3BG+iALgwsVF+EeEYFbjC7a9/ qpVltedj84aWSLWFRUkcKEq+8XSCU04SQq2KUFjAWE+FCbh/Q9a/s/2O6bM8LvPQQTWI ObG/NTZ+iBq3syjmrKzS6mozbYtsJnGsUKyWE2zg73TtEfpYANF9OdT/zX/9tEU0+MxV /s6glVdAytMV7NxifwFcoI3l4iwEF+jKka+BOZrr9ekHTUm3cH4YqbqP0ZgXPN6c8Y83 zmKg== X-Gm-Message-State: AOJu0YyDogTDWtLKiQO5QPf5ng9k3TDOYilciDBu16MAtg8OpLqlKYtN z8TnlcHDoP7GwJ8rlWOncyozdBzUnoTMmpUtsvti354+wgjeEPNmEDrE4Q== X-Google-Smtp-Source: AGHT+IEWmsmoOE5ZmGGOp1OA0ufXB4LUXUT/asaZhb3WmoLJHNbW4Nx1YdSIyPYMTXeYrEGpV4cMaQ== X-Received: by 2002:a05:6512:308f:b0:52e:76bb:c906 with SMTP id 2adb3069b0e04-52e8274a36bmr5302711e87.61.1719853655297; Mon, 01 Jul 2024 10:07:35 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab2793fsm1497282e87.123.2024.07.01.10.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 10:07:34 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH v2 6/8] gnu: Add prusa-libbgcode. Date: Mon, 1 Jul 2024 20:07:08 +0300 Message-ID: <2cdedc4189efac291f16e099b91605a8f8f4aca9.1719853592.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (prusa-libbgcode): New variable. Change-Id: I1f18c399d0fe36987c613ce4c0c3845c803beb45 --- gnu/packages/engineering.scm | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 7f29e2c365..de4b4a5825 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3753,6 +3753,52 @@ (define-public libigl visualization, matrix manipulation.") (license (list license:gpl3 license:mpl2.0)))) +(define-public prusa-libbgcode + (let ((commit "8ae75bd0eea622f0e34cae311b3bd065b55eae9b") + (revision "0")) + (package + (name "prusa-libbgcode") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prusa3d/libbgcode") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 (base32 "0fjx2ijz9zqpqs486lcrrrhqvmfzrpb8j6v57l0jiynavwv3kznw")))) + (native-inputs (list catch2)) + (propagated-inputs + (list zlib boost heatshrink)) + (build-system cmake-build-system) + (home-page "https://github.com/prusa3d/libbgcode") + (synopsis "Prusa Block and Binary G-code reader/writer/converter") + (description + "Binary G-code is a new standard for encoding and compressing ASCII G-code +files. G-code files are easy to read and interpret, but their downside is that the +data is not saved efficiently, and the file size is often very large. Compression of +the file is problematic because the printers usually run on limited hardware and they +may not have enough memory and/or CPU power to decompress it. + +Block and Binary G-Code is a new G-code file format featuring the following +improvements over the legacy G-code: +@itemize +@item Block structure with distinct blocks for metadata vs. G-code. +@item Faster navigation. +@item Coding and compression for smaller file size. +@item Checksum for data validity. +@item Extensibility through new (custom) blocks. For example, a file signature block +may be welcome by corporate customers. +@end itemize + +The binary G-code format is flexible and the encoding and compression of individual +blocks is variable. @code{libbgcode} library contains the routines to convert ASCII +G-codes to binary and vice versa. The library is written in C++ and the repository +includes bindings for Python.") + ;; See + ;; + (license license:agpl3+)))) + (define-public prusa-slicer (package (name "prusa-slicer") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 01 13:08:47 2024 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 17:08:47 +0000 Received: from localhost ([127.0.0.1]:34362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWE-0004xb-JM for submit@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:47 -0400 Received: from mail-lf1-f41.google.com ([209.85.167.41]:52414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWB-0004wL-Py for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:44 -0400 Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-52cd80e55efso5665700e87.0 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 10:08:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719853657; x=1720458457; 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=Ot7p/nJprPFcVjFf3MfkEfUCkxeX64QFMSOoMeIq3nE=; b=FNUJfiuzgEeSAb5LeQQMCpagPAcQ0HAuLz1XYRNfFwde7wQWBbzrdvtL8RAWLEohXY o7kwohqgAdQQNill9nM9USmBu8v/4PvosZyCu3jhiuJ4QBFljv8wlTttc05p2/TN9/gQ NX1IccWuvamhTZgOTsPmVKuezhcOXGAnB5276dnCWMa5/Hw65PDqIyJ+2WyMW91DH82y Gnf+jHiWXCYVxCAtkKNQCq4f6c3WRtwUWCN0OktZ40fLEfnK4K6rOC869KdIAXRK8JU4 Glf9Au2bzJOaT1HQIX1l+xwnnuMEO2Lm8chp/lX5nuO5ODAxaVLNdOmybIR1tzVkJa0U TgCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719853657; x=1720458457; 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=Ot7p/nJprPFcVjFf3MfkEfUCkxeX64QFMSOoMeIq3nE=; b=whke5BhhLdS2V/ZpcC5PmKclT5abiqCv+xHqMTHh28S281U3HHGFGG4KXljA17nTkJ TKVDdiwWt0ppO4T+GFY/iQ7ghK00f7uhzBacddirxBLx1gjtkVlCrc6XYcQNpdn993Cj UjW+XGC08k5au6KsF9T+SPJoP2HpnCU4Hq+cwpFpWSY2upp/Kq6ppiZSUlQbrMTyWNK7 /KVvKu6diC+o77mwrMqUhGQIlX8icEijrzE5l049vq0IFIQQnxYUJfvvYSXFfws1JHTy ekjYguAZ43cKLbKLdI272ex++GwpHNB6q/E6hIca+AGFpHfwW6Nh7HHeT6+UNcgaYSX+ YXlg== X-Gm-Message-State: AOJu0YzD3+Qh8840MyRCRo+YXAExUk6njUHvPowcFiQdhDjEMonTiXDI SfU9Q6hQvIVT4oOBhZSX2iKRRvMtJE96a7mXtsQIzaXYqvHanKF2Eq/xKA== X-Google-Smtp-Source: AGHT+IHXujTtjFmsrgmG0bZzxnw5Kray7xRMnsQt5FkXvZ1aPpuawCQYzmTnlTs1BkDQ/Z/cJDRU/g== X-Received: by 2002:a05:6512:3da1:b0:52e:76f6:aa5b with SMTP id 2adb3069b0e04-52e8266640dmr5017703e87.17.1719853656281; Mon, 01 Jul 2024 10:07:36 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab2793fsm1497282e87.123.2024.07.01.10.07.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 10:07:35 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH v2 7/8] gnu: Add prusa-wxwidgets. Date: Mon, 1 Jul 2024 20:07:09 +0300 Message-ID: <9f39081f248d8efe78b8234a9642a367a3e05827.1719853592.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" , Nikita Domnitskii X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (prusa-wxwidgets): New variable. * gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Register "prusa-wxwidgets-makefile-fix.patch". Co-authored-by: Nikita Domnitskii Change-Id: I9043c2acc95986275ee24d9c5d944e5fe2702e99 --- gnu/local.mk | 1 + .../prusa-wxwidgets-makefile-fix.patch | 112 ++++++++++++++++++ gnu/packages/wxwidgets.scm | 29 +++++ 3 files changed, 142 insertions(+) create mode 100644 gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index e263261986..29107a618b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1842,6 +1842,7 @@ dist_patch_DATA = \ %D%/packages/patches/prusa-slicer-boost-fixes.patch \ %D%/packages/patches/prusa-slicer-fix-tests.patch \ %D%/packages/patches/prusa-slicer-with-cereal-1.3.1.patch \ + %D%/packages/patches/prusa-wxwidgets-makefile-fix.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/python-3.12-fix-tests.patch \ %D%/packages/patches/python-accupy-use-matplotx.patch \ diff --git a/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch b/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch new file mode 100644 index 0000000000..aadf976588 --- /dev/null +++ b/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch @@ -0,0 +1,112 @@ +diff --git a/Makefile.in b/Makefile.in +index 8f33aa2ff4..39928382da 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -4358,7 +4358,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ + monodll_msw_utils.o \ + monodll_utilsexc.o \ + monodll_fswatcher.o \ +- monodll_msw_secretstore.o ++ monodll_msw_secretstore.o \ + monodll_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \ +@@ -5284,7 +5284,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ + monodll_uuid.o \ + monodll_msw_evtloop.o \ + monodll_access.o \ +- monodll_dark_mode.o ++ monodll_dark_mode.o \ + monodll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \ +@@ -6196,7 +6196,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ + monodll_uuid.o \ + monodll_msw_evtloop.o \ + monodll_access.o \ +- monodll_dark_mode.o ++ monodll_dark_mode.o \ + monodll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \ +@@ -6371,7 +6371,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ + monolib_msw_utils.o \ + monolib_utilsexc.o \ + monolib_fswatcher.o \ +- monolib_msw_secretstore.o ++ monolib_msw_secretstore.o \ + monolib_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \ +@@ -7297,7 +7297,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ + monolib_uuid.o \ + monolib_msw_evtloop.o \ + monolib_access.o \ +- monolib_dark_mode.o ++ monolib_dark_mode.o \ + monolib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \ +@@ -8209,7 +8209,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ + monolib_uuid.o \ + monolib_msw_evtloop.o \ + monolib_access.o \ +- monolib_dark_mode.o ++ monolib_dark_mode.o \ + monolib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \ +@@ -8436,7 +8436,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ + basedll_msw_utils.o \ + basedll_utilsexc.o \ + basedll_fswatcher.o \ +- basedll_msw_secretstore.o ++ basedll_msw_secretstore.o \ + basedll_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \ +@@ -8523,7 +8523,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ + baselib_msw_utils.o \ + baselib_utilsexc.o \ + baselib_fswatcher.o \ +- baselib_msw_secretstore.o ++ baselib_msw_secretstore.o \ + baselib_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \ +@@ -9464,7 +9464,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ + coredll_uuid.o \ + coredll_msw_evtloop.o \ + coredll_access.o \ +- coredll_dark_mode.o ++ coredll_dark_mode.o \ + coredll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \ +@@ -10376,7 +10376,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ + coredll_uuid.o \ + coredll_msw_evtloop.o \ + coredll_access.o \ +- coredll_dark_mode.o ++ coredll_dark_mode.o \ + coredll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \ +@@ -11204,7 +11204,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ + corelib_uuid.o \ + corelib_msw_evtloop.o \ + corelib_access.o \ +- corelib_dark_mode.o ++ corelib_dark_mode.o \ + corelib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \ +@@ -12116,7 +12116,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ + corelib_uuid.o \ + corelib_msw_evtloop.o \ + corelib_access.o \ +- corelib_dark_mode.o ++ corelib_dark_mode.o \ + corelib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \ diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 973e962fb1..2cf2ceba56 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -265,6 +265,35 @@ (define-public wxwidgets-2 (("-Wall") "-Wall -Wno-narrowing")) #t))))))) +(define-public prusa-wxwidgets + ;; There is no tag/release, all patches are in separate branch. + (let ((commit "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26")) + (package + (inherit wxwidgets) + (name "prusa-wxwidgets") + (version "3.2.0") + (home-page "https://github.com/prusa3d/wxWidgets") + (source + (origin + (inherit (package-source wxwidgets)) + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (patches (search-patches "prusa-wxwidgets-makefile-fix.patch")) + (sha256 + (base32 + "02nd07c23xbclnf1jjfbv6r5vqjb80gsdy2l559c5qzgdcvfd2xd")))) + (arguments + (substitute-keyword-arguments (package-arguments wxwidgets) + ((#:configure-flags flags) + ;; To fix 3D rendering in PrusaSlicer, wxWidgets must be compiled with + ;; "--disable-glcanvasegl" flag. + ;; + ;; See + #~(cons "--disable-glcanvasegl" #$flags))))))) + (define-public python-wxpython (package (name "python-wxpython") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 01 13:08:49 2024 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 17:08:49 +0000 Received: from localhost ([127.0.0.1]:34364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWG-0004xq-8h for submit@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:49 -0400 Received: from mail-lf1-f47.google.com ([209.85.167.47]:44206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWC-0004wP-M4 for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:45 -0400 Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-52db11b1d31so4641035e87.0 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 10:08:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719853658; x=1720458458; 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=bvDQJk7u5ehmBj8sXyXUL27Uw3Bq+9/pQq3sc41nPBY=; b=ivrnjAwO8WRJclrFPEB9nTpU3ej7WvVyjZYYSlm41L63sJIxO7mbmRH+uu+VIW4CVU TZZ2i7jd3n/NwQ1QqnqF8C8sph3YiBFXzYLGyZHSYXE1uep18MPWP5MdWRtLl1qcS4MO Y9EWBM6NF9/w9PABHEKaQKnyATC/k60LDk+X3tXVO5LEUcHQGDp5p4bqVgXjE278qddU oZXRnXWjYlLx73angjSrbYcnSbnzpVMcZTl/KTz8tPEz7iRJ1ASsbzd0zMeo6MKWYAKZ bR03YOwNQRKcwCwR7tLhnuL/VWflxjV112kctB27eYcqs9lcxKhsXzo3AaucCJYr1FMq 7gBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719853658; x=1720458458; 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=bvDQJk7u5ehmBj8sXyXUL27Uw3Bq+9/pQq3sc41nPBY=; b=I+gOmCW/Su2q96H506bwqRNunhLY4VFcUYCqu76mI9X7BMwf7GTrvZxJmfB/mKoYP/ N2ph1avsLqK7dxFV5chqgXAwbu+zOy3vo4GIR9ul6XnEprOQnzDggefvEqz1gON938um 37PsSq3RFvoReI7rmo02DcnOps9tabXFpQ6qS3anyX8Lix3m28KW0rUWPeY+WXowwAg5 rnYBGxwLL6jpErrqqg4OdPsaMS8WQJdZ2XRWQpXbu44si1A396caIjxv+0RoaQ7GCBYT 9E7q14jVZIvfyf6nR2wWMw2ttPOd4rAeAv1ILzZcNlm1PylJuflTKsc+40dYy5xwws5o jdQA== X-Gm-Message-State: AOJu0YzMLVuF70/+5SDc+hIfwFb1HvDwpNw2E2t69qIrOeEZQRpzIWUT gy4zeZcZpHZe+jTJy4wfe+77qPibZhgVFyhChfm4NI+s/fw2Y+S9xw9vDw== X-Google-Smtp-Source: AGHT+IFYt8ibqlpa4nVPR8rL4R+3K2MMyhN7pYooK1t0eMORNnZoTYP723yBOiGabueCWGiP5JjXrw== X-Received: by 2002:a05:6512:acc:b0:52c:812b:6e72 with SMTP id 2adb3069b0e04-52e8264cbf4mr4149516e87.1.1719853657342; Mon, 01 Jul 2024 10:07:37 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab2793fsm1497282e87.123.2024.07.01.10.07.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 10:07:36 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH v2 8/8] gnu: prusa-slicer: Update to 2.7.4. Date: Mon, 1 Jul 2024 20:07:10 +0300 Message-ID: <6ad909cee24b19c9d2e834ddbe1de8f7d8b76979.1719853592.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (prusa-slicer): Update to 2.7.4. [source]: Remove "prusa-slicer-boost-fixes.patch" and "prusa-slicer-with-cereal-1.3.1.patch". Move some part of the snippet code to custom build phases. [arguments]: In configure flags add paths to external libraries. Add "fix-include-paths" phase. [native-inputs]: Add "catch2". [inputs]: Use "prusa-wxwidgets" instead of "wxwidgets" to fix segfaults. Ad "qhull", "nanosvg", "heatshrink" and "prusa-libbgcode". * gnu/packages/patches/prusa-slicer-boost-fixes.patch, gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch: Remove unused patches. * gnu/local.mk (dist_patch_DATA): De-register "prusa-slicer-boost-fixes.patch" and "prusa-slicer-with-cereal-1.3.1.patch". Change-Id: I15e85d63c9ad6c731c8040ef2d8ec8b2f31f2ab7 --- gnu/local.mk | 2 - gnu/packages/engineering.scm | 53 ++++++---- .../patches/prusa-slicer-boost-fixes.patch | 97 ------------------- .../prusa-slicer-with-cereal-1.3.1.patch | 52 ---------- 4 files changed, 35 insertions(+), 169 deletions(-) delete mode 100644 gnu/packages/patches/prusa-slicer-boost-fixes.patch delete mode 100644 gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch diff --git a/gnu/local.mk b/gnu/local.mk index 29107a618b..d9760557df 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1839,9 +1839,7 @@ dist_patch_DATA = \ %D%/packages/patches/pokerth-boost.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/procps-strtod-test.patch \ - %D%/packages/patches/prusa-slicer-boost-fixes.patch \ %D%/packages/patches/prusa-slicer-fix-tests.patch \ - %D%/packages/patches/prusa-slicer-with-cereal-1.3.1.patch \ %D%/packages/patches/prusa-wxwidgets-makefile-fix.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/python-3.12-fix-tests.patch \ diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index de4b4a5825..2a3671b01d 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3802,7 +3802,7 @@ (define-public prusa-libbgcode (define-public prusa-slicer (package (name "prusa-slicer") - (version "2.5.2") + (version "2.7.4") (source (origin (method git-fetch) @@ -3811,13 +3811,11 @@ (define-public prusa-slicer (url "https://github.com/prusa3d/PrusaSlicer") (commit (string-append "version_" version)))) (file-name (git-file-name name version)) - (sha256 (base32 "02qcrw3fa0d8ldbp73hp14l1qxbp3f4608j4csc07ny00ra42151")) - (patches (search-patches "prusa-slicer-boost-fixes.patch" - "prusa-slicer-fix-tests.patch" - "prusa-slicer-with-cereal-1.3.1.patch")) + (sha256 (base32 "0s1cfvhfilyv0y98asr61c6rwlgyr1hf5v5hg8q9zwmzm2bkcql3")) + (patches (search-patches "prusa-slicer-fix-tests.patch")) (modules '((guix build utils))) (snippet - '(begin + `(begin ;; Prusa slicer bundles a lot of dependencies in src/ directory. ;; Most of them contain prusa-specific modifications (e.g. avrdude), ;; but others do not. Here we replace the latter with Guix packages. @@ -3825,10 +3823,12 @@ (define-public prusa-slicer (delete-file-recursively "src/hidapi") (delete-file-recursively "src/eigen") (delete-file-recursively "src/libigl/igl") + (substitute* "CMakeLists.txt" + (("add_library\\(libexpat INTERFACE\\)") + "")) + (substitute* "src/libigl/CMakeLists.txt" + (("target_link_libraries\\(libigl INTERFACE igl::core\\)") "")) (substitute* "src/CMakeLists.txt" - (("add_subdirectory\\(libigl\\)" all) - (string-append - all "\ninclude_directories(libigl INTERFACE libigl::core)")) (("add_subdirectory\\(hidapi\\)") "pkg_check_modules(HIDAPI REQUIRED hidapi-hidraw)") (("include_directories\\(hidapi/include\\)") @@ -3841,13 +3841,26 @@ (define-public prusa-slicer (("\\bhidapi\\b") "${HIDAPI_LIBRARIES}")))))) (build-system cmake-build-system) (arguments - `(#:configure-flags - '("-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard. - "-DSLIC3R_GTK=3" ;; Use GTK+ - ;; Use wxWidgets 3.0.x.x to prevent GUI crashes when adding support enforcers. - "-DSLIC3R_WX_STABLE=1"))) + (list #:configure-flags + #~(list "-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard. + "-DSLIC3R_GTK=3" ;; Use GTK+ + ;; Use wxWidgets 3.0.x.x to prevent GUI crashes when adding support enforcers. + "-DSLIC3R_WX_STABLE=1" + (format #f "-Dlibigl_DIR=~a" + (search-input-directory %build-inputs + "lib/cmake/igl/")) + (format #f "-DCatch2_DIR=~a" + (search-input-directory %build-inputs + "lib/cmake/Catch2/"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-include-paths + (lambda _ + (substitute* "tests/libslic3r/test_quadric_edge_collapse.cpp" + (("#include ") + "#include "))))))) (native-inputs - (list pkg-config)) + (list pkg-config catch2)) (inputs (list boost cereal @@ -3873,9 +3886,13 @@ (define-public prusa-slicer pango tbb eudev - ;; prusa-slicer 2.5 segfaults on startup with wxwidgets 3.2 - ;; See https://github.com/prusa3d/PrusaSlicer/issues/8299 - wxwidgets-3.0 + qhull + nanosvg + heatshrink + ;; XXX: Using Prusa wxWidgets fork as PrusaSlicer segfaults when compiled + ;; with regular wxwidgets. + prusa-wxwidgets + prusa-libbgcode zlib)) (home-page "https://www.prusa3d.com/prusaslicer/") (synopsis "G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)") diff --git a/gnu/packages/patches/prusa-slicer-boost-fixes.patch b/gnu/packages/patches/prusa-slicer-boost-fixes.patch deleted file mode 100644 index 5bca271625..0000000000 --- a/gnu/packages/patches/prusa-slicer-boost-fixes.patch +++ /dev/null @@ -1,97 +0,0 @@ -Fixes for Boost compatibility. -This patch comes from Gentoo: - portage/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch - ---- a/src/hints/HintsToPot.cpp -+++ b/src/hints/HintsToPot.cpp -@@ -1,6 +1,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -9,7 +10,7 @@ - - bool write_to_pot(boost::filesystem::path path, const std::vector>& data) - { -- boost::filesystem::ofstream file(std::move(path), std::ios_base::app); -+ boost::nowide::ofstream file(std::move(path), std::ios_base::app); - for (const auto& element : data) - { - //Example of .pot element ---- a/src/libslic3r/Preset.cpp -+++ b/src/libslic3r/Preset.cpp -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -84,7 +85,7 @@ ConfigFileType guess_config_file_type(const ptree &tree) - VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path, bool load_all) - { - ptree tree; -- boost::filesystem::ifstream ifs(path); -+ boost::nowide::ifstream ifs(path); - boost::property_tree::read_ini(ifs, tree); - return VendorProfile::from_ini(tree, path, load_all); - } ---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp -+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp -@@ -10,6 +10,7 @@ - #include "libslic3r/Platform.hpp" - #include "libslic3r/Config.hpp" - -+#include - #include - #include - #include -@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog() - - } // namespace GUI - } // namespace Slic3r --#endif // __linux__ -\ No newline at end of file -+#endif // __linux__ ---- a/src/slic3r/GUI/GUI_App.cpp -+++ b/src/slic3r/GUI/GUI_App.cpp -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/src/slic3r/GUI/HintNotification.cpp -+++ b/src/slic3r/GUI/HintNotification.cpp -@@ -15,6 +15,7 @@ - #include "libslic3r/PrintConfig.hpp" - - #include -+#include - #include - #include - #include -@@ -65,7 +66,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f - - void write_used_binary(const std::vector& ids) - { -- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary); -+ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary); - cereal::BinaryOutputArchive archive(file); - HintsCerealData cd { ids }; - try -@@ -84,7 +85,7 @@ void read_used_binary(std::vector& ids) - BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string(); - return; - } -- boost::filesystem::ifstream file(path); -+ boost::nowide::ifstream file(path); - cereal::BinaryInputArchive archive(file); - HintsCerealData cd; - try diff --git a/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch b/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch deleted file mode 100644 index affa506b1c..0000000000 --- a/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix for building with cereal>=1.3.1. -This patch comes from Gentoo: - portage/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch - ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -127,7 +127,7 @@ - set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer") - endif () - --target_link_libraries(PrusaSlicer libslic3r cereal) -+target_link_libraries(PrusaSlicer libslic3r libcereal) - - if (APPLE) - # add_compile_options(-stdlib=libc++) ---- a/src/slic3r/CMakeLists.txt -+++ b/src/slic3r/CMakeLists.txt -@@ -260,7 +260,7 @@ - - encoding_check(libslic3r_gui) - --target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) -+target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) - - if (MSVC) - target_link_libraries(libslic3r_gui Setupapi.lib) ---- a/src/libslic3r/CMakeLists.txt -+++ b/src/libslic3r/CMakeLists.txt -@@ -395,7 +395,7 @@ - target_link_libraries(libslic3r - libnest2d - admesh -- cereal -+ libcereal - libigl - miniz - boost_libs ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -446,6 +446,12 @@ - - # Find the Cereal serialization library - find_package(cereal REQUIRED) -+add_library(libcereal INTERFACE) -+if (NOT TARGET cereal::cereal) -+ target_link_libraries(libcereal INTERFACE cereal) -+else() -+ target_link_libraries(libcereal INTERFACE cereal::cereal) -+endif() - - # l10n - set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 09 15:00:29 2024 Received: (at 70880) by debbugs.gnu.org; 9 Jul 2024 19:00:30 +0000 Received: from localhost ([127.0.0.1]:54089 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRG4j-0003LP-HU for submit@debbugs.gnu.org; Tue, 09 Jul 2024 15:00:29 -0400 Received: from mail-lf1-f53.google.com ([209.85.167.53]:61802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRG4h-0003LF-Px for 70880@debbugs.gnu.org; Tue, 09 Jul 2024 15:00:28 -0400 Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-52e9944764fso6148021e87.3 for <70880@debbugs.gnu.org>; Tue, 09 Jul 2024 12:00:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720551561; x=1721156361; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Un+q+wKAyhoT5/mVrLDaKarqKyjePaAJx/jjMVUROEc=; b=iE7+2Qr14n8uP5dg5DTDg3ue2uBSLijYhj0R9JR3pPiFxc1FcsFKiQTmE56cuqyPUr qG2QdxY0kwvHjhoXtquOn5kjeDfusoknNJWGoBJ4XDcsKQNIoOSdfH09rlWVdM+x2lWP IsRWUlW12pprvpNFCFZdXDrRWvlmXXzRN7VkqD6mk1oEFjXylQaP9bxInmseygVz4Il0 V/vLDPVGUp4hxSyBJsXwqfGbZpjYDvGvLvsCunIj2VFGsgumFiyJLlQyGkdrYc4ZaPG0 XcEyDT0ruxWfP3ixx1947ttIXFl+BsjSqCQMwb6u2DNTPZZCFs9hZPJxfe1WVZ2ri6B/ di+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720551561; x=1721156361; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Un+q+wKAyhoT5/mVrLDaKarqKyjePaAJx/jjMVUROEc=; b=k2y92W2RxPaaQGKEfNCYuEBlAmJXXINy/ffwcCDkK8nXIoVT7zbR1+/vK++eubX7aN LmkPC3eNRbDVsyTbCJ83zXJ064plchmLHq49dTIFY6yrZaKvr/CrJLqLejm4G68ZF2Ff wIG7lg9k2Wy6u29xafreHVgsy/dNxue5QILQxxOH0BcsyXBDBI4OxLhFjk4WvriHomXj nrUFG+tiwK+gPKW+g+Q8GOM3lm6/S0R51GIedv7zPOtpHo8K+P6Era6i4B0GCzUR2Vd0 4CAZiFEhFTMolcCV2KY6ByxcKIF/tzGrYz+WoZvDjGOEFjuHpEspIbKEDOeadoi9aEe5 pYJQ== X-Gm-Message-State: AOJu0YyjlDH8vDjtjxhzaWCuFLZaNxRv3pEQiimQwXZ2AkZocGQ5lFPo K5adV7eLP5Zu3w6W+2K0QlCa6fk7O/xdQ2qZC/GDRgEnxl4uM/2tWh9VNg== X-Google-Smtp-Source: AGHT+IGy7C566nVFIxabLGyktGGxtn/oYy45hRnqu/hw20iq5qHAv3Ybi34PXSJiYdrLuTleFgwe8g== X-Received: by 2002:a05:6512:ea8:b0:52e:7b75:7ca7 with SMTP id 2adb3069b0e04-52eb99d28f8mr2293743e87.61.1720551560296; Tue, 09 Jul 2024 11:59:20 -0700 (PDT) Received: from elephant ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52eb906e7f7sm311800e87.280.2024.07.09.11.59.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 11:59:19 -0700 (PDT) From: "Artyom V. Poptsov" To: Maxim Cournoyer Subject: Re: [bug#70880] [PATCH 6/8] gnu: Add prusa-libbgcode. In-Reply-To: <87cynxnkot.fsf@gmail.com> (Artyom V. Poptsov's message of "Mon, 01 Jul 2024 19:25:38 +0300") References: <15e75ed6a8a2c035194ca4ee66c0fb48b04a48d7.1715450052.git.poptsov.artyom@gmail.com> <874j9j3u65.fsf@gmail.com> <87cynxnkot.fsf@gmail.com> Date: Tue, 09 Jul 2024 21:59:10 +0300 Message-ID: <87bk36qtmp.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hello Maxim Cournoyer! Have you had any chance to review the new version of the patchset? There's already PrusaSlicer 2.8.0, but I'd like to finish my work on 2.7.4 first and after the patchset is merged I'm going to try to update PrusaSlicer to 2.8.0. Thanks, =2Davp =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJNBAEBCgA3FiEEAf2F9Bp7f4IFgwalk16+BzbchX4FAmaNiIMZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRCTXr4HNtyFfsRPD/9r5iNWXKgUhIGq5JYjQoXS 4undzlZ5t4JhxamYqMjTdmHp1XvN/D8nyd1XiQIbZIcKwxYrdfj2M3jcfvOMRhhR l1W5fkhRxyomR2Luml5UP9UTLj38yHIJJ5ThxaVHxNDLzdDxQBtmPNhYO2/6dtJN sB1e9qBliUu7gdsQ9N8Fud84hjpMaKlBoftPKHXpyz00ocL1vbeZwADdaZHy9pNI CpNY8IvYzIdybPrDtIuj7QSlok1Rqydu3hbiJiz6tPP2lu7+5FKZ3COwdHj1xuK+ 9JUMUeayw4Fb7S3N1oLUTvQUGMKmibPSHpv9GMyvuNmH+1sBRTWG+qcmlMm8v11r UiGOSeBHqfpoVeA2mTzo2XOqx1Zuwa0v8FEdbX+VyAj87Wow6YRsBSKc+VtnTeHe cI7l+mMot1F1ITspIOXFDgAsj/6MFhW3W78E3FR3NQJorAsdk9Xk9HYPcllcrmJR z+i4Pg1vwkDDpI00PhvhatSeUjT2OR8okVfin42lPdZb89KWRk+1g9k5iMXzdyRO Y7G3C+JEb+4R3bqiPUMpLj/mWtx3nliSn7u5vSS5ghngFE4SULYiGz3/in4vY8jz wOKFxzH5oRy1cz6jAChhr71a/56Dc7baC//gUdXJu6AKk3EtFc4d5LJpoHbyhq95 dHijN0XHNDuSo0MTErHUyQ== =p/G6 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 09 22:13:00 2024 Received: (at 70880) by debbugs.gnu.org; 10 Jul 2024 02:13:00 +0000 Received: from localhost ([127.0.0.1]:54537 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRMpH-000656-VW for submit@debbugs.gnu.org; Tue, 09 Jul 2024 22:13:00 -0400 Received: from mail-qk1-f176.google.com ([209.85.222.176]:42322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRMpF-00064x-On for 70880@debbugs.gnu.org; Tue, 09 Jul 2024 22:12:58 -0400 Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-7a05b4fa525so25119785a.1 for <70880@debbugs.gnu.org>; Tue, 09 Jul 2024 19:12:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720577510; x=1721182310; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=JAs8kvUxme5qj75Qx8rhwTSChFjkfieXn0s9KAQGkoY=; b=fLj39fFCnyVL2fX+ewrg5zjOvddJ45Qju73CwI50ZbtPXZnc4+cceoenh4xZoLELlV s3ifFdrVdv+a4XU8kYidg23ZvGR9FzJkEzRfqbKqUfESWvZUSIqza/UEKeWEFc/fKP+7 WePieoGv/YhrBu713VkCSxIaKqwWhB+R0XU9y9G9tumaAQutguJ9sR6J4PewZrnonk0k CC0SEMra87w/NxYD8bkrFbhZ82RzgpL3EPl9Q4uvskjtD7iK8+D/nAkDyoH9lJFo0hFZ Prw8SKVwmyYtPG9mK8jv2wcuEtJJbdr2CgqBLbqUc+i25tNH0LlcvG9Jrx1aJOWxWRuo fnVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720577510; x=1721182310; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=JAs8kvUxme5qj75Qx8rhwTSChFjkfieXn0s9KAQGkoY=; b=adoz1Ja7EEkND5M2IDe5BjxUxuzA9j77/aUbeydFFegJQWa8v2euyWFW1vN8sLOpSk dl/rLjv8JXMQ3FOgqm0oEoG4DvBsekTcuFX1K8dSPbuiyv1Ve0wGaJehPp3km2ZhsNe6 +Mt2mfsfO2aNyastc4T/gyfJQ3woUhBDJLZ9OPVtgGRcXPrGdXUB4cllGTEDkod7JBC7 AjYprZr07neFfg6PG9pGlGuglsoMQyeRznBIqZht9/YBnL3J7AGrTnN5rjTkbcpm2leR hEF/GQ83jITyBT2azpsJDx8YFMCC5V6ioBkQOFM3bgeM14m4diZp2IUJwE4K5tW7g1Rd c9Vg== X-Gm-Message-State: AOJu0YwjuUut79mTZ3dC3r2/YGCwnxQFFPbUyF0fpH62KQo2/HM9b4RZ JKtKQ42htO+SXz3XZmMmtO7m9xzU8EfOV3xuR/zgdilzZpf4nHzXbCrVUQ== X-Google-Smtp-Source: AGHT+IH2uxK1KTwb8AG4iUdw4TBlSryAjXbnC+rUcnDdodigZTzi0QTKEifUMqkpDAzpQGZhkBvpfA== X-Received: by 2002:a05:620a:4e1:b0:79f:e7c:f012 with SMTP id af79cd13be357-79f1b5af2a2mr657791485a.22.1720577510506; Tue, 09 Jul 2024 19:11:50 -0700 (PDT) Received: from hurd (dsl-205-236-230-124.b2b2c.ca. [205.236.230.124]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79f190896d4sm152248685a.85.2024.07.09.19.11.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 19:11:49 -0700 (PDT) From: Maxim Cournoyer To: "Artyom V. Poptsov" Subject: Re: [bug#70880] [PATCH v2 3/8] gnu: glfw-3.4: New variable. In-Reply-To: (Artyom V. Poptsov's message of "Mon, 1 Jul 2024 20:07:05 +0300") References: Date: Tue, 09 Jul 2024 22:11:48 -0400 Message-ID: <87a5iqvvvf.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, "Artyom V. Poptsov" writes: > * gnu/packages/gl.scm (glfw-3.4): New variable. > > Change-Id: I77f2214c78f35455436897a3fbff083331295314 > --- > gnu/packages/gl.scm | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm > index f40ddaeb86..2d684e9c80 100644 > --- a/gnu/packages/gl.scm > +++ b/gnu/packages/gl.scm > @@ -995,6 +995,21 @@ (define-public glfw > and surfaces, receiving input and events.") > (license license:zlib))) > > +(define-public glfw-3.4 > + (package > + (inherit glfw) > + (version "3.4") > + (source (origin > + (method url-fetch) > + (uri (string-append "https://github.com/glfw/glfw" > + "/releases/download/" version > + "/glfw-" version ".zip")) > + (sha256 > + (base32 > + "1sd396kkn53myp61kxrd18h7b1q4ix173hhxhvl0iz8j4x5h1v5m")))) > + (inputs (modify-inputs (package-inputs glfw) > + (prepend pkg-config))))) pkg-config should probably be in native-inputs, since it's used at build time only. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 09 22:21:56 2024 Received: (at 70880) by debbugs.gnu.org; 10 Jul 2024 02:21:56 +0000 Received: from localhost ([127.0.0.1]:54554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRMxv-0006L4-OI for submit@debbugs.gnu.org; Tue, 09 Jul 2024 22:21:56 -0400 Received: from mail-vs1-f48.google.com ([209.85.217.48]:44401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRMxs-0006Ks-G3 for 70880@debbugs.gnu.org; Tue, 09 Jul 2024 22:21:54 -0400 Received: by mail-vs1-f48.google.com with SMTP id ada2fe7eead31-48fde151f25so1967847137.1 for <70880@debbugs.gnu.org>; Tue, 09 Jul 2024 19:21:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720578045; x=1721182845; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4i/VERUudwlt1Bx31MCDlrSnaycN7rD86GAu2kF5vOI=; b=ghzKx9DJYJosqvTHMeeyEwJ6I97wO3SpwKmdXTMymEXsKufVX5HL7yax5+ZtgpOotX ApRnFfjherNAqTrMMiJzLqxNei1nHzFBX1yXf3C3Sceer58Z+RwgwMbKERFaqxKRmf68 taZOGCY55yw4NqARgQVfBSc0XT+FL5giIabONcsrhcvliS8Zvgd+4qlTwhUaQxwHol+x sTj9o0tJ3owG3l3g4/kDlRuRPQDNetGxoXskygneneqRv7eVmu4ODFE/K7nKY/PZwgaR W7/klEELmX08JrqvNpum/Ks8/Xgi7xG2R5qnqmn665alo8VtFW+qGSyhOfuTYpt+QnjO f7cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720578045; x=1721182845; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=4i/VERUudwlt1Bx31MCDlrSnaycN7rD86GAu2kF5vOI=; b=aNEjtdo+uQaUJWsz5dt6TbPGy20tWqN2xYjT+9VnfGVUuvOMPsMgT/35CXg8Qt7zUN 4bLthwNiOLwhw48p0mQxip3RE8DbgK+4Y3gBqplu65dVnZAFBhy0HLc4ciHhjBRxbG8w 73Dfh+QSct6wE/qerIZlBITJSIcSLTKTTQpHUgd1f06JoXTQqW2y119x+Z5Yad3bu1IO +Fpyj6CuFZol/KDqVuVriPeSSNBRdUUl5MWS6f1saCvoYu1BxHDRLR7k2vH8ZD2Xclgi TEI0tCxWGmI/C6sCNfxuo8dbDTsasz7MpQ6+V6QKpWBLBEw5OP4z4yqCMwxgCcWtl/W4 /8Bg== X-Gm-Message-State: AOJu0YzNVGousT6fTrBzWrvDjflIN23y75F8yctXwTYDtrn46t9u2O5W w1eyrMlJ05oa5n8/vERKTdNUiCPiuOhN8Afx6Z4TWEe1tDd+PqYqmmTQAw== X-Google-Smtp-Source: AGHT+IEVtFuu5SzJJR9P+BDUjlOyASNhm18YyRIV7EfPv6kKWdhxL9heGc0Ji9rAgZZR1AV7HlQM2A== X-Received: by 2002:a05:6102:2c18:b0:48f:49c2:ff77 with SMTP id ada2fe7eead31-49032147578mr4861410137.16.1720578044681; Tue, 09 Jul 2024 19:20:44 -0700 (PDT) Received: from hurd (dsl-205-236-230-124.b2b2c.ca. [205.236.230.124]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-447f9b26ca8sm16132131cf.15.2024.07.09.19.20.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 19:20:43 -0700 (PDT) From: Maxim Cournoyer To: "Artyom V. Poptsov" Subject: Re: [bug#70880] [PATCH v2 4/8] gnu: libigl: Update to 2.4.0. In-Reply-To: <09e99660acf1973e62ba21b25e5d3e2cceaa5921.1719853592.git.poptsov.artyom@gmail.com> (Artyom V. Poptsov's message of "Mon, 1 Jul 2024 20:07:06 +0300") References: <09e99660acf1973e62ba21b25e5d3e2cceaa5921.1719853592.git.poptsov.artyom@gmail.com> Date: Tue, 09 Jul 2024 22:20:42 -0400 Message-ID: <875xtevvgl.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: "Artyom V. Poptsov" writes: > * gnu/packages/engineering.scm (libigl): Update to 2.4.0. > [arguments]: Use Gexps. Update configure flags. Disable GLFW tests as they > are failing with SEGFAULT errors (see > List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.7 (/) "Artyom V. Poptsov" writes: > * gnu/packages/engineering.scm (libigl): Update to 2.4.0. > [arguments]: Use Gexps. Update configure flags. Disable GLFW tests as= they > are failing with SEGFAULT errors (see > .) > Update "unpack-external" phase: add new dependencies. > Update "patch-cmake" phase to prevent CMake from trying to download ext= ernal > dependencies. Help CMake to find the package inputs. > Add "fix-assertions" and "install-copyleft-modules" phase. > [native-inputs]: Add catch2. > [inputs]: Use glfw-3.4. Add openblas, imgui and spectra. Add libigl > packages and imguizmo. Remove catch2. Nitpick: no need for hanging indents in GNU ChangeLog messages. > Change-Id: Ib4ac842dc14fe1cbc6b0b87674bae1f261a1a970 > --- > gnu/packages/engineering.scm | 258 ++++++++++++++++++++++++----------- > 1 file changed, 179 insertions(+), 79 deletions(-) > > diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm > index fcb73eab12..7f29e2c365 100644 > --- a/gnu/packages/engineering.scm > +++ b/gnu/packages/engineering.scm > @@ -33,7 +33,7 @@ > ;;; Copyright =C2=A9 2022 Malte Frank Gerdes > ;;; Copyright =C2=A9 2022 Konstantinos Agiannis > ;;; Copyright =C2=A9 2022 Greg Hogan > -;;; Copyright =C2=A9 2022 Artyom V. Poptsov > +;;; Copyright =C2=A9 2022-2024 Artyom V. Poptsov > ;;; Copyright =C2=A9 2022 Maxim Cournoyer > ;;; Copyright =C2=A9 2022, 2023 Felix Gruber > ;;; Copyright =C2=A9 2023 Theofilos Pechlivanis > @@ -162,6 +162,7 @@ (define-module (gnu packages engineering) > #:use-module (gnu packages text-editors) > #:use-module (gnu packages time) > #:use-module (gnu packages tls) > + #:use-module (gnu packages toolkits) > #:use-module (gnu packages tree-sitter) > #:use-module (gnu packages version-control) > #:use-module (gnu packages web) > @@ -3510,7 +3511,7 @@ (define-public xfoil > (define-public libigl > (package > (name "libigl") > - (version "2.3.0") > + (version "2.4.0") > (source > (origin > (method git-fetch) > @@ -3520,90 +3521,151 @@ (define-public libigl > (file-name (git-file-name name version)) > (sha256 > (base32 > - "004a22ifq2vibgkgvrlyihqimpsfizvq5l448204kwfg3lkycajj")))) > + "0qlnpp8nxbahcky4d67dzn0ynbv3v037nbx1akq6h5rzhvkzq40x")))) > (build-system cmake-build-system) > (arguments > - `(#:configure-flags > - '("-DLIBIGL_USE_STATIC_LIBRARY=3DOFF" > - "-DLIBIGL_BUILD_TESTS=3DON" > - "-DLIBIGL_BUILD_TUTORIALS=3DOFF" > - "-DLIBIGL_EXPORT_TARGETS=3DON" > - ;; The following options disable tests for the corresponding li= braries. > - ;; The options do not affect whether the libraries are linked to > - ;; libigl or not, they are used for tests. > - "-DLIBIGL_WITH_COMISO=3DOFF" > - "-DLIBIGL_WITH_CORK=3DOFF" > - "-DLIBIGL_WITH_MATLAB=3DOFF" > - "-DLIBIGL_WITH_MOSEK=3DOFF" > - "-DLIBIGL_WITH_TRIANGLE=3DOFF" ;; Undefined reference to "trian= gulate". > - "-DLIBIGL_WITH_OPENGL_GLFW_IMGUI=3DOFF") > + (list #:configure-flags > + #~(list "-DLIBIGL_USE_STATIC_LIBRARY=3DOFF" > + "-DLIBIGL_BUILD_TESTS=3DON" > + "-DLIBIGL_BUILD_TUTORIALS=3DOFF" > + "-DLIBIGL_INSTALL=3DON" > + "-DFETCHCONTENT_FULLY_DISCONNECTED=3DON" > + (format #f "-DCatch2_DIR=3D~a/lib/cmake/catch2/" > + #$(this-package-input "catch2")) > + (format #f "-DSpectra_DIR=3D~a/share/pectra/cmake/" > + #$(this-package-input "spectra")) > + ;; The following options disable tests for the corres= ponding libraries. > + ;; The options do not affect whether the libraries ar= e linked to > + ;; libigl or not, they are used for tests. > + "-DLIBIGL_WITH_COMISO=3DOFF" > + "-DLIBIGL_WITH_CORK=3DOFF" > + "-DLIBIGL_MATLAB=3DOFF" > + "-DLIBIGL_MOSEK=3DOFF" > + ;; XXX: GLFW tests are failing with SEGFAULT. See > + ;; > + "-DLIBIGL_GLFW_TESTS=3DOFF") > + #:build-type "Release" > #:phases > - (modify-phases %standard-phases > + #~(modify-phases %standard-phases > (add-after 'unpack 'unpack-external > (lambda _ > (setenv "HOME" (getcwd)) ;; cmake needs this to export modu= les > (mkdir "external") > (copy-recursively (assoc-ref %build-inputs "libigl-glad") "= external/glad") > - (copy-recursively (assoc-ref %build-inputs "libigl-stb") "e= xternal/stb") > + (copy-recursively (assoc-ref %build-inputs "libigl-test-dat= a") "external/test-data") > + (copy-recursively (assoc-ref %build-inputs "libigl-comiso")= "external/comiso") > (copy-recursively (assoc-ref %build-inputs "libigl-tetgen")= "external/tetgen") > - (copy-recursively (assoc-ref %build-inputs "libigl-predicat= es") "external/predicates"))) > + (copy-recursively (assoc-ref %build-inputs "libigl-predicat= es") "external/predicates") > + (copy-recursively (assoc-ref %build-inputs "imguizmo") "ext= ernal/imguizmo") > + (copy-recursively (assoc-ref %build-inputs "eigen") "extern= al/eigen"))) You'll want to break these long lines; we aim to limit line width below 80 columns. 'guix lint' should complain. > (add-after 'unpack-external 'patch-cmake > - (lambda _ > + (lambda* (#:key inputs #:allow-other-keys) > + (define (source-dir library-name) > + (format #f "SOURCE_DIR \"~a\"" > + (assoc-ref %build-inputs library-name))) > + (define (fix-external-library cmake source) > + (substitute* (format #f "cmake/recipes/external/~a.cmake" > + cmake) > + (("GIT_REPOSITORY.*") (source-dir source)) > + (("GIT_TAG.*") ""))) > ;; Fix references to external libraries > - (substitute* "cmake/libigl.cmake" > - (("if\\(NOT TARGET Eigen3::Eigen\\)" all) > - (string-append "find_package(Eigen3 CONFIG REQUIRED)\n" = all)) > - (("if\\(NOT TARGET CGAL::CGAL\\)" all) > - (string-append "find_package(CGAL CONFIG COMPONENTS Core= )\n" all)) > - (("if\\(NOT TARGET tinyxml2\\)" all) > - (string-append "find_package(tinyxml2 CONFIG REQUIRED)\n" > - "if (NOT TARGET tinyxml2::tinyxml2)")) > - (("if\\(NOT TARGET embree\\)" all) > - (string-append "find_package(embree 3 CONFIG REQUIRED)\n= " all)) > - (("if\\(NOT TARGET glfw\\)" all) > - (string-append "find_package(glfw3 CONFIG REQUIRED)\n" a= ll)) > - (("igl_download_glad\\(\\)" all) "") > - (("igl_download_stb\\(\\)" all) "") > - (("igl_download_tetgen\\(\\)" all) "") > - (("igl_download_triangle\\(\\)" all) "") > - (("igl_download_predicates\\(\\)" all) "")) > - (substitute* "tests/CMakeLists.txt" > - (("igl_download_test_data\\(\\)") "") > - (("set\\(IGL_TEST_DATA.*") > - (format #f "set(IGL_TEST_DATA ~a)\n" > - (assoc-ref %build-inputs "libigl-test-data"))) > - (("igl_download_catch2\\(\\)") "find_package(Catch2 CONFI= G REQUIRED)") > - (("list\\(APPEND CMAKE_MODULE_PATH \\$\\{LIBIGL_EXTERNAL\= \}/catch2/contrib\\)") > - "") > - (("add_subdirectory\\(\\$\\{LIBIGL_EXTERNAL\\}/catch2 cat= ch2\\)") "")) > - ;; Install otherwise missing headers > - (substitute* "cmake/libigl.cmake" > - (("install_dir_files\\(copyleft\\)" all) > - (string-join (list all > - "install_dir_files(copyleft/cgal)" > - "install_dir_files(copyleft/opengl)" > - "install_dir_files(copyleft/tetgen)" > - "install_dir_files(embree)" > - "install_dir_files(opengl)" > - "install_dir_files(png)" > - "install_dir_files(predicates)" > - "install_dir_files(xml)") > - "\n")))))))) > + (fix-external-library "comiso" "libigl-comiso") > + (fix-external-library "tetgen" "libigl-tetgen") > + (fix-external-library "triangle" "libigl-triangle") > + (fix-external-library "predicates" "libigl-predicates") > + (fix-external-library "glad" "libigl-glad") > + (fix-external-library "libigl_tests_data" "libigl-test-data= ") > + (fix-external-library "stb" "libigl-stb") > + (substitute* "cmake/recipes/external/imguizmo.cmake" > + (("if\\(TARGET imguizmo::imguizmo\\)") > + "if(true)") > + (("target_link_libraries.*") > + (format #f "include_directories(~a/include/imgui/)" > + (assoc-ref inputs "imgui")))) > + > + (substitute* "cmake/igl/igl_add_test.cmake" > + (("include\\(\".*/contrib/Catch.cmake\"\\)") > + (format #f > + "include(\"~a/lib/cmake/Catch2/Catch.cmake\")" > + (assoc-ref inputs "catch2")))) > + (substitute* "cmake/recipes/external/cgal.cmake" > + (("FetchContent_Populate\\(cgal\\)") > + "find_package(CGAL CONFIG COMPONENTS Core)\nreturn()")) > + (substitute* "cmake/recipes/external/eigen.cmake" > + (("FetchContent_Populate\\(eigen\\)") > + "find_package(Eigen3 CONFIG REQUIRED)\nreturn()")) > + (substitute* "cmake/recipes/external/catch2.cmake" > + (("message.*") > + "find_package(Catch2 CONFIG)\nreturn()")) > + (substitute* "cmake/recipes/external/libigl_imgui_fonts.cma= ke" > + (("if\\(TARGET igl::imgui_fonts\\)") > + "if(true)")) > + (substitute* "cmake/recipes/external/tinyxml2.cmake" > + (("FetchContent_Populate\\(tinyxml2\\)") > + "find_package(tinyxml2 CONFIG REQUIRED)\nreturn()")) > + (substitute* "cmake/recipes/external/embree.cmake" > + (("FetchContent_MakeAvailable\\(embree\\)") > + (string-join (list "find_package(Embree 3 CONFIG)" > + "add_library(embree::embree ALIAS emb= ree)" > + "return()") > + "\n"))) > + (substitute* "cmake/recipes/external/glfw.cmake" > + (("FetchContent_MakeAvailable\\(glfw\\)") > + (string-join > + (list "find_package(glfw3 CONFIG REQUIRED)" > + "add_library(glfw::glfw ALIAS glfw)" > + "return()") > + "\n"))) > + (substitute* "cmake/recipes/external/imgui.cmake" > + (("FetchContent_MakeAvailable\\(imgui\\)") > + "return()")))) All these FetchContent substitutions could perhaps be unnecessary if they were referring to the right package name and with the use of the -DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=3DALWAYS configure flag, which forces CMake to look at the packages from the system and fail if they aren't found instead of fetching their source and building them. > + (add-after 'unpack-external 'fix-assertions > + (lambda _ > + ;; Current Tetgen version has a bug. > + (substitute* "include/igl/copyleft/tetgen/tetgenio_to_tetme= sh.cpp" > + (("assert\\(out.numberofpoints =3D=3D out.numberofpointma= rkers\\);") > + ";")) > + ;; CGAL has a bug in assertion as well. > + (substitute* "include/igl/copyleft/cgal/trim_with_solid.cpp" > + (("assert\\(I.size\\(\\) =3D=3D Vr.rows\\(\\)\\);") > + ";")))) > + > + ;; XXX: Install modules as CMake fails to install them. > + (add-after 'install 'install-includes > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (include-dir (string-append out "/include/igl/"))) > + (for-each (lambda (module) > + (copy-recursively (format #f "../source/inclu= de/igl/~a" > + module) > + (format #f "~a/~a" include-= dir module))) > + (list "copyleft/cgal" > + "copyleft/opengl2" > + "copyleft/tetgen" > + "embree" > + "opengl" > + "predicates" > + "xml")))))))) > + > + (native-inputs (list catch2)) > ;; XXX: Inputs are currently only used to build tests. > ;; We would need to patch the CMake recipe to build a shared li= brary > ;; with all of these. > (inputs > `(("boost" ,boost) > - ("catch2" ,catch2) > ("cgal" ,cgal) > ("eigen" ,eigen) > ("embree" ,embree) > - ("glfw" ,glfw) > + ("glfw" ,glfw-3.4) > ("gmp" ,gmp) > ("mesa" ,mesa) > ("mpfr" ,mpfr) > ("tbb" ,tbb) > ("tinyxml2" ,tinyxml2) > + ("openblas" ,openblas) > + ("imgui" ,imgui) > + ("spectra" ,spectra) > ;; When updating this package, update commit fields below accordi= ng to > ;; the hashes listed in "cmake/LibiglDownloadExternal.cmake". > ("libigl-test-data" > @@ -3615,13 +3677,16 @@ (define-public libigl > (file-name (git-file-name "libigl-test-data" version)) > (sha256 (base32 "1wxglrxw74xw4a4jmmjpm8719f3mnlbxbwygjb4ddfix= xxyya4i2")))) > ("libigl-glad" > - ,(origin > - (method git-fetch) > - (uri (git-reference > - (url "https://github.com/libigl/libigl-glad") > - (commit "09b4969c56779f7ddf8e6176ec1873184aec890f"))) > - (file-name (git-file-name "libigl-glad" version)) > - (sha256 (base32 "0rwrs7513ylp6gxv7crjzflapcg9p7x04nzfvywgl665= vl53rawk")))) > + ,(let* ((commit "ead2d21fd1d9f566d8f9a9ce99ddf85829258c7a") > + (revision "0") > + (version (git-version "0.0.0" revision commit))) > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/libigl/libigl-glad") > + (commit commit))) > + (file-name (git-file-name "libigl-glad" version)) > + (sha256 (base32 "079fd5yrbd713nq7slhhgq79wns85pc564ydlkjl9g= f43d3220ay"))))) > ("libigl-stb" > ,(origin > (method git-fetch) > @@ -3631,22 +3696,57 @@ (define-public libigl > (file-name (git-file-name "libigl-stb" version)) > (sha256 (base32 "0wwlb370z40y63ic3ny6q7lxibhixg2k1pjdkl4ymzv7= 9zld28kj")))) > ("libigl-predicates" > + ,(let* ((commit "50c2149e7a520d13cd10e9aeff698bd68edd5a4f") > + (revision "0") > + (version (git-version "0.0.0" revision commit))) > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/libigl/libigl-predicates.git= ") > + (commit commit))) > + (file-name (git-file-name "libigl-predicates" version)) > + (sha256 (base32 "0yiqhzry2qhb1p0v9sldlnpqsn4y8cln8r6y08lafk= c9kc4qy8jz"))))) > + ;; TODO: Package tetgen separately from > + ("libigl-tetgen" > + ,(let* ((commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6") > + (revision "0") > + (version (git-version "0.0.0" revision commit))) > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/libigl/tetgen.git") > + (commit commit))) > + (file-name (git-file-name "libigl-tetgen" version)) > + (sha256 (base32 "1k724syssw37py7kwmibk3sfwkkgyjyy7qkijnhn6r= jm91g8qxsg"))))) > + ("libigl-comiso" > + ,(let* ((commit "562efe333edc8e649dc101469614f43378b1eb55") > + (revision "0") > + (version (git-version "0.0.0" revision commit))) > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/libigl/comiso.git") > + (commit commit))) > + (file-name (git-file-name "libigl-comiso" version)) > + (sha256 (base32 "048zryh9ydd1dqwzs14vj7r3fd6yyq6n4zl6d1b0yb= 1iwrqfy6ba"))))) > + ("libigl-triangle" > ,(origin > (method git-fetch) > (uri (git-reference > - (url "https://github.com/libigl/libigl-predicates.git") > - (commit "488242fa2b1f98a9c5bd1441297fb4a99a6a9ae4"))) > - (file-name (git-file-name "libigl-predicates" version)) > - (sha256 (base32 "13bd98g8lgcq37i3crj66433z09grnb2xjrcqpwqmyn1= 47rp5wyh")))) > - ;; TODO: Package tetgen separately from > - ("libigl-tetgen" > + (url "https://github.com/libigl/triangle.git") > + (commit "6bbd92c7ddd6c803c403e005e1132eadb38fbe68"))) > + (file-name (git-file-name "libigl-triangle" version)) > + (sha256 (base32 "0d35mfqwdk99xn1lpjzz9w5axq016r6xy5vr00lb4mvb= 05limxl3")))) > + ;; XXX: This is a source-only library which is currently required= only for > + ;; libigl. > + ("imguizmo" > ,(origin > (method git-fetch) > (uri (git-reference > - (url "https://github.com/libigl/tetgen.git") > - (commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6"))) > - (file-name (git-file-name "libigl-tetgen" version)) > - (sha256 (base32 "1k724syssw37py7kwmibk3sfwkkgyjyy7qkijnhn6rjm= 91g8qxsg")))))) > + (url "https://github.com/CedricGuillemet/ImGuizmo") > + (commit "1.83"))) > + (file-name (git-file-name "imguizmo" version)) > + (sha256 (base32 "14ywf96nvxf5c081pwypyzjwx9vyq78glbzinc81558v= 1sxiy2v0")))))) > (home-page "https://libigl.github.io/") > (synopsis "Simple C++ geometry processing library") > (description "This library provides functionality for shape modellin= g, The rest LGTM, although it'd be nice to modernize the definition to use gexps and remove the input labels. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 09 22:25:34 2024 Received: (at 70880) by debbugs.gnu.org; 10 Jul 2024 02:25:34 +0000 Received: from localhost ([127.0.0.1]:54558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRN1S-0006Qp-3D for submit@debbugs.gnu.org; Tue, 09 Jul 2024 22:25:34 -0400 Received: from mail-oi1-f171.google.com ([209.85.167.171]:59745) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRN1Q-0006Qb-3I for 70880@debbugs.gnu.org; Tue, 09 Jul 2024 22:25:33 -0400 Received: by mail-oi1-f171.google.com with SMTP id 5614622812f47-3d927fb8b82so2146722b6e.3 for <70880@debbugs.gnu.org>; Tue, 09 Jul 2024 19:25:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720578259; x=1721183059; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YYzv0gA+pEzT+sJIadE9K7/UMxmOo+Q+oPEqWFQJiGo=; b=m8ldfrnqAuyLtVyEOfwmtg9C2LXu07nQdLQNUQyzIET7KCkeelLWb2Oh60phwAZykH TlDRWdkXaa4UuBevC5ez6fcui/cakw6KXTe2bo0b/burgNzTty53v2NFtl4rqsxg2VdU OaOwBpQZO0XbTfHbvzQmZF/rPUVmUPmw+wvBCHoGjgdTVavD+3JpwKloakO5/Z2mq04F +Hn7QW/OyyJMm1zZajtDepu8CfMCMJpmF+l2CFE5YvHFzsAxo8JxO9QYsXNeiAJ77v/y 9VAfKEhGqhpU0dNMlTBsC5K0XTE/xKs1ZFBuC+iHV73mwmBbAou+OktC8lJUGwUIyTvd wWdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720578259; x=1721183059; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YYzv0gA+pEzT+sJIadE9K7/UMxmOo+Q+oPEqWFQJiGo=; b=FuLJZT+S6PXq31uoa/IjscP1IEExXXaWxcHhiER45SwULHnjmQwOtGBQDci541nrlS D1nIClVR1Y+oYpEWc5yqMzl6UzVD7Ec0o5AkxJJFu/BYefY7k/2bu9dXt7YbX8DDbMXp vI+s8Xh0vnzOLJwQS27P0LY6o5XU8FM0anZSKIE1tz6dKcHnw3hyU3bMUr1puZxeDssj aVrtq/kZ1E68u+95IO0otDDBJLB9SdWJ0b0isCId4xLA1Ii13QGqbvWvFy8UuhKGryn4 f7bo70L/4JNC1q+kTnQk+75Aln9taC3leALprVBVzoW7kVguZnqq4z/smVyN40rm37+i uDSQ== X-Gm-Message-State: AOJu0YxTQmMAVBTGHX5+4vvXOhSJ1FVOllI5Z77Su9Inn1RgYBLuW8ST MeecT5fgniTh8+H1QlaYyxlqyriH22u4c23w5PLCcH/ujAQJLUBat3Xk6g== X-Google-Smtp-Source: AGHT+IGKXoqjq025Srk1EMWC0RAMmolWl66u7pVnezq8JOdVfkiBMxZP8YTw6ZVDK01YIUl2R8zOwQ== X-Received: by 2002:a05:6808:bcb:b0:3d2:19da:9573 with SMTP id 5614622812f47-3d93bff5580mr5268423b6e.15.1720578259573; Tue, 09 Jul 2024 19:24:19 -0700 (PDT) Received: from hurd (dsl-205-236-230-124.b2b2c.ca. [205.236.230.124]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79f190a862bsm152079285a.114.2024.07.09.19.24.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 19:24:19 -0700 (PDT) From: Maxim Cournoyer To: "Artyom V. Poptsov" Subject: Re: [bug#70880] [PATCH v2 5/8] gnu: Add heatshrink. In-Reply-To: (Artyom V. Poptsov's message of "Mon, 1 Jul 2024 20:07:07 +0300") References: Date: Tue, 09 Jul 2024 22:24:18 -0400 Message-ID: <871q42vval.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, "Artyom V. Poptsov" writes: > * gnu/packages/compression.scm (heatshrink): New variable. > * gnu/packages/patches/heatshrink-add-cmake.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add "heatshrink-add-cmake.patch". > > Change-Id: I0beccdcaed22e47ac6bfe522497e0759a315813d > --- > gnu/local.mk | 1 + > gnu/packages/compression.scm | 42 +++++++ > .../patches/heatshrink-add-cmake.patch | 111 ++++++++++++++++++ > 3 files changed, 154 insertions(+) > create mode 100644 gnu/packages/patches/heatshrink-add-cmake.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index e20ed2be7e..e263261986 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1474,6 +1474,7 @@ dist_patch_DATA =3D \ > %D%/packages/patches/hdf-eos5-remove-gctp.patch \ > %D%/packages/patches/hdf-eos5-fix-szip.patch \ > %D%/packages/patches/hdf-eos5-fortrantests.patch \ > + %D%/packages/patches/heatshrink-add-cmake.patch \ > %D%/packages/patches/heimdal-CVE-2022-45142.patch \ > %D%/packages/patches/helm-fix-gcc-9-build.patch \ > %D%/packages/patches/highlight-gui-data-dir.patch \ > diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm > index ac025e0e3d..0a028f1490 100644 > --- a/gnu/packages/compression.scm > +++ b/gnu/packages/compression.scm > @@ -40,6 +40,7 @@ > ;;; Copyright =C2=A9 2021 Foo Chuan Wei > ;;; Copyright =C2=A9 2024 Vinicius Monego > ;;; Copyright =C2=A9 2024 David Elsing > +;;; Copyright =C2=A9 2024 Artyom V. Poptsov > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -574,6 +575,47 @@ (define-public xz > (license (list license:gpl2+ license:lgpl2.1+)) ; bits of both > (home-page "https://tukaani.org/xz/"))) >=20=20 > +(define-public heatshrink > + (package > + (name "heatshrink") > + (version "0.4.1") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/atomicobject/heatshrink/") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "0sdhvk27yz8kahw18j8pddbpkgl78v8rh8fx6wspc3acj7w7yvrn")) > + ;; Add CMake build script, wanted by prusa-slicer and libbgcode, = which are the > + ;; only users of this library. > + ;; > + ;; See > + ;; Not a hard requirement, but there's some loose convention used in Guix for referencing URLs: Blablabla text (see: $URL). Reviewed-by: Maxim Cournoyer --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 09 22:31:42 2024 Received: (at 70880) by debbugs.gnu.org; 10 Jul 2024 02:31:42 +0000 Received: from localhost ([127.0.0.1]:54564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRN7O-0006bh-3v for submit@debbugs.gnu.org; Tue, 09 Jul 2024 22:31:42 -0400 Received: from mail-qt1-f169.google.com ([209.85.160.169]:42023) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRN7L-0006bQ-O7 for 70880@debbugs.gnu.org; Tue, 09 Jul 2024 22:31:40 -0400 Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-447e2d719afso2997851cf.0 for <70880@debbugs.gnu.org>; Tue, 09 Jul 2024 19:31:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720578627; x=1721183427; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=jfJ4jjAIoYXGwnNspp9xebqCA5Knon9q7GbpAKRfx+c=; b=GTzM2/0R7gyfw/rEiikji3S/XWXEnpF0YhzeQaMbHt6ORhEykORuVwSqlM9ntC14tJ UqYaE7SyYsv5fdsIVXBCyKSVY/kmui0SpX734aWUnx0xpZwoh9ZSE/Y+1aiK12h3q1CA wsbqA7fpRqJcdWaLvDfqKqljh1k4FzHBMROM8n4+672sAaKRLmjUp+GpbbO6bKh+fYzE o8ZsmGSTw9RYn5vmjgfyGdJllITyayRfHuieu2vOlvW3aaTmDUYLBS9FxmUUWVLWOISm v4xQXbgqeWevsVLN2n0W1Q8V5kjdEnJ8l43YDisT+Yp87Evg7VNj+0UkzPZxYyGxzZrJ TaFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720578627; x=1721183427; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=jfJ4jjAIoYXGwnNspp9xebqCA5Knon9q7GbpAKRfx+c=; b=KXN/jftvkuwXGaEudWta7iRNtI4O/kucecCCj3CUVM4j7Q5cP49ISJWhSAyxCYDK+0 Yx6ewbm3H8Ox/RYFyHPkR3EHsQy5AdEXubbmbENPYRvNN0vfiAufLfdclck5ZOFQ8pDt /vNQIIqWWXfoXgnbhHzNlBCcuCprtyRpL3DqY24EEHhjT8gepWUldaa/rJ0kFnnwhURv u1BSceJGZC22ath4Y07cewVbPBkPV7GNCIBOsEMRm4OyOemVkM0TpAdyv0oSbVCTSZhV tXIWaxRBNHaf/0jU1U22esucjp9LMHYt7s4bIw+OLXM9Et2Lp1yDJOQkvMnIL4WcNxxQ CrtA== X-Gm-Message-State: AOJu0YzT0yjynYuHjtE6Z6an5ZVQIn2L0RmcJc2/3xIleNs+Sw5nF1/X zTSwxl8hdE3/4V4JxxAiSZVoj1GeLQX8X2+98OtRJmNhlh+Gq+NUGGu9vw== X-Google-Smtp-Source: AGHT+IGSzoTRRmeylj6k2lt6M1bQNPbintZN7doYh/XaNjRME31y0hj9r4mEvAqloiFEihwNUy5HwA== X-Received: by 2002:ac8:5fd3:0:b0:447:f891:1e72 with SMTP id d75a77b69052e-447fc3b976bmr78145931cf.15.1720578627212; Tue, 09 Jul 2024 19:30:27 -0700 (PDT) Received: from hurd (dsl-205-236-230-124.b2b2c.ca. [205.236.230.124]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-447f9b2818esm16123341cf.10.2024.07.09.19.30.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 19:30:26 -0700 (PDT) From: Maxim Cournoyer To: "Artyom V. Poptsov" Subject: Re: [bug#70880] [PATCH v2 6/8] gnu: Add prusa-libbgcode. In-Reply-To: <2cdedc4189efac291f16e099b91605a8f8f4aca9.1719853592.git.poptsov.artyom@gmail.com> (Artyom V. Poptsov's message of "Mon, 1 Jul 2024 20:07:08 +0300") References: <2cdedc4189efac291f16e099b91605a8f8f4aca9.1719853592.git.poptsov.artyom@gmail.com> Date: Tue, 09 Jul 2024 22:30:25 -0400 Message-ID: <87wmluugfy.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, "Artyom V. Poptsov" writes: > * gnu/packages/engineering.scm (prusa-libbgcode): New variable. > > Change-Id: I1f18c399d0fe36987c613ce4c0c3845c803beb45 > --- > gnu/packages/engineering.scm | 46 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 46 insertions(+) > > diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm > index 7f29e2c365..de4b4a5825 100644 > --- a/gnu/packages/engineering.scm > +++ b/gnu/packages/engineering.scm > @@ -3753,6 +3753,52 @@ (define-public libigl > visualization, matrix manipulation.") > (license (list license:gpl3 license:mpl2.0)))) > > +(define-public prusa-libbgcode Sorry for missing that in my first review: there should be an explanatory comment here mentioning which commit to use and why (e.g.: "Use the latest commit since there are no proper releases nor tags.") > + (let ((commit "8ae75bd0eea622f0e34cae311b3bd065b55eae9b") > + (revision "0")) > + (package > + (name "prusa-libbgcode") > + (version (git-version "0.0.0" revision commit)) > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/prusa3d/libbgcode") > + (commit commit))) > + (file-name (git-file-name name version)) > + (sha256 (base32 "0fjx2ijz9zqpqs486lcrrrhqvmfzrpb8j6v57l0jiynavwv3kznw")))) > + (native-inputs (list catch2)) > + (propagated-inputs > + (list zlib boost heatshrink)) Nitpick: when there are few inputs (< 5), it's OK to list them inline if it fits the 80 columns rule, like: (propagated-inputs (list zlib boost heatshrink)) I think this is what 'guix style' would do. > + (build-system cmake-build-system) > + (home-page "https://github.com/prusa3d/libbgcode") > + (synopsis "Prusa Block and Binary G-code reader/writer/converter") > + (description > + "Binary G-code is a new standard for encoding and compressing ASCII G-code > +files. G-code files are easy to read and interpret, but their downside is that the > +data is not saved efficiently, and the file size is often very large. Compression of > +the file is problematic because the printers usually run on limited hardware and they > +may not have enough memory and/or CPU power to decompress it. > + > +Block and Binary G-Code is a new G-code file format featuring the following > +improvements over the legacy G-code: > +@itemize > +@item Block structure with distinct blocks for metadata vs. G-code. > +@item Faster navigation. > +@item Coding and compression for smaller file size. > +@item Checksum for data validity. > +@item Extensibility through new (custom) blocks. For example, a file signature block > +may be welcome by corporate customers. > +@end itemize > + > +The binary G-code format is flexible and the encoding and compression of individual > +blocks is variable. @code{libbgcode} library contains the routines to convert ASCII ^ The @code{libgcode} ... > +G-codes to binary and vice versa. The library is written in C++ and the repository > +includes bindings for Python.") It looks like this package does not provide the Python bindings, so it may be best to drop that part of the last sentence mentioning their existence, as it would be misleading for Guix users. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 09 22:36:45 2024 Received: (at 70880) by debbugs.gnu.org; 10 Jul 2024 02:36:45 +0000 Received: from localhost ([127.0.0.1]:54568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRNCG-0006jE-VD for submit@debbugs.gnu.org; Tue, 09 Jul 2024 22:36:45 -0400 Received: from mail-qt1-f175.google.com ([209.85.160.175]:42121) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRNCD-0006iy-PN for 70880@debbugs.gnu.org; Tue, 09 Jul 2024 22:36:43 -0400 Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-447e2d719afso3017151cf.0 for <70880@debbugs.gnu.org>; Tue, 09 Jul 2024 19:36:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720578930; x=1721183730; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=qZCcZKjRQ/vMhvZD9Whzz9w5dYE8AECn1dEkE59BuMA=; b=ZUTs+V7SopYORlu82KbqtKyvzZrB8tDAWZlRRWlx+iwU2DrQ3XzkaCHlCaqv4y8hNl XmHa7Iino1gS6c2jrTI3xorpUCen5quZG7fbtzTTKwTUbspNLvhq1LkfOsib3MheSOWN bZ3ismunCL4vjIXc7QyE/nyLPpFwcAolv2uQ4zrLfeVw/JAE44Z+FEH61++ihpVyLcSp Kbs2Czv3JswzOe5OWMTd4NCXvmre6bL9VvQzufmCxumyZ4pfo63JZJO3YU7hOIlmuiO9 dAfbRrAFMV5ZYJKAiQQu1g1rpdoqVA5V0bd8slFrhTSmmIUpi7LLrZwKcaImuxDYsICH U3aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720578930; x=1721183730; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=qZCcZKjRQ/vMhvZD9Whzz9w5dYE8AECn1dEkE59BuMA=; b=T+Dv1VJ10jG6iUzVUjhVFvxgM3CT16stAWTDttk6MkcmcfxO2lhutgxs5e/s1UPoMS ARTbE/rjIzdlDeEwFqk0BvCNcDfg10KH0zWZQSESgut3tIj5PWKfXxtkhqSqWkSqTHkF wsbLfBS1lRIiY1+6lNJ7j/LWGww3C25Pvw7E0OP74i5qJIaaNusc3HzEZKetixt7JfI+ 7kY38NtKTjpfBS1nK+qQ2oSTLjfz3SKobcxs2tSP845jYuthilekXqLQcc72kMm6MGvW /zz0Kl6ZdBlbdmTJyTT7PPCbD/KF7TTDOqqJQQyeLezPNGtLy3+LeZlqWrxIcoIM8aor MqZA== X-Gm-Message-State: AOJu0Yx3ErUHBU/0K9++EYsKDDdvJugBNiuzWF0i5D6XZnCyq25fGFSv Mr8+2AumqTLZOqltxeSBH4VtiYrSRIdXp8BtvIAMNPt6hn3G+T9wejr0xA== X-Google-Smtp-Source: AGHT+IE4AAesQxcuLhTDUySFQjVAFEsu4rmbou20cuLlduRb7Hbw2+w+Losd7tQbJT7ihzYSYPPf4Q== X-Received: by 2002:ac8:4a0d:0:b0:444:f6d2:be89 with SMTP id d75a77b69052e-447fc36846bmr63161731cf.5.1720578930402; Tue, 09 Jul 2024 19:35:30 -0700 (PDT) Received: from hurd (dsl-205-236-230-124.b2b2c.ca. [205.236.230.124]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-447f9b3c50asm16277231cf.31.2024.07.09.19.35.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 19:35:29 -0700 (PDT) From: Maxim Cournoyer To: "Artyom V. Poptsov" Subject: Re: [bug#70880] [PATCH v2 7/8] gnu: Add prusa-wxwidgets. In-Reply-To: <9f39081f248d8efe78b8234a9642a367a3e05827.1719853592.git.poptsov.artyom@gmail.com> (Artyom V. Poptsov's message of "Mon, 1 Jul 2024 20:07:09 +0300") References: <9f39081f248d8efe78b8234a9642a367a3e05827.1719853592.git.poptsov.artyom@gmail.com> Date: Tue, 09 Jul 2024 22:35:28 -0400 Message-ID: <87sewiug7j.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org, Nikita Domnitskii X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, "Artyom V. Poptsov" writes: > * gnu/packages/engineering.scm (prusa-wxwidgets): New variable. > * gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register > "prusa-wxwidgets-makefile-fix.patch". > > Co-authored-by: Nikita Domnitskii > Change-Id: I9043c2acc95986275ee24d9c5d944e5fe2702e99 > --- > gnu/local.mk | 1 + > .../prusa-wxwidgets-makefile-fix.patch | 112 ++++++++++++++++++ > gnu/packages/wxwidgets.scm | 29 +++++ > 3 files changed, 142 insertions(+) > create mode 100644 gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index e263261986..29107a618b 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1842,6 +1842,7 @@ dist_patch_DATA = \ > %D%/packages/patches/prusa-slicer-boost-fixes.patch \ > %D%/packages/patches/prusa-slicer-fix-tests.patch \ > %D%/packages/patches/prusa-slicer-with-cereal-1.3.1.patch \ > + %D%/packages/patches/prusa-wxwidgets-makefile-fix.patch \ > %D%/packages/patches/pthreadpool-system-libraries.patch \ > %D%/packages/patches/python-3.12-fix-tests.patch \ > %D%/packages/patches/python-accupy-use-matplotx.patch \ > diff --git a/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch b/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch > new file mode 100644 > index 0000000000..aadf976588 > --- /dev/null > +++ b/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch > @@ -0,0 +1,112 @@ There ideally should be some info as to how this patch came into existence. Is it pulled from upstream? From which commit/URL ? If it's custom work, briefly explain why it is necessary at the top of the diff/patch. > +diff --git a/Makefile.in b/Makefile.in > +index 8f33aa2ff4..39928382da 100644 > +--- a/Makefile.in > ++++ b/Makefile.in > +@@ -4358,7 +4358,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ > + monodll_msw_utils.o \ > + monodll_utilsexc.o \ > + monodll_fswatcher.o \ > +- monodll_msw_secretstore.o > ++ monodll_msw_secretstore.o \ > + monodll_msw_uilocale.o > + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS) > + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \ > +@@ -5284,7 +5284,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ > + monodll_uuid.o \ > + monodll_msw_evtloop.o \ > + monodll_access.o \ > +- monodll_dark_mode.o > ++ monodll_dark_mode.o \ > + monodll_msw_bmpbndl.o > + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS) > + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \ > +@@ -6196,7 +6196,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ > + monodll_uuid.o \ > + monodll_msw_evtloop.o \ > + monodll_access.o \ > +- monodll_dark_mode.o > ++ monodll_dark_mode.o \ > + monodll_msw_bmpbndl.o > + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1) > + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \ > +@@ -6371,7 +6371,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ > + monolib_msw_utils.o \ > + monolib_utilsexc.o \ > + monolib_fswatcher.o \ > +- monolib_msw_secretstore.o > ++ monolib_msw_secretstore.o \ > + monolib_msw_uilocale.o > + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1) > + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \ > +@@ -7297,7 +7297,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ > + monolib_uuid.o \ > + monolib_msw_evtloop.o \ > + monolib_access.o \ > +- monolib_dark_mode.o > ++ monolib_dark_mode.o \ > + monolib_msw_bmpbndl.o > + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2) > + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \ > +@@ -8209,7 +8209,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ > + monolib_uuid.o \ > + monolib_msw_evtloop.o \ > + monolib_access.o \ > +- monolib_dark_mode.o > ++ monolib_dark_mode.o \ > + monolib_msw_bmpbndl.o > + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3) > + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \ > +@@ -8436,7 +8436,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ > + basedll_msw_utils.o \ > + basedll_utilsexc.o \ > + basedll_fswatcher.o \ > +- basedll_msw_secretstore.o > ++ basedll_msw_secretstore.o \ > + basedll_msw_uilocale.o > + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2) > + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \ > +@@ -8523,7 +8523,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ > + baselib_msw_utils.o \ > + baselib_utilsexc.o \ > + baselib_fswatcher.o \ > +- baselib_msw_secretstore.o > ++ baselib_msw_secretstore.o \ > + baselib_msw_uilocale.o > + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3) > + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \ > +@@ -9464,7 +9464,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ > + coredll_uuid.o \ > + coredll_msw_evtloop.o \ > + coredll_access.o \ > +- coredll_dark_mode.o > ++ coredll_dark_mode.o \ > + coredll_msw_bmpbndl.o > + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4) > + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \ > +@@ -10376,7 +10376,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ > + coredll_uuid.o \ > + coredll_msw_evtloop.o \ > + coredll_access.o \ > +- coredll_dark_mode.o > ++ coredll_dark_mode.o \ > + coredll_msw_bmpbndl.o > + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5) > + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \ > +@@ -11204,7 +11204,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ > + corelib_uuid.o \ > + corelib_msw_evtloop.o \ > + corelib_access.o \ > +- corelib_dark_mode.o > ++ corelib_dark_mode.o \ > + corelib_msw_bmpbndl.o > + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6) > + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \ > +@@ -12116,7 +12116,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ > + corelib_uuid.o \ > + corelib_msw_evtloop.o \ > + corelib_access.o \ > +- corelib_dark_mode.o > ++ corelib_dark_mode.o \ > + corelib_msw_bmpbndl.o > + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7) > + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \ > diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm > index 973e962fb1..2cf2ceba56 100644 > --- a/gnu/packages/wxwidgets.scm > +++ b/gnu/packages/wxwidgets.scm > @@ -265,6 +265,35 @@ (define-public wxwidgets-2 > (("-Wall") "-Wall -Wno-narrowing")) > #t))))))) > > +(define-public prusa-wxwidgets I think the convention is to use a variable name like 'wxwidgets-for-prusa'. > + ;; There is no tag/release, all patches are in separate branch. What does "all patches are in separate branch" mean? > + (let ((commit "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26")) > + (package > + (inherit wxwidgets) > + (name "prusa-wxwidgets") > + (version "3.2.0") > + (home-page "https://github.com/prusa3d/wxWidgets") > + (source > + (origin > + (inherit (package-source wxwidgets)) > + (method git-fetch) > + (uri (git-reference > + (url home-page) > + (commit commit))) > + (file-name (git-file-name name version)) > + (patches (search-patches "prusa-wxwidgets-makefile-fix.patch")) > + (sha256 > + (base32 > + "02nd07c23xbclnf1jjfbv6r5vqjb80gsdy2l559c5qzgdcvfd2xd")))) > + (arguments > + (substitute-keyword-arguments (package-arguments wxwidgets) > + ((#:configure-flags flags) > + ;; To fix 3D rendering in PrusaSlicer, wxWidgets must be compiled with > + ;; "--disable-glcanvasegl" flag. > + ;; > + ;; See > + #~(cons "--disable-glcanvasegl" #$flags))))))) Otherwise LGTM. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 09 22:43:38 2024 Received: (at 70880) by debbugs.gnu.org; 10 Jul 2024 02:43:38 +0000 Received: from localhost ([127.0.0.1]:54588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRNIv-0006uk-MN for submit@debbugs.gnu.org; Tue, 09 Jul 2024 22:43:38 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:54713) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRNIu-0006uV-3c for 70880@debbugs.gnu.org; Tue, 09 Jul 2024 22:43:36 -0400 Received: by mail-qt1-f172.google.com with SMTP id d75a77b69052e-446883be273so32318631cf.1 for <70880@debbugs.gnu.org>; Tue, 09 Jul 2024 19:43:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720579344; x=1721184144; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=EU2zLwOaW8umrYoHCpYEm5YaDqJbejz25POKenSxidA=; b=W2FmMgufqUDdTcNaRVqBPkl4yftyO9a28pt6G6neoJiGDgc9Oscb4ygmTA0YMj10O1 U7hlaVLZFnHNRyHarSVo9TuqdmfgQ+XBDquoYpfBv2mwYJVAu37d/L8xefXlm4+lMwom 0yZrSa8r19WCYb0C/nC3YhDaa95fNu3CVIAtPqxpDe1ukiZCageMKHzxHEt1RTjOeenA jKOzmyhZjNvxbJf9QPVx8FH5fs6SMfRY6GP5XdiNP1VP8zvc55YjvD6vU8NCdT7e8Wmo NX0Oqx5RhV/vQlhFJJl1J3u0z7+YtVfwQy1jnbnXU2xg6hcSbrRYdKF2c1qiHKvUmJXO 6guA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720579344; x=1721184144; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=EU2zLwOaW8umrYoHCpYEm5YaDqJbejz25POKenSxidA=; b=IghUeryL1y0aKtRTKcWrO3C44R4sdjJGW0XDa2Qk7ndD6KON2hrB4MhR82v628IeTq Xyy2FwwSmBifI4a1WL1IWECuQKZ5spc1Ri0p892BwzaIt7DdNyBJo/Pg0FyGb5Jao00V jv/FhHACJbwqqmVL2LazAAs24K9QABRr3Jq93Q6GvVS4D6BxpM0sIHv/IM7+RU0cudyL gJjslqo1h0djCvZgEH3cPiOz4FUAoYmCvysUqU803T8E1F2sIEEWt9SdId64ced1dTua MFnRq2hT3AWkwlSiH1be7HJkUmV1JyD8ZqIudnYF+rggNqqkFljY65Xs/8IuV5sThrsd IXeg== X-Gm-Message-State: AOJu0YyNXV25TOQKg0pe4sUctFlIaOeDANfOZ9hyCdRdYuVlIyWNB71C hGypyEcUcCsQ798il4Gd2iIR6Tyf8DcxM9694uNRcTkCA6ZzBdZ84ck6gA== X-Google-Smtp-Source: AGHT+IGM+1getgyCJuyxknLF0CagZENfApD21p3bQLKxo6Dcq8UEKKI/fjv1ZY+BJtX6v+HmI2Zn/g== X-Received: by 2002:ac8:5ac5:0:b0:446:60ba:610a with SMTP id d75a77b69052e-447fa8afaa6mr49331531cf.9.1720579344254; Tue, 09 Jul 2024 19:42:24 -0700 (PDT) Received: from hurd (dsl-205-236-230-124.b2b2c.ca. [205.236.230.124]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-447f9bf2292sm16313971cf.81.2024.07.09.19.42.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 19:42:23 -0700 (PDT) From: Maxim Cournoyer To: "Artyom V. Poptsov" Subject: Re: [bug#70880] [PATCH v2 8/8] gnu: prusa-slicer: Update to 2.7.4. In-Reply-To: <6ad909cee24b19c9d2e834ddbe1de8f7d8b76979.1719853592.git.poptsov.artyom@gmail.com> (Artyom V. Poptsov's message of "Mon, 1 Jul 2024 20:07:10 +0300") References: <6ad909cee24b19c9d2e834ddbe1de8f7d8b76979.1719853592.git.poptsov.artyom@gmail.com> Date: Tue, 09 Jul 2024 22:42:22 -0400 Message-ID: <87o776ufw1.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, "Artyom V. Poptsov" writes: > * gnu/packages/engineering.scm (prusa-slicer): Update to 2.7.4. [source]: > Remove "prusa-slicer-boost-fixes.patch" and Nitpick: no need for hanging indent :-) > "prusa-slicer-with-cereal-1.3.1.patch". Move some part of the snippet code > to custom build phases. > [arguments]: In configure flags add paths to external libraries. > Add "fix-include-paths" phase. Suggestion: I'd use either directly [configure-flags] or [arguments] to make description of change more terse. > [native-inputs]: Add "catch2". > [inputs]: Use "prusa-wxwidgets" instead of "wxwidgets" to fix segfaults. > Ad "qhull", "nanosvg", "heatshrink" and "prusa-libbgcode". Nitpick: variable names are not typically quoted in the ChangeLog. > * gnu/packages/patches/prusa-slicer-boost-fixes.patch, > gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch: Remove unused > patches. > * gnu/local.mk (dist_patch_DATA): De-register "prusa-slicer-boost-fixes.patch" > and "prusa-slicer-with-cereal-1.3.1.patch". > > Change-Id: I15e85d63c9ad6c731c8040ef2d8ec8b2f31f2ab7 > --- > gnu/local.mk | 2 - > gnu/packages/engineering.scm | 53 ++++++---- > .../patches/prusa-slicer-boost-fixes.patch | 97 ------------------- > .../prusa-slicer-with-cereal-1.3.1.patch | 52 ---------- > 4 files changed, 35 insertions(+), 169 deletions(-) > delete mode 100644 gnu/packages/patches/prusa-slicer-boost-fixes.patch > delete mode 100644 gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 29107a618b..d9760557df 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1839,9 +1839,7 @@ dist_patch_DATA = \ > %D%/packages/patches/pokerth-boost.patch \ > %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ > %D%/packages/patches/procps-strtod-test.patch \ > - %D%/packages/patches/prusa-slicer-boost-fixes.patch \ > %D%/packages/patches/prusa-slicer-fix-tests.patch \ > - %D%/packages/patches/prusa-slicer-with-cereal-1.3.1.patch \ > %D%/packages/patches/prusa-wxwidgets-makefile-fix.patch \ > %D%/packages/patches/pthreadpool-system-libraries.patch \ > %D%/packages/patches/python-3.12-fix-tests.patch \ > diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm > index de4b4a5825..2a3671b01d 100644 > --- a/gnu/packages/engineering.scm > +++ b/gnu/packages/engineering.scm > @@ -3802,7 +3802,7 @@ (define-public prusa-libbgcode > (define-public prusa-slicer > (package > (name "prusa-slicer") > - (version "2.5.2") > + (version "2.7.4") > (source > (origin > (method git-fetch) > @@ -3811,13 +3811,11 @@ (define-public prusa-slicer > (url "https://github.com/prusa3d/PrusaSlicer") > (commit (string-append "version_" version)))) > (file-name (git-file-name name version)) > - (sha256 (base32 "02qcrw3fa0d8ldbp73hp14l1qxbp3f4608j4csc07ny00ra42151")) > - (patches (search-patches "prusa-slicer-boost-fixes.patch" > - "prusa-slicer-fix-tests.patch" > - "prusa-slicer-with-cereal-1.3.1.patch")) > + (sha256 (base32 "0s1cfvhfilyv0y98asr61c6rwlgyr1hf5v5hg8q9zwmzm2bkcql3")) > + (patches (search-patches "prusa-slicer-fix-tests.patch")) > (modules '((guix build utils))) > (snippet > - '(begin > + `(begin > ;; Prusa slicer bundles a lot of dependencies in src/ directory. > ;; Most of them contain prusa-specific modifications (e.g. avrdude), > ;; but others do not. Here we replace the latter with Guix packages. > @@ -3825,10 +3823,12 @@ (define-public prusa-slicer > (delete-file-recursively "src/hidapi") > (delete-file-recursively "src/eigen") > (delete-file-recursively "src/libigl/igl") > + (substitute* "CMakeLists.txt" > + (("add_library\\(libexpat INTERFACE\\)") > + "")) > + (substitute* "src/libigl/CMakeLists.txt" > + (("target_link_libraries\\(libigl INTERFACE igl::core\\)") "")) > (substitute* "src/CMakeLists.txt" > - (("add_subdirectory\\(libigl\\)" all) > - (string-append > - all "\ninclude_directories(libigl INTERFACE libigl::core)")) > (("add_subdirectory\\(hidapi\\)") > "pkg_check_modules(HIDAPI REQUIRED hidapi-hidraw)") > (("include_directories\\(hidapi/include\\)") > @@ -3841,13 +3841,26 @@ (define-public prusa-slicer > (("\\bhidapi\\b") "${HIDAPI_LIBRARIES}")))))) > (build-system cmake-build-system) > (arguments > - `(#:configure-flags > - '("-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard. > - "-DSLIC3R_GTK=3" ;; Use GTK+ > - ;; Use wxWidgets 3.0.x.x to prevent GUI crashes when adding support enforcers. > - "-DSLIC3R_WX_STABLE=1"))) > + (list #:configure-flags > + #~(list "-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard. > + "-DSLIC3R_GTK=3" ;; Use GTK+ > + ;; Use wxWidgets 3.0.x.x to prevent GUI crashes when adding support enforcers. > + "-DSLIC3R_WX_STABLE=1" > + (format #f "-Dlibigl_DIR=~a" > + (search-input-directory %build-inputs > + "lib/cmake/igl/")) > + (format #f "-DCatch2_DIR=~a" > + (search-input-directory %build-inputs > + "lib/cmake/Catch2/"))) > + #:phases > + #~(modify-phases %standard-phases > + (add-after 'unpack 'fix-include-paths > + (lambda _ > + (substitute* "tests/libslic3r/test_quadric_edge_collapse.cpp" > + (("#include ") > + "#include "))))))) > (native-inputs > - (list pkg-config)) > + (list pkg-config catch2)) > (inputs > (list boost > cereal > @@ -3873,9 +3886,13 @@ (define-public prusa-slicer > pango > tbb > eudev > - ;; prusa-slicer 2.5 segfaults on startup with wxwidgets 3.2 > - ;; See https://github.com/prusa3d/PrusaSlicer/issues/8299 > - wxwidgets-3.0 > + qhull > + nanosvg > + heatshrink > + ;; XXX: Using Prusa wxWidgets fork as PrusaSlicer segfaults when compiled > + ;; with regular wxwidgets. > + prusa-wxwidgets > + prusa-libbgcode Please sort inputs alphabetically. The rest LGTM. Could you please resubmit a v3 with the small things I've spotted in my reading of v2? Sorry for missing some of these things in v1. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 05:32:01 2024 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 09:32:01 +0000 Received: from localhost ([127.0.0.1]:55110 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSZ6m-0000NH-Io for submit@debbugs.gnu.org; Sat, 13 Jul 2024 05:32:00 -0400 Received: from mail-lf1-f51.google.com ([209.85.167.51]:60536) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSZ6j-0000N2-E7 for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 05:31:58 -0400 Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-52e9f788e7bso3255175e87.0 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 02:31:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720863050; x=1721467850; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=2pcgyGlKn21FBPcaYqHvPUxUqhoK3qNB/E5ND1Wl45M=; b=ZFq9fIgfRk+TqBvi8n2OCXINbStUcqxor6uroVCM0vXNjpWcHb1srgaN6/LYqujBo2 4vtKtPmD5kPkMNwMfhDKBQrDM5/Pf/Nzl8nxKT3YkLiKI4RRJJzLNipRd+YGcZJjFXah d2liCgmTav/wTRILnXZWPPWxg7J40mmhMIL+mx2h9Hysl3u3WuNgdVr/Qnmqz1bLY5xk zYqoCMGmTKmu0f9Q+zCX1YnFXo8pTGB4HqM2RZwYdYAL6Q1LqN9wlLauh8/4kW88LqiJ lkTMo60XonvRqe94bXdmIzvuamq3q5ppPXTXfD6441HVS4mKZUjIlWj1wcrt3FyKUYX/ V1ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720863050; x=1721467850; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=2pcgyGlKn21FBPcaYqHvPUxUqhoK3qNB/E5ND1Wl45M=; b=GcFsoMjB4hKO4NUuCkCpYUtqIRBruOdZ9dDhfcgPyQFDpnBbxg9OeLuwLN6uN/zTyu Hyh0sbuunnYzV5FSkT8P2Wzmyt9O+WRsy/J1lvIItJwLIwd/7oXL+BeSLB2OKl94i7Kc 9Zp+UZr87BndUJWmNwLQoAD1dfysm9PRipmh1Aj/QkZk01c0Pp0aSqC5HhMTwUlG1VEY Q9ESw15l5nsagXVCjLCBMBnG/sQXKQHYrFrf0Po56WdUb9on03cswiL69Cu55go66hbZ /C4E1BHSb5eiotqLSEGGSEao7PeyYanMui2d8fGYtHiJYMa2dYhz8m9cLFTSA1jf0MYZ 5yFA== X-Gm-Message-State: AOJu0YwuVp+E8Euo7O3/NmCA0p9ZZnYJ8rfTKr/SLsP+z/AeoBK/AO9a e5ngQ94Y80lTjwbAiiy/+/VsbxxicPTNfPeZAucs7RZ60V2XHDdDwmdDVw== X-Google-Smtp-Source: AGHT+IFx402CE4qqMUvexIW2OaRY7znGhy8o1bbAMHnT1KnSM9ORfUWSM4lDnvfBJeaxzsb5GaKq6A== X-Received: by 2002:a05:6512:4011:b0:52e:9d28:c288 with SMTP id 2adb3069b0e04-52eb9991705mr10256474e87.24.1720863049486; Sat, 13 Jul 2024 02:30:49 -0700 (PDT) Received: from elephant ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52ed25398d2sm125126e87.287.2024.07.13.02.30.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 02:30:48 -0700 (PDT) From: "Artyom V. Poptsov" To: Maxim Cournoyer Subject: Re: [bug#70880] [PATCH v2 4/8] gnu: libigl: Update to 2.4.0. In-Reply-To: <875xtevvgl.fsf@gmail.com> (Maxim Cournoyer's message of "Tue, 09 Jul 2024 22:20:42 -0400") References: <09e99660acf1973e62ba21b25e5d3e2cceaa5921.1719853592.git.poptsov.artyom@gmail.com> <875xtevvgl.fsf@gmail.com> Date: Sat, 13 Jul 2024 12:30:37 +0300 Message-ID: <877cdpabb6.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hello! > Nitpick: no need for hanging indents in GNU ChangeLog messages. Okay, fixed that. > You'll want to break these long lines; we aim to limit line width below > 80 columns. 'guix lint' should complain. Done. > All these FetchContent substitutions could perhaps be unnecessary if > they were referring to the right package name and with the use of the > -DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=3DALWAYS configure flag, which forces > CMake to look at the packages from the system and fail if they aren't > found instead of fetching their source and building them. Unfortunately it seems that it does not work. I checked it and cmake wasn't able to to find libraries. I'd prefer keep this as it is. Maybe I'll figure out how to do it in a more effective way later. > The rest LGTM, although it'd be nice to modernize the definition to use > gexps and remove the input labels. Not sure how to properly handle things like this without input labels: =2D-8<---------------cut here---------------start------------->8--- ("libigl-test-data" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/libigl/libigl-tests-data") (commit "19cedf96d70702d8b3a83eb27934780c542356fe"))) (file-name (git-file-name "libigl-test-data" version)) (sha256 (base32 "1wxglrxw74xw4a4jmmjpm8719f3mnlbxbwygjb4ddfixxxyya4i2")= ))) =2D-8<---------------cut here---------------end--------------->8--- I'd prefer to keep input labels for now as it is more stylistic change and does not affect the build. =2D avp =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJNBAEBCgA3FiEEAf2F9Bp7f4IFgwalk16+BzbchX4FAmaSSUMZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRCTXr4HNtyFfnpIEACAp8RA3R442ChLliuMDk8x kb6bs56wvtJzcRyIEgA/Fj3mUuVHIehWxugxn72w1DYmbPQDH6EqTjzFyaJR8BMi b/Vp7CcCJzMglZ5DvavucaSCDLFXyvgC2is/R9YOv2b5GcskK0en+m0tL7dctD7v +RSnQvgjFw/rL0eiXpAYwAgNPrCKs01tJSI1LFw3VwvTgYY6cfZuV3MikytBZ5vn xMetIRZG29wP3gSy1nUf6T2FZMn0S4+/za17DiDBExzcENmZYy8u1WMDC6+HFH7A p5SbROg6HB0le3LQ9hhbaLlShh95dhbYxPiw1Nkz1h5QUP8BktS54I9rGHibycWq 06GrxsIeInClxaOGgzFNYVw0Q0y2PoZJFqO9X1GWfvoJLSiQXYqxtHxHLU9wep/o 1VUB/kFL7bRSMPejt5Qdkbyy1CnaDrTDQob6qSSApfVWgcKsp4Q+6v3uJizCqYUB goRTsrEDMFc6GfXwTAtMcz1nl3sN0zExkAdWJzd3n6gn984bWzOKMKhmVzBKABtf DUTM2xy2GrLNDrb/QRLGlj/b0nQbN75OfZ4DCuGTzBoI5telsaexiRCLOvz6CWbX 5GKl2WtYagLFE0qFw38ibzhCxVBhlMxJMM9ur3A5A4nEVsmIDr/mcXWYf0lIVD/n UXcammV90CoxMRbOWDskTA== =If/4 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 05:36:19 2024 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 09:36:19 +0000 Received: from localhost ([127.0.0.1]:55114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSZAx-0000TR-BO for submit@debbugs.gnu.org; Sat, 13 Jul 2024 05:36:19 -0400 Received: from mail-lj1-f172.google.com ([209.85.208.172]:42070) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSZAv-0000TJ-DN for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 05:36:18 -0400 Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2ebe3fb5d4dso27585821fa.0 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 02:36:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720863315; x=1721468115; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=dAdZw6sF42SB/Cq/N+yEMGRzvtxVfIVOz/VKFL+QF+U=; b=Qg6wDnhbvFdFmzum19BPp0yOz0J4n333v2s9FTWhTO2mlkYxiSRiXqk7GX8QBKn6HL rXBXklZlfKZIT0/hyBZMvxQDskVTOB7kYPmp+e3OToWExZPCsz73hVf6vTypv9Yd0byG MQbKs0C7rk2El5sT5RhfFCZulaJRcluTXcY3LkqnUs3wh/BFimEH6M/rl1pQlZX8ITHj tsn2JVUzcX10SRKM2IR/jS5VRj7QLPaaP5CJF2zp4INky6wpp+kL1Kmhv8gdUVTTOs1g E4bBA0kT5drnf3z/G/txHRv8UsXn7fdAwNk3O1I1vG/OVRFEOMHgvgyU/6WdHdT5drXa 3UDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720863315; x=1721468115; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=dAdZw6sF42SB/Cq/N+yEMGRzvtxVfIVOz/VKFL+QF+U=; b=jK2JFsaP3mGv8pkCA0rAk1kyKh8FP04epxkbUhlGCoxCbxw/TzeuYL7G471Mykl12C ejuljcIZnlzX6yIbUMSlHG8lyFlY79lMIuZxrw8EGFsPw4DH7Fqa3o66cVPDWLNy8nGD XKShAF/x7B+nCPHJAu8YOBkbjgCTsHL1g1Fiy1JjeCFxFmaJNv9jxOrFqifXDQyqDRTs pEvjKT6RIiIy0jaEFXb9Dt8HAbG9DntRnhhkajSAPXUwWniBAnAJIpkly3Io5CpGP6df by2QHjzLCKUlizmmq7Q1n6KUeEB7PzCjpwjPrV6vu56GUJRvab+FFc/3hmiQwfud4jbu e5wQ== X-Gm-Message-State: AOJu0Yw6pqqT7mVoLXloaNr9pw+KPaqxoJ+gt+iap2ianWYlV6QjJKWA nltyyVnb/uO7UUo3YyTqHeelpdzQIq4RxG6sfVRQIQcC/+IlUMyrUCJ8ew== X-Google-Smtp-Source: AGHT+IGRrSR7nJu778vviD44Of4UbdMM/PrIuKOSP99xe11ffBfHVc7YaN5lpe5b1FdbfZURhoT9Cg== X-Received: by 2002:a2e:9dda:0:b0:2ec:4ee2:22cf with SMTP id 38308e7fff4ca-2eed29c74f6mr14015091fa.8.1720863314650; Sat, 13 Jul 2024 02:35:14 -0700 (PDT) Received: from elephant ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee1914b06sm1350511fa.80.2024.07.13.02.35.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 02:35:14 -0700 (PDT) From: "Artyom V. Poptsov" To: Maxim Cournoyer Subject: Re: [bug#70880] [PATCH v2 5/8] gnu: Add heatshrink. In-Reply-To: <871q42vval.fsf@gmail.com> (Maxim Cournoyer's message of "Tue, 09 Jul 2024 22:24:18 -0400") References: <871q42vval.fsf@gmail.com> Date: Sat, 13 Jul 2024 12:35:09 +0300 Message-ID: <8734odab3m.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable > Not a hard requirement, but there's some loose convention used in Guix > for referencing URLs: Fixed. =2D avp =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJNBAEBCgA3FiEEAf2F9Bp7f4IFgwalk16+BzbchX4FAmaSSlAZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRCTXr4HNtyFfpDrD/9JKhlBi5A+ywUiMgMg4DbA Jjr2lBxZyUfLmWVGkp+HcXLTtdXBmPckrZR7rsfvTPYYeRSrQZFh3WHLpu17qouJ X7S+6mHdoLCGh1iXh9zxPfrbvHooyDZ4mtags3rLCWGTgJieb8cxm7VW/h2P1SdZ fnFYvjfir7SYHssSxp2eShmrSo9w0ZfstZF8s/wRnk3tJuyXXqkR+2mfGA+rquuy Pd/h5qTSHXxE9jTsq68hWOwH8AO0vyYbm69Ea5h+OViAuIf/UBxk8Vl4X7JfkjQE ExepNNuEm67S7XMJDXhUjw1go2kYEggH1H60AbnsMuZuiJR6laOdHOn9EFkIAAKh kPHwIQ/uSsvJzpM/Ot5XQ2PyNpTcUImp1z+bbcZM7ba6LBmsn1ldnDPY9XDfEKaW ZUzcLwOKGj0UT1StVNgRPEEO053kkbKK82aX+cprCDpdMtWc4kzyUiTNVCTHBTNB COLvEN1ceaeFm2YvJMfGz68hcCfn9zLCUrkf2czb3kYWsE90KvyXLjlQqZR52VQl Z08AEOE4lgiTUNyeoBLSiNP9oP+BTZcUSDRsQGB36GdcsUzgDi4KjmePnm3KWiOC rU5Jvzq6jFe48ZfsVKqnCS4NF4MMs59UKIylJ0Qs3JqMrlEWjz3J925KtQxqXoa0 h+HYob2KYooEHfP/m2uofA== =bVoJ -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 05:42:58 2024 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 09:42:58 +0000 Received: from localhost ([127.0.0.1]:55118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSZHO-0000dS-9p for submit@debbugs.gnu.org; Sat, 13 Jul 2024 05:42:58 -0400 Received: from mail-lf1-f51.google.com ([209.85.167.51]:55521) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSZHM-0000dI-78 for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 05:42:57 -0400 Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-52e99060b41so2918143e87.2 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 02:42:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720863714; x=1721468514; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=uLKUzQwVsevPF1QQA1NzjGnus/kvC4aZvxzgti8nxEA=; b=gnL5roX7dkETz8d3PACtlPkIPjgWODotU2VYOMfcQmRHPOuDdhQX+AVyNYNZ4OkvnR cnpxQvGaeFx4AEHZqEMHAEImB+6eFsSCfEsIp1zTdjU7h4Hu7bjyrJwR7nwGnngflMAw JW/UV/BD/GBGKs0Bt9nXDZRSRpRmglQjJz4Izzx8X4fJnMr1GjkPZdMNzhiBvVDLGVCg lQpO78GDzn78WIbgn06ktFSYQqIrWszFgkKE+jGLWwaiMDHnRxyPmCqlJoJp5mSny2WE v108LzKfwrTegiKdGC1s5uW8l77QQsQHYkokKo2XUc1gpqROnmZwRTHMr1F+ObKgBiEA Y1Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720863714; x=1721468514; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=uLKUzQwVsevPF1QQA1NzjGnus/kvC4aZvxzgti8nxEA=; b=OCLubpne5IPrM0T3ysYJXcH3I4+3HH+iIY6lnHKgXRV5jKaJlDl9IEo3bCaPJ8dvsk RWR45Suvv0pA92v3+d2i+5QMhA1rv0Mj5lCW7gkos+eE3TnKykfpAR1uOcPVdr1kQhy8 zGw50cx7bu5YSRH2RgvcfyEAkdoHKKlr69FhzBNEwWth2Muff+PR/VJjQrgg7+2Xs70T lG5YDFWsRcjCmLG4nq0R0uR/SWwCQwGbr7HjxGZuIgp5t+zOaKfSg8B4WILHe0rAXxVT vu6dkzcaQjHQBXHhFvLs0gxagKkwYwB127Dx37EM9xvtshX1WobKG23Ui04ibTGzILP1 G+1w== X-Gm-Message-State: AOJu0YytK4T2IhhjP1LFtD9LXZqqdo+xfR6hX/6hUX9LSO7B3xQMgDGe 6Awx9zp1IyE5MsbLtn4SVVLQz9Wo4ZmBJJOXCbB6wWuJDJnJwatjrvJv7Q== X-Google-Smtp-Source: AGHT+IEmtVEwb33N4XAb1/LoryRiBF3hn6Gz7pEUaKqThDqssHaYi7Ei8fYEEa5e92IO1mrfJ7jWbg== X-Received: by 2002:a05:6512:3b2c:b0:52e:933c:5a18 with SMTP id 2adb3069b0e04-52eb99d4e3amr9998958e87.56.1720863713577; Sat, 13 Jul 2024 02:41:53 -0700 (PDT) Received: from elephant ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52ed2532037sm129813e87.199.2024.07.13.02.41.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 02:41:53 -0700 (PDT) From: "Artyom V. Poptsov" To: Maxim Cournoyer Subject: Re: [bug#70880] [PATCH v2 6/8] gnu: Add prusa-libbgcode. In-Reply-To: <87wmluugfy.fsf@gmail.com> (Maxim Cournoyer's message of "Tue, 09 Jul 2024 22:30:25 -0400") References: <2cdedc4189efac291f16e099b91605a8f8f4aca9.1719853592.git.poptsov.artyom@gmail.com> <87wmluugfy.fsf@gmail.com> Date: Sat, 13 Jul 2024 12:41:48 +0300 Message-ID: <87y1658w83.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable > Sorry for missing that in my first review: there should be an > explanatory comment here mentioning which commit to use and why (e.g.: > "Use the latest commit since there are no proper releases nor tags.") > [...] > Nitpick: when there are few inputs (< 5), it's OK to list them inline if > it fits the 80 columns rule, like: > > (propagated-inputs (list zlib boost heatshrink)) > > I think this is what 'guix style' would do. > [...] > It looks like this package does not provide the Python bindings, so it > may be best to drop that part of the last sentence mentioning their > existence, as it would be misleading for Guix users. Fixed. =2D avp =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJNBAEBCgA3FiEEAf2F9Bp7f4IFgwalk16+BzbchX4FAmaSS98ZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRCTXr4HNtyFftJwEACseVAIbiqc02V+z6ABhsuw OimvHyeHAPdmmOHw250ZuLLcFHYItWSH9SjMryt4JT04hsr+xLn0lTPBikBoDET9 PfE/OK6WUGH0PUqAFaBt/C85i3ghslA3uB9Ej10yYqWQtIsQu9PG8o+d1ukwqHan TxVcpkkIhPpEEfgIbV7jxhKEjWvmoyE9upSNieLyazO6MZKYC/5v3A4eVkwcFSgU pm+mRuo9IyiEywfSfvobcIILKpqo+b/HHSJS5nl1u7eBcBnz1nEZk9Sz6Z7Bs/rg 3xJxb+1lek6Mldrrk+/D1tnhjboTGRtO5KUDT2+jE3/zf9aBOHyFSmC6LfNZHX9i +JuBWv/UlP2WQOsv0FH397Ab9fw8R0lFVc6ritsSnHI4UrgI/oObX9+j9lAazx1U ZJ4hAxWEX9F0LDzCNHhprzXQcOnm4u2c3aTY0QPlWWy8Ty/B4v8x+B6wnFRSUclg kuUL7eaSrbcxPWXK+vjNTmlfALxZlzzGDzbukkRNXKpOOEGK2inS+sbngdFczzoj mVAsdIdmSx+sDRLHMcOCxoCJYTjhXODaXiJ9QWuZurS+izAkewmE7cbACpyAfouo B1cQK1ksCqNI0GVDulKBg5mX3KIPKFOpkaU3ycOdVRU2uZI52g2qn7bc3ik9byFF WKDpmJaIeXkR1gi+WWfTWg== =JnqM -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 07:14:28 2024 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 11:14:28 +0000 Received: from localhost ([127.0.0.1]:55200 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSahv-0002uq-VU for submit@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:28 -0400 Received: from mail-lj1-f172.google.com ([209.85.208.172]:46545) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSaht-0002ud-UG for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:27 -0400 Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2eede876fbfso8576011fa.1 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 04:14:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720869204; x=1721474004; 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=RidZDTQt1hC7kbjdpGutjkWYGItaC0wG5f3PvB4n/Ds=; b=UHPzRxP9mMXL5eHDNJ8/pfWKY+EyZNykMHRHYWQLOmGphcB1QZpYqSZ5uYY55yhyiq tORcHKM5u10zaB3QVwsVQ8ZY9+bjJicOg7QoDcfI8vp9sDeVopgXAjmeCpjvRmK3eo/x zsFbsWQpGwIghf4TYLv3ns9x9/XAZR5L10CFrvoISvzpIkGFVmLRqLy6xrlASFGp1Cj3 Jz+f7E9TlEmDi1h5zfeb1bXn2eQOoyXdxv/OxUZpSb9PpvROVS0bvs+jZQydB2u8sdQf fUJvqIgNc91KVB6gpZDPx2JVMa/d1wWXt6kd6nGEZT+BlkC41T5MQR07IKIXlGV/1fqb Zc9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720869204; x=1721474004; 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=RidZDTQt1hC7kbjdpGutjkWYGItaC0wG5f3PvB4n/Ds=; b=TDJjGsh7zQl6NR1WD32zVWkfjtUp89aLP1aEqaihfo8lr81IZtnBqdkhM8TDeCpeSL W5moobubI0rBkDm/+k/Diuhs8fXCAhGFK6w5h3sT8CHpnTh0vzwZOX9bNWmIh6O+0kpK goI+6A/5jLJUtu44NftBVFgtxAQc4tU2vud8jtn39BxV+18EiPw5mzRSiCfBv0aqHa5g fV8B69exAq7dSsvgUPaiJZ/+UsnPRYf2ZAZ9Aj3GfsBdp6Lgqxuu8j6iGe/bLhJnUOFZ he70COz/Ad5NgKCqzJ3SnT/o/7RHARfGbAAexS2gzHuqVYp8enGzdReJ1zANmQKy9K4E HFyw== X-Gm-Message-State: AOJu0YzfKyr8N7XKZOWTuyAXxK+UN3sa0fmNoys36WUkcVX+BxwBDzmV NVQmDnW2qZESgUCRWYuUjp9NEZx0gR4qylENekNLgcndwly9JHhsa36t6w== X-Google-Smtp-Source: AGHT+IFDVy9qPf1DtuHSbLtxVgkWlFbK3tWS3+QChXE/FqbbQ6zC32b753/v119zQZ0nCh2QruErOA== X-Received: by 2002:a2e:a582:0:b0:2ee:8b92:952f with SMTP id 38308e7fff4ca-2eeb304ea94mr125857761fa.0.1720869203119; Sat, 13 Jul 2024 04:13:23 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee179e797sm1781541fa.21.2024.07.13.04.13.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 04:13:22 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH v3 1/8] gnu: cgal: Update to 5.6.1. Date: Sat, 13 Jul 2024 14:13:10 +0300 Message-ID: <97d7c9dbc9e6b917a926a3c22c48ae7bd2318616.1720869087.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/graphics.scm (cgal): Update to 5.6.1. Change-Id: Id909fc7be5d421496e6a3cd87d366f437f76bcfa --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index d85ac8bfa6..eb90713159 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -775,7 +775,7 @@ (define-public openshadinglanguage (define-public cgal (package (name "cgal") - (version "5.2.2") + (version "5.6.1") (source (origin (method url-fetch) (uri (string-append @@ -783,7 +783,7 @@ (define-public cgal "/CGAL-" version ".tar.xz")) (sha256 (base32 - "0yjzq12ivizp23y7zqm30x20psv9gzwbcdrhyd3f7h0ds94m1c40")))) + "0dsqvnyd2ic50pr28gfz34bpnyx3i2csf1rikmc661hywdz5xcfd")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 07:14:35 2024 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 11:14:35 +0000 Received: from localhost ([127.0.0.1]:55206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai2-0002vU-85 for submit@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:34 -0400 Received: from mail-lj1-f173.google.com ([209.85.208.173]:57711) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSahz-0002ue-HD for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:33 -0400 Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2ebe40673d8so37920061fa.3 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 04:14:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720869204; x=1721474004; 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=nFgjmxOZb/xzWS8aygv1VObJd+lGV1N0fSe28oOkwaw=; b=Tv9n91uqGwRQjoMaJk8fQpM7PCXktCGYfB+7w1XbLhPzffHkJxbJIwK8DOELhXRDMb TzSBJ1gVXTqQQYlvYmczX72xZNAJ/BFnR4j2ALj37Wsn5luC9wwR4nE81nMpvM2kasmo qwiZ9NDPZYBnNyZYBN0luDX0VySZX8Jyz8RPBISP9CoZIw+E3xzx0q7r2QuWoK2AJhma iFZYYX122jWxj042Wk1wCksOrJNTSB77/bUhd+2VO80vAnxDn0ztY41oYpbmmyN9BcYz tRXUEeQRy3DH2HUb0rXD2n78OnV8E/CTK8veMEu3r+xCkIso7NOtqRkYroculiN7D8Z1 dUPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720869204; x=1721474004; 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=nFgjmxOZb/xzWS8aygv1VObJd+lGV1N0fSe28oOkwaw=; b=xQLNLYXZsS/I53NN1G+4L69uxTiIVs3Oir8dRuPUsskf5NLv6QKI73RfW6jOd8483T eAObrl/l9tLIHET2jbQtvVnQUXTtAqXkO5khVfSA3Cgpxwkidb7FUZBIuXFqRwCErjan WMfrUxIlQtVX9Ja4D2MrKw6NMS9kfLgXarP55/6VjHXLT4v1kje3S+Q95LwMnXSuw305 fjWBpeDqjBHzRbjI/MDf+O5SJSbLz1U8rU2QqgszYQQWnwqSnmT9BEMGbLgqiz5Xgzox c8mdSHjh/nilV5QkOxl/AF3kHyMXDBwm8wJJmfLkDW6mjFC+hx56eaYd3QPQ9JoEW5By Mxow== X-Gm-Message-State: AOJu0YwvbSSwDu795Wr0IuCkUX/WFfIzouGjHf2cV2lM6HuKQSKvYmZ1 0+EFI66Ls1ArdqNNlA+LGsvTr/hgYQ89C0wGISliTdvM7nFFTij5kbwAjg== X-Google-Smtp-Source: AGHT+IFzm9EITq9mvdNSs5lQZuECzwqqW8lLUp/32VF/gjz7MHaY2r98E+zRBscMXAQb5ZMf8dChiQ== X-Received: by 2002:a2e:7d0e:0:b0:2ee:7e62:8886 with SMTP id 38308e7fff4ca-2eeb30bbf6dmr81811871fa.4.1720869204042; Sat, 13 Jul 2024 04:13:24 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee179e797sm1781541fa.21.2024.07.13.04.13.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 04:13:23 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH v3 2/8] gnu: glfw: Update to 3.3.10. Date: Sat, 13 Jul 2024 14:13:11 +0300 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gl.scm (glfw): Update to 3.3.10. Change-Id: I9d789fb74af4ed649102195891adc5e437883d30 --- gnu/packages/gl.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 2100bb4872..f40ddaeb86 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2023 Kaelyn Takata ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Liliana Marie Prikler +;;; Copyright © 2024 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -924,7 +925,7 @@ (define-public soil (define-public glfw (package (name "glfw") - (version "3.3.9") + (version "3.3.10") (source (origin (method url-fetch) (uri (string-append "https://github.com/glfw/glfw" @@ -932,7 +933,7 @@ (define-public glfw "/glfw-" version ".zip")) (sha256 (base32 - "023dn97n4h14n5lbjpzjv0y6a2plj254c0w3rr3wraf3z08189jm")))) + "1f5xs4cj1y5wk1jimv1mylk6n6vh7433js28mfd1kf7p2zw3whz8")))) (build-system cmake-build-system) (arguments (list -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 07:14:35 2024 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 11:14:36 +0000 Received: from localhost ([127.0.0.1]:55208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai2-0002vY-Vv for submit@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:35 -0400 Received: from mail-lj1-f174.google.com ([209.85.208.174]:59763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSahz-0002v4-Pk for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:33 -0400 Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2eedeca1c79so7430881fa.3 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 04:14:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720869210; x=1721474010; 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=ljk9zBP+YaaK+wl51WyCNh/28pIaVJSM299q8askKgA=; b=SROEGmVnD7rEup48JYBaMmFCaUzq1YaicVOhQ69f9wE2xxm3akd0rPx6DzmGmioU9M 5v4OCKcL5JUxj1epR2xvQdaVnqUJanc/q9SCUh34DJ6RvUExdwjryIGaghKUSWpxBhaG m2dzXJ/NcCOlyx5gO+1GtXVUfOfKI7y25V3rXTB75yMRWEVeKoYIrtpb9xZO+uRV9Xj8 +O8FL5XJSnM3Y0H71PBLqZSV2JdToVtjPCxvpCr9iy+l+QErPSQOptDqiixdbuymUXjQ ECecjK330LXAqO6utaAOWnPHzfAtmwyKK5CgGgMVNxZmkMM6FMIbLpv8+P0hEiyauOJO Dneg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720869210; x=1721474010; 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=ljk9zBP+YaaK+wl51WyCNh/28pIaVJSM299q8askKgA=; b=PqUcQHsZfQIf58YMhdSIIxOoKkt7meafbtgh6P3KSolVbtIVltl7z6DrS0nvJytfb1 xBPz8P1aSQXqSgJ/WdAYbVY/uzSUeOmJzDvX0zKqW4Yxx2CcBBc+4hrEc5T9Cb6x1fW8 l2xex/o6MCvlQUaYZ7cidReiWUi0yE8lAz/TEApdrwoN96sVHEC5VzdABkCzaEJmfj1a j46wwLRwRpAUumUyKzn11ue3fH9MFJowOqXJWBwlf91a7DR87HD7L4M+HD4E1+AjfYgn /tYv/k7JIshdxbwQUD7rQOEz3UrbI+YYBj8ea4oFs2weIOfHMk5gxpniWx+xvXq47msg zQ9A== X-Gm-Message-State: AOJu0YxFzzhTcT7AwpjHm/LxT64KlbwXdWx60twXULuvOl1RbqQgLvL5 ZZVbXlrjvPNQRFb/7aRm8A2MxOuaM8bveuBK/wK98Bhdded/vecFfUASFQ== X-Google-Smtp-Source: AGHT+IHLkZ1IVsndwNMddP+jHEZSgG/N2IGis4cSEZ7SN/bv55T0Aj2j6+KKU8UVhW58exm8LwMRzw== X-Received: by 2002:a2e:300b:0:b0:2ee:d5f5:43e with SMTP id 38308e7fff4ca-2eed5f50f1amr31569481fa.32.1720869207029; Sat, 13 Jul 2024 04:13:27 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee179e797sm1781541fa.21.2024.07.13.04.13.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 04:13:26 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH v3 5/8] gnu: Add heatshrink. Date: Sat, 13 Jul 2024 14:13:14 +0300 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/compression.scm (heatshrink): New variable. * gnu/packages/patches/heatshrink-add-cmake.patch: New file. * gnu/local.mk (dist_patch_DATA): Add "heatshrink-add-cmake.patch". Change-Id: I0beccdcaed22e47ac6bfe522497e0759a315813d --- gnu/local.mk | 1 + gnu/packages/compression.scm | 40 +++++++ .../patches/heatshrink-add-cmake.patch | 111 ++++++++++++++++++ 3 files changed, 152 insertions(+) create mode 100644 gnu/packages/patches/heatshrink-add-cmake.patch diff --git a/gnu/local.mk b/gnu/local.mk index ea4cc251ae..4726e2c128 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1482,6 +1482,7 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-remove-gctp.patch \ %D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ + %D%/packages/patches/heatshrink-add-cmake.patch \ %D%/packages/patches/heimdal-CVE-2022-45142.patch \ %D%/packages/patches/helm-fix-gcc-9-build.patch \ %D%/packages/patches/highlight-gui-data-dir.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index ac025e0e3d..1c9e0a804c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2024 Vinicius Monego ;;; Copyright © 2024 David Elsing +;;; Copyright © 2024 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -574,6 +575,45 @@ (define-public xz (license (list license:gpl2+ license:lgpl2.1+)) ; bits of both (home-page "https://tukaani.org/xz/"))) +(define-public heatshrink + (package + (name "heatshrink") + (version "0.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/atomicobject/heatshrink/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sdhvk27yz8kahw18j8pddbpkgl78v8rh8fx6wspc3acj7w7yvrn")) + ;; Add CMake build script, wanted by prusa-slicer and libbgcode, which are the + ;; only users of this library (see + ;; .) + (patches (search-patches "heatshrink-add-cmake.patch")))) + (build-system cmake-build-system) + (arguments + (list + ;; XXX: No tests available with CMake (see + ;; .) + #:tests? #f)) + (home-page "https://github.com/atomicobject/heatshrink/") + (synopsis "Data compression library for embedded/real-time systems") + (description + "A data compression/decompression library for embedded/real-time systems. + +Among its features are: +@itemize +@item Low memory usage (as low as 50 bytes.) It is useful for some cases with less +than 50 bytes, and useful for many general cases with less than 300 bytes. +@item Incremental, bounded CPU use. It can be used to chew on input data in +arbitrarily tiny bites. This is a useful property in hard real-time environments. +@item Can use either static or dynamic memory allocation. +@end itemize +") + (license license:isc))) + (define-public lhasa (package (name "lhasa") diff --git a/gnu/packages/patches/heatshrink-add-cmake.patch b/gnu/packages/patches/heatshrink-add-cmake.patch new file mode 100644 index 0000000000..f67f87126e --- /dev/null +++ b/gnu/packages/patches/heatshrink-add-cmake.patch @@ -0,0 +1,111 @@ +From 0886e9ca76552b8e325841e2b820b4563e5d5aba Mon Sep 17 00:00:00 2001 +From: tamasmeszaros +Date: Thu, 27 Jul 2023 23:11:25 +0200 +Subject: [PATCH] Add CMake build script + +--- + CMakeLists.txt | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ + Config.cmake.in | 5 +++ + 2 files changed, 87 insertions(+) + create mode 100644 CMakeLists.txt + create mode 100644 Config.cmake.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +new file mode 100644 +index 0000000..5b840eb +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,82 @@ ++cmake_minimum_required(VERSION 3.10) ++ ++project(heatshrink C) ++ ++add_library(${PROJECT_NAME} heatshrink_decoder.c heatshrink_encoder.c) ++add_library(${PROJECT_NAME}_dynalloc heatshrink_decoder.c heatshrink_encoder.c) ++ ++find_library(MATH_LIBRARY m) # Business as usual ++if(MATH_LIBRARY) ++ target_link_libraries(${PROJECT_NAME} PUBLIC ${MATH_LIBRARY}) ++endif() ++ ++target_include_directories(${PROJECT_NAME} PUBLIC $) ++target_include_directories(${PROJECT_NAME}_dynalloc PUBLIC $) ++ ++target_compile_definitions(${PROJECT_NAME} PUBLIC HEATSHRINK_DYNAMIC_ALLOC=0) ++target_compile_definitions(${PROJECT_NAME}_dynalloc PUBLIC HEATSHRINK_DYNAMIC_ALLOC=1) ++ ++if (UNIX) ++ add_executable(${PROJECT_NAME}_cmd heatshrink.c) ++ target_link_libraries(${PROJECT_NAME}_cmd ${PROJECT_NAME}_dynalloc) ++ set_target_properties(${PROJECT_NAME}_cmd PROPERTIES OUTPUT_NAME ${PROJECT_NAME}) ++endif () ++ ++# Installation and export: ++ ++include(CMakePackageConfigHelpers) ++ ++write_basic_package_version_file( ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" ++ VERSION 0.4.1 ++ COMPATIBILITY AnyNewerVersion ++) ++ ++set(_exported_targets ${PROJECT_NAME} ${PROJECT_NAME}_dynalloc) ++if (UNIX) ++ list(APPEND _exported_targets ${PROJECT_NAME}_cmd) ++endif () ++ ++install(TARGETS ${_exported_targets} ++ EXPORT ${PROJECT_NAME}Targets ++) ++ ++export(EXPORT ${PROJECT_NAME}Targets ++ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake" ++ NAMESPACE ${PROJECT_NAME}:: ++) ++ ++include(GNUInstallDirs) ++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) ++ ++configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" ++ INSTALL_DESTINATION ${ConfigPackageLocation} ++) ++ ++install( ++ FILES ++ heatshrink_common.h ++ heatshrink_config.h ++ heatshrink_encoder.h ++ heatshrink_decoder.h ++ DESTINATION ++ include/${PROJECT_NAME} ++ ) ++ ++install(EXPORT ${PROJECT_NAME}Targets ++ FILE ++ ${PROJECT_NAME}Targets.cmake ++ NAMESPACE ++ ${PROJECT_NAME}:: ++ DESTINATION ++ ${ConfigPackageLocation} ++) ++ ++install( ++ FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" ++ DESTINATION ++ ${ConfigPackageLocation} ++) +diff --git a/Config.cmake.in b/Config.cmake.in +new file mode 100644 +index 0000000..0809ba9 +--- /dev/null ++++ b/Config.cmake.in +@@ -0,0 +1,5 @@ ++@PACKAGE_INIT@ ++ ++if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake) ++ include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") ++endif () -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 07:14:36 2024 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 11:14:36 +0000 Received: from localhost ([127.0.0.1]:55210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai3-0002vq-Ro for submit@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:36 -0400 Received: from mail-lj1-f172.google.com ([209.85.208.172]:61858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai0-0002ui-Br for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:33 -0400 Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2eee083c044so6055811fa.3 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 04:14:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720869205; x=1721474005; 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=w13gxZFwPqjTTtAtj1i2hCxMhokK+oIfm/WoqKMCRJk=; b=mt8oG2yr515HcTBD5uLXbrVDVrCPS5BHLKcBiXHYk0L+c6r8Xt1zOUQQV1kIeehige EO4WaWnfzOLffRMOyDAYvI4ksyjYIC+GdH2mm3QcQODBVe3HVnD7CYLV5X6BygZqsMEW A7hHYzeT6nh1LkRi9PUzkumEDv+AQnXRBJHh8HyPavRZt3BnlQuOUaN+v/gyU9GiK+mK Ye5akCR4To8DQ0/agIkWlDPZOFig0BwoZFSjra4pC7eo35vsQ5sa20M78qhY9JgvnHFa haMVV4Gga63QrBmf+hzdO7d1lKHcYzLRuk4jki6tcMIdOFhzd8PKaiNKcNhf+gxxh5tt wt9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720869205; x=1721474005; 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=w13gxZFwPqjTTtAtj1i2hCxMhokK+oIfm/WoqKMCRJk=; b=fYsQQG7IEWqJJxpWsattfaukC7sEFIl9p7yiDlNQTqLN1kxgnIsg2XcRQHkSkEBA/H AU8nI7Y7Aepw7HKqg1p+eNvo4yy/+xqQGtfTpld5NtYYz1LLqGbo7QBw2QeQLHapdyjS pn2rAo8Ja/ROpG1pJEt7R1OuwZhswPtTnOIEfSSOYZc0UVXpKETQHL5LQVUIkj3j84mW szMXpXeGXAmC06UPBjkF7uysfV2yR8GTcrbLPtnPoNGciJq4XyDc2j3cwX5qgBmXQhqB sjBmAsgx8QT8XVDtJG8lyqHnAeZDkO4hPhTT+0NJQT3q9ELix1Y3ibaCxbXHYKt0wPhV GjPA== X-Gm-Message-State: AOJu0YwhF2Nzv3oc/J4OuSx35KTf4lXczPF+8icMX3ZIGVNa1qcz7mZ9 Cw2gBj61lo9xcZjFcipZVbXp4TOzG1NYs1KMBrLCq5fsExQupOg9+mUAbA== X-Google-Smtp-Source: AGHT+IGsaZVXU0tihUFrGkcuu1pBtgwkwB6vP/m+QdY4MgO71adpP/epaX1lAwpYj9zVGqFZdXrbsQ== X-Received: by 2002:a2e:9d06:0:b0:2ec:4acf:97dc with SMTP id 38308e7fff4ca-2eeb30bc9eemr93717961fa.11.1720869204977; Sat, 13 Jul 2024 04:13:24 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee179e797sm1781541fa.21.2024.07.13.04.13.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 04:13:24 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH v3 3/8] gnu: glfw-3.4: New variable. Date: Sat, 13 Jul 2024 14:13:12 +0300 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gl.scm (glfw-3.4): New variable. Change-Id: I77f2214c78f35455436897a3fbff083331295314 --- gnu/packages/gl.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f40ddaeb86..8441f3ae65 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -995,6 +995,21 @@ (define-public glfw and surfaces, receiving input and events.") (license license:zlib))) +(define-public glfw-3.4 + (package + (inherit glfw) + (version "3.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/glfw/glfw" + "/releases/download/" version + "/glfw-" version ".zip")) + (sha256 + (base32 + "1sd396kkn53myp61kxrd18h7b1q4ix173hhxhvl0iz8j4x5h1v5m")))) + (native-inputs (modify-inputs (package-native-inputs glfw) + (prepend pkg-config))))) + (define-public nanovg-for-extempore (let ((version "0.7.1") (revision "0") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 07:14:37 2024 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 11:14:37 +0000 Received: from localhost ([127.0.0.1]:55212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai4-0002vx-68 for submit@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:37 -0400 Received: from mail-lj1-f173.google.com ([209.85.208.173]:56776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai1-0002uw-Gc for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:35 -0400 Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2eee1384e0aso4465921fa.1 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 04:14:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720869207; x=1721474007; 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=o09OH4WSIEGBpIflZzgQf+5DydiiFvH5C+xVQdbMSWg=; b=VwLJqqIHPyatm+SX1ngwrJXf97PPSExSkOnFYvJDbSqq099jnVn8EZnfFS2wX9zs77 TztdcSsn/4MbKac2aFJMNRJaUNd88RuwMllbkKCL5SLmVxrmrKt/HUqPRaVJG3dgyxiR A14EGaPVzVTFpk2o6i1kKzRsZi1RjpzQwBPcpMfEEInwbCBLt2a7YZNOXPIs25Tx75+H M1XNqyfNPdFzbYPPoDmf0o4TRRyy0vE6phSVHzUIVlqLleefuDLoOipipR3WQDxSqiE4 GZ30WYqd0DEoRUhbJaJpGhm0XMXuMZY+WBNIhk6RmHICE5+u2Hagiw/UuHHnYqLZM23W h0FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720869207; x=1721474007; 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=o09OH4WSIEGBpIflZzgQf+5DydiiFvH5C+xVQdbMSWg=; b=KXG70YJMX+mZjqAUV8BQhbz8TeFc1J2qOF3CpB42drToRMWXbrgMXeAt54uHWwj4L6 wlfTvGqqNxb0ftvF9QpNoETNAAibhBU00qjaqo1DFa8jCKu46Ddw+zmDjMQWKt4/K6BT lGgyPqQwAaVz1lioSfj/JHIBZPoTRkMuxYCXd1R0YPF4PrscJKAlr3hbMwZ9ginuEaby 2v2AYvCowABfj/c/9lgm7ZOEe8pcBs7gNmOkb0XqzdnkIBGRJaLtkPdxhqp9y5ROsS0v xNj5Fg9RuriyAO34i4ofNakBNuXnRz2VhGVhdCJhaylO8cQL2f6YgpH1CS/WJtBOqiUC GnTg== X-Gm-Message-State: AOJu0YzwFoBuX2FJPiy+6Oo3BQj8udE3Nnppfx9AuX3YtJFNVGbF5STD Sivnb8ZDRNjdgIolBWB+MN29fjum/s47IZ/3fFHW7KtX//5hZH3a8v1C/g== X-Google-Smtp-Source: AGHT+IEyEFUAsAkO35tKrY7zDmbukzAO+u83lT9WmqflauS276HsIlYJIJlGVjGr2pcvXbe4vss6Ug== X-Received: by 2002:a2e:9e54:0:b0:2ec:6608:a3af with SMTP id 38308e7fff4ca-2eeb3103d02mr87528851fa.31.1720869206018; Sat, 13 Jul 2024 04:13:26 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee179e797sm1781541fa.21.2024.07.13.04.13.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 04:13:25 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH v3 4/8] gnu: libigl: Update to 2.4.0. Date: Sat, 13 Jul 2024 14:13:13 +0300 Message-ID: <5d6dafedfbdcb3eb6a67930d37049eca1d60bf51.1720869087.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (libigl): Update to 2.4.0. [arguments]: Use Gexps. Update configure flags. Disable GLFW tests as they are failing with SEGFAULT errors (see .) Update "unpack-external" phase: add new dependencies. Update "patch-cmake" phase to prevent CMake from trying to download external dependencies. Help CMake to find the package inputs. Add "fix-assertions" and "install-copyleft-modules" phase. [native-inputs]: Add catch2. [inputs]: Use glfw-3.4. Add openblas, imgui and spectra. Add libigl packages and imguizmo. Remove catch2. Change-Id: Ib4ac842dc14fe1cbc6b0b87674bae1f261a1a970 --- gnu/packages/engineering.scm | 287 +++++++++++++++++++++++++---------- 1 file changed, 204 insertions(+), 83 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index cc9020c6fd..5dfb1e1be3 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -33,7 +33,7 @@ ;;; Copyright © 2022 Malte Frank Gerdes ;;; Copyright © 2022 Konstantinos Agiannis ;;; Copyright © 2022 Greg Hogan -;;; Copyright © 2022 Artyom V. Poptsov +;;; Copyright © 2022-2024 Artyom V. Poptsov ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022, 2023 Felix Gruber ;;; Copyright © 2023 Theofilos Pechlivanis @@ -162,6 +162,7 @@ (define-module (gnu packages engineering) #:use-module (gnu packages text-editors) #:use-module (gnu packages time) #:use-module (gnu packages tls) + #:use-module (gnu packages toolkits) #:use-module (gnu packages tree-sitter) #:use-module (gnu packages version-control) #:use-module (gnu packages web) @@ -3511,7 +3512,7 @@ (define-public xfoil (define-public libigl (package (name "libigl") - (version "2.3.0") + (version "2.4.0") (source (origin (method git-fetch) @@ -3521,90 +3522,162 @@ (define-public libigl (file-name (git-file-name name version)) (sha256 (base32 - "004a22ifq2vibgkgvrlyihqimpsfizvq5l448204kwfg3lkycajj")))) + "0qlnpp8nxbahcky4d67dzn0ynbv3v037nbx1akq6h5rzhvkzq40x")))) (build-system cmake-build-system) (arguments - `(#:configure-flags - '("-DLIBIGL_USE_STATIC_LIBRARY=OFF" - "-DLIBIGL_BUILD_TESTS=ON" - "-DLIBIGL_BUILD_TUTORIALS=OFF" - "-DLIBIGL_EXPORT_TARGETS=ON" - ;; The following options disable tests for the corresponding libraries. - ;; The options do not affect whether the libraries are linked to - ;; libigl or not, they are used for tests. - "-DLIBIGL_WITH_COMISO=OFF" - "-DLIBIGL_WITH_CORK=OFF" - "-DLIBIGL_WITH_MATLAB=OFF" - "-DLIBIGL_WITH_MOSEK=OFF" - "-DLIBIGL_WITH_TRIANGLE=OFF" ;; Undefined reference to "triangulate". - "-DLIBIGL_WITH_OPENGL_GLFW_IMGUI=OFF") + (list #:configure-flags + #~(list "-DLIBIGL_USE_STATIC_LIBRARY=OFF" + "-DLIBIGL_BUILD_TESTS=ON" + "-DLIBIGL_BUILD_TUTORIALS=OFF" + "-DLIBIGL_INSTALL=ON" + "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" + (format #f "-DCatch2_DIR=~a/lib/cmake/catch2/" + #$(this-package-input "catch2")) + (format #f "-DSpectra_DIR=~a/share/pectra/cmake/" + #$(this-package-input "spectra")) + ;; The following options disable tests for the corresponding + ;; libraries. The options do not affect whether the libraries are + ;; linked to libigl or not, they are used for tests. + "-DLIBIGL_WITH_COMISO=OFF" + "-DLIBIGL_WITH_CORK=OFF" + "-DLIBIGL_MATLAB=OFF" + "-DLIBIGL_MOSEK=OFF" + ;; XXX: GLFW tests are failing with SEGFAULT. See + ;; + "-DLIBIGL_GLFW_TESTS=OFF") + #:build-type "Release" #:phases - (modify-phases %standard-phases + #~(modify-phases %standard-phases (add-after 'unpack 'unpack-external (lambda _ (setenv "HOME" (getcwd)) ;; cmake needs this to export modules (mkdir "external") - (copy-recursively (assoc-ref %build-inputs "libigl-glad") "external/glad") - (copy-recursively (assoc-ref %build-inputs "libigl-stb") "external/stb") - (copy-recursively (assoc-ref %build-inputs "libigl-tetgen") "external/tetgen") - (copy-recursively (assoc-ref %build-inputs "libigl-predicates") "external/predicates"))) + (copy-recursively (assoc-ref %build-inputs "libigl-glad") + "external/glad") + (copy-recursively (assoc-ref %build-inputs "libigl-test-data") + "external/test-data") + (copy-recursively (assoc-ref %build-inputs "libigl-comiso") + "external/comiso") + (copy-recursively (assoc-ref %build-inputs "libigl-tetgen") + "external/tetgen") + (copy-recursively (assoc-ref %build-inputs "libigl-predicates") + "external/predicates") + (copy-recursively (assoc-ref %build-inputs "imguizmo") + "external/imguizmo") + (copy-recursively (assoc-ref %build-inputs "eigen") + "external/eigen"))) (add-after 'unpack-external 'patch-cmake - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) + (define (source-dir library-name) + (format #f "SOURCE_DIR \"~a\"" + (assoc-ref %build-inputs library-name))) + (define (fix-external-library cmake source) + (substitute* (format #f "cmake/recipes/external/~a.cmake" + cmake) + (("GIT_REPOSITORY.*") (source-dir source)) + (("GIT_TAG.*") ""))) ;; Fix references to external libraries - (substitute* "cmake/libigl.cmake" - (("if\\(NOT TARGET Eigen3::Eigen\\)" all) - (string-append "find_package(Eigen3 CONFIG REQUIRED)\n" all)) - (("if\\(NOT TARGET CGAL::CGAL\\)" all) - (string-append "find_package(CGAL CONFIG COMPONENTS Core)\n" all)) - (("if\\(NOT TARGET tinyxml2\\)" all) - (string-append "find_package(tinyxml2 CONFIG REQUIRED)\n" - "if (NOT TARGET tinyxml2::tinyxml2)")) - (("if\\(NOT TARGET embree\\)" all) - (string-append "find_package(embree 3 CONFIG REQUIRED)\n" all)) - (("if\\(NOT TARGET glfw\\)" all) - (string-append "find_package(glfw3 CONFIG REQUIRED)\n" all)) - (("igl_download_glad\\(\\)" all) "") - (("igl_download_stb\\(\\)" all) "") - (("igl_download_tetgen\\(\\)" all) "") - (("igl_download_triangle\\(\\)" all) "") - (("igl_download_predicates\\(\\)" all) "")) - (substitute* "tests/CMakeLists.txt" - (("igl_download_test_data\\(\\)") "") - (("set\\(IGL_TEST_DATA.*") - (format #f "set(IGL_TEST_DATA ~a)\n" - (assoc-ref %build-inputs "libigl-test-data"))) - (("igl_download_catch2\\(\\)") "find_package(Catch2 CONFIG REQUIRED)") - (("list\\(APPEND CMAKE_MODULE_PATH \\$\\{LIBIGL_EXTERNAL\\}/catch2/contrib\\)") - "") - (("add_subdirectory\\(\\$\\{LIBIGL_EXTERNAL\\}/catch2 catch2\\)") "")) - ;; Install otherwise missing headers - (substitute* "cmake/libigl.cmake" - (("install_dir_files\\(copyleft\\)" all) - (string-join (list all - "install_dir_files(copyleft/cgal)" - "install_dir_files(copyleft/opengl)" - "install_dir_files(copyleft/tetgen)" - "install_dir_files(embree)" - "install_dir_files(opengl)" - "install_dir_files(png)" - "install_dir_files(predicates)" - "install_dir_files(xml)") - "\n")))))))) + (fix-external-library "comiso" "libigl-comiso") + (fix-external-library "tetgen" "libigl-tetgen") + (fix-external-library "triangle" "libigl-triangle") + (fix-external-library "predicates" "libigl-predicates") + (fix-external-library "glad" "libigl-glad") + (fix-external-library "libigl_tests_data" "libigl-test-data") + (fix-external-library "stb" "libigl-stb") + (substitute* "cmake/recipes/external/imguizmo.cmake" + (("if\\(TARGET imguizmo::imguizmo\\)") + "if(true)") + (("target_link_libraries.*") + (format #f "include_directories(~a/include/imgui/)" + (assoc-ref inputs "imgui")))) + + (substitute* "cmake/igl/igl_add_test.cmake" + (("include\\(\".*/contrib/Catch.cmake\"\\)") + (format #f + "include(\"~a/lib/cmake/Catch2/Catch.cmake\")" + (assoc-ref inputs "catch2")))) + (substitute* "cmake/recipes/external/cgal.cmake" + (("FetchContent_Populate\\(cgal\\)") + "find_package(CGAL CONFIG COMPONENTS Core)\nreturn()")) + (substitute* "cmake/recipes/external/eigen.cmake" + (("FetchContent_Populate\\(eigen\\)") + "find_package(Eigen3 CONFIG REQUIRED)\nreturn()")) + (substitute* "cmake/recipes/external/catch2.cmake" + (("message.*") + "find_package(Catch2 CONFIG)\nreturn()")) + (substitute* "cmake/recipes/external/libigl_imgui_fonts.cmake" + (("if\\(TARGET igl::imgui_fonts\\)") + "if(true)")) + (substitute* "cmake/recipes/external/tinyxml2.cmake" + (("FetchContent_Populate\\(tinyxml2\\)") + "find_package(tinyxml2 CONFIG REQUIRED)\nreturn()")) + (substitute* "cmake/recipes/external/embree.cmake" + (("FetchContent_MakeAvailable\\(embree\\)") + (string-join (list "find_package(Embree 3 CONFIG)" + "add_library(embree::embree ALIAS embree)" + "return()") + "\n"))) + (substitute* "cmake/recipes/external/glfw.cmake" + (("FetchContent_MakeAvailable\\(glfw\\)") + (string-join + (list "find_package(glfw3 CONFIG REQUIRED)" + "add_library(glfw::glfw ALIAS glfw)" + "return()") + "\n"))) + (substitute* "cmake/recipes/external/imgui.cmake" + (("FetchContent_MakeAvailable\\(imgui\\)") + "return()")))) + + (add-after 'unpack-external 'fix-assertions + (lambda _ + ;; Current Tetgen version has a bug. + (substitute* "include/igl/copyleft/tetgen/tetgenio_to_tetmesh.cpp" + (("assert\\(out.numberofpoints == out.numberofpointmarkers\\);") + ";")) + ;; CGAL has a bug in assertion as well. + (substitute* "include/igl/copyleft/cgal/trim_with_solid.cpp" + (("assert\\(I.size\\(\\) == Vr.rows\\(\\)\\);") + ";")))) + + ;; XXX: Install modules as CMake fails to install them. + (add-after 'install 'install-includes + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (include-dir (string-append out "/include/igl/"))) + (for-each (lambda (module) + (copy-recursively (format #f + "../source/include/igl/~a" + module) + (format #f + "~a/~a" + include-dir + module))) + (list "copyleft/cgal" + "copyleft/opengl2" + "copyleft/tetgen" + "embree" + "opengl" + "predicates" + "xml")))))))) + + (native-inputs (list catch2)) ;; XXX: Inputs are currently only used to build tests. ;; We would need to patch the CMake recipe to build a shared library ;; with all of these. (inputs `(("boost" ,boost) - ("catch2" ,catch2) ("cgal" ,cgal) ("eigen" ,eigen) ("embree" ,embree) - ("glfw" ,glfw) + ("glfw" ,glfw-3.4) ("gmp" ,gmp) ("mesa" ,mesa) ("mpfr" ,mpfr) ("tbb" ,tbb) ("tinyxml2" ,tinyxml2) + ("openblas" ,openblas) + ("imgui" ,imgui) + ("spectra" ,spectra) ;; When updating this package, update commit fields below according to ;; the hashes listed in "cmake/LibiglDownloadExternal.cmake". ("libigl-test-data" @@ -3614,15 +3687,20 @@ (define-public libigl (url "https://github.com/libigl/libigl-tests-data") (commit "19cedf96d70702d8b3a83eb27934780c542356fe"))) (file-name (git-file-name "libigl-test-data" version)) - (sha256 (base32 "1wxglrxw74xw4a4jmmjpm8719f3mnlbxbwygjb4ddfixxxyya4i2")))) + (sha256 + (base32 "1wxglrxw74xw4a4jmmjpm8719f3mnlbxbwygjb4ddfixxxyya4i2")))) ("libigl-glad" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libigl/libigl-glad") - (commit "09b4969c56779f7ddf8e6176ec1873184aec890f"))) - (file-name (git-file-name "libigl-glad" version)) - (sha256 (base32 "0rwrs7513ylp6gxv7crjzflapcg9p7x04nzfvywgl665vl53rawk")))) + ,(let* ((commit "ead2d21fd1d9f566d8f9a9ce99ddf85829258c7a") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/libigl-glad") + (commit commit))) + (file-name (git-file-name "libigl-glad" version)) + (sha256 + (base32 "079fd5yrbd713nq7slhhgq79wns85pc564ydlkjl9gf43d3220ay"))))) ("libigl-stb" ,(origin (method git-fetch) @@ -3630,24 +3708,67 @@ (define-public libigl (url "https://github.com/libigl/libigl-stb.git") (commit "cd0fa3fcd90325c83be4d697b00214e029f94ca3"))) (file-name (git-file-name "libigl-stb" version)) - (sha256 (base32 "0wwlb370z40y63ic3ny6q7lxibhixg2k1pjdkl4ymzv79zld28kj")))) + (sha256 + (base32 "0wwlb370z40y63ic3ny6q7lxibhixg2k1pjdkl4ymzv79zld28kj")))) ("libigl-predicates" + ,(let* ((commit "50c2149e7a520d13cd10e9aeff698bd68edd5a4f") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/libigl-predicates.git") + (commit commit))) + (file-name (git-file-name "libigl-predicates" version)) + (sha256 + (base32 "0yiqhzry2qhb1p0v9sldlnpqsn4y8cln8r6y08lafkc9kc4qy8jz"))))) + ;; TODO: Package tetgen separately from + ("libigl-tetgen" + ,(let* ((commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/tetgen.git") + (commit commit))) + (file-name (git-file-name "libigl-tetgen" version)) + (sha256 + (base32 "1k724syssw37py7kwmibk3sfwkkgyjyy7qkijnhn6rjm91g8qxsg"))))) + ("libigl-comiso" + ,(let* ((commit "562efe333edc8e649dc101469614f43378b1eb55") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/comiso.git") + (commit commit))) + (file-name (git-file-name "libigl-comiso" version)) + (sha256 + (base32 "048zryh9ydd1dqwzs14vj7r3fd6yyq6n4zl6d1b0yb1iwrqfy6ba"))))) + ("libigl-triangle" ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/libigl/libigl-predicates.git") - (commit "488242fa2b1f98a9c5bd1441297fb4a99a6a9ae4"))) - (file-name (git-file-name "libigl-predicates" version)) - (sha256 (base32 "13bd98g8lgcq37i3crj66433z09grnb2xjrcqpwqmyn147rp5wyh")))) - ;; TODO: Package tetgen separately from - ("libigl-tetgen" + (url "https://github.com/libigl/triangle.git") + (commit "6bbd92c7ddd6c803c403e005e1132eadb38fbe68"))) + (file-name (git-file-name "libigl-triangle" version)) + (sha256 + (base32 "0d35mfqwdk99xn1lpjzz9w5axq016r6xy5vr00lb4mvb05limxl3")))) + + ;; XXX: This is a source-only library which is currently required only + ;; for libigl. + + ("imguizmo" ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/libigl/tetgen.git") - (commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6"))) - (file-name (git-file-name "libigl-tetgen" version)) - (sha256 (base32 "1k724syssw37py7kwmibk3sfwkkgyjyy7qkijnhn6rjm91g8qxsg")))))) + (url "https://github.com/CedricGuillemet/ImGuizmo") + (commit "1.83"))) + (file-name (git-file-name "imguizmo" version)) + (sha256 + (base32 "14ywf96nvxf5c081pwypyzjwx9vyq78glbzinc81558v1sxiy2v0")))))) (home-page "https://libigl.github.io/") (synopsis "Simple C++ geometry processing library") (description "This library provides functionality for shape modelling, -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 07:14:42 2024 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 11:14:42 +0000 Received: from localhost ([127.0.0.1]:55217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSaiA-0002wV-8j for submit@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:42 -0400 Received: from mail-lj1-f174.google.com ([209.85.208.174]:49412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai5-0002v6-D6 for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:37 -0400 Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2eea7e2b0e6so35090411fa.3 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 04:14:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720869210; x=1721474010; 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=QlnJi+Hrl2UBbY6LbAo0dlF0srhaopMQxTpxc3U+ZfQ=; b=KgIu1XiC0lgwByw4pg3So6/8aAnYmGGDrCHpBumACVhMz2bp/fIzLClSaR04O87GV4 ILxUiafwila8AvDh4jbaSHJANNQFuCK4B0fXu9s7kwDm/f0N28KNjc/EarHXuwn8Vbqc OQERvkW2Hwp/JnmxhHmKGoikzClIGlvNtL/DQRuSWWECIBhg1qIOIR7Hlo1fS8iJl65X dJX5bv8lEEnNeXkcAbRX6PKS80Dvwh5oV4H+dyYzxLuRKyf3z6y1nTcvUwzEysWJDuuF r4fz41PD2e+eFynDDOMABW6kTAbRKpNeI/T2wkmonVaq+m2MPAXm1/3INPzrDS83fsIu ZNuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720869210; x=1721474010; 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=QlnJi+Hrl2UBbY6LbAo0dlF0srhaopMQxTpxc3U+ZfQ=; b=n+DOc06YpleTMgZ37IIhjUSsmn/c0U7oV/5RFYD9Y3jRIaUHanbx5HI9wTUgm0Q795 4Yxcyob7j6z1WAlSTqHlSt5/eLlOgTyj0Ih+wne2WCNdo9NetWbEqmDh9FZeMMOEWyHO XC4ITJpXFLR+YcCv36Mx9+m7wm4cUdivfZ2vkoamjsv5GLP8SsHFinqAGnyg7CtG0ZAM X0JR+/KUKU/xtxZORmhjY1JDNRI4CIE3UBrUCSpxbO70zXFfN6E/73cc3YoPlNIi/9i1 VR3tuu1LpRxj6i2VwMl1aOv6cwAW1Y+PXq0JQy2Rj5EwwDkrKxHdj3+ZXHoHAY/n5oi1 jsvw== X-Gm-Message-State: AOJu0YyuuZNrTJ6Ao2HH8hBgs/zn1iOA9yUJ+Ovp8JmM/aCD8QYrre7v BN6qn6AZ/8l8ZVOYQEkzWVZ/uQuayrK3XMMUCH4beT/KzCz54JPET5xmDQ== X-Google-Smtp-Source: AGHT+IGwC7vQOlS7tyHsrI+DDW/XxqTV/jeV2ab9GS5NqtsJ3HOCKKdbkrXK3DGWOVJ19Mycd1cfzQ== X-Received: by 2002:a2e:97cb:0:b0:2ec:1042:fb02 with SMTP id 38308e7fff4ca-2eeb30b4debmr100701921fa.8.1720869209938; Sat, 13 Jul 2024 04:13:29 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee179e797sm1781541fa.21.2024.07.13.04.13.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 04:13:29 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH v3 6/8] gnu: Add prusa-libbgcode. Date: Sat, 13 Jul 2024 14:13:15 +0300 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (prusa-libbgcode): New variable. Change-Id: I1f18c399d0fe36987c613ce4c0c3845c803beb45 --- gnu/packages/engineering.scm | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5dfb1e1be3..30eb5a7773 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3775,6 +3775,52 @@ (define-public libigl visualization, matrix manipulation.") (license (list license:gpl3 license:mpl2.0)))) +(define-public prusa-libbgcode + ;; Use the latest commit since there are no proper releases nor tags. + (let ((commit "8ae75bd0eea622f0e34cae311b3bd065b55eae9b") + (revision "0")) + (package + (name "prusa-libbgcode") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prusa3d/libbgcode") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fjx2ijz9zqpqs486lcrrrhqvmfzrpb8j6v57l0jiynavwv3kznw")))) + (native-inputs (list catch2)) + (propagated-inputs (list zlib boost heatshrink)) + (build-system cmake-build-system) + (home-page "https://github.com/prusa3d/libbgcode") + (synopsis "Prusa Block and Binary G-code reader/writer/converter") + (description + "Binary G-code is a new standard for encoding and compressing ASCII G-code +files. G-code files are easy to read and interpret, but their downside is that the +data is not saved efficiently, and the file size is often very large. Compression of +the file is problematic because the printers usually run on limited hardware and they +may not have enough memory and/or CPU power to decompress it. + +Block and Binary G-Code is a new G-code file format featuring the following +improvements over the legacy G-code: +@itemize +@item Block structure with distinct blocks for metadata vs. G-code. +@item Faster navigation. +@item Coding and compression for smaller file size. +@item Checksum for data validity. +@item Extensibility through new (custom) blocks. For example, a file signature block +may be welcome by corporate customers. +@end itemize + +The binary G-code format is flexible and the encoding and compression of individual +blocks is variable. @code{libbgcode} library contains the routines to convert ASCII +G-codes to binary and vice versa.") + ;; See + ;; + (license license:agpl3+)))) + (define-public prusa-slicer (package (name "prusa-slicer") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 07:14:43 2024 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 11:14:43 +0000 Received: from localhost ([127.0.0.1]:55219 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSaiA-0002wY-LD for submit@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:43 -0400 Received: from mail-lj1-f181.google.com ([209.85.208.181]:58392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai6-0002vB-E3 for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:39 -0400 Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2ee9b098bd5so38889171fa.0 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 04:14:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720869211; x=1721474011; 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=GVRpAmkbpNMTuLOv+vXpL7vVOPJoLj+rF+SEti7X83I=; b=eF4ggaGzFk9HMSpd9+TIVcw6T+UPjtqkiIQudy3p53rndTRWRfwv339nuvNbyrQ8VM rHJ0B0E7chQuJGSa82VeZRVf47EJIQQpumhKptIq/TlWviKStltxJlg/IAYdtohMfnl1 CiPcGbEl8YO8bqs34esPF34eafntISPCPLkMahydJ6x9AgUWz3LSx6LEzXJkTO2rMYlz e0bGFCnWNgCGrAgrNB33jLE97nGuF0yEZCkJJxvOjWFNea41kP9xgtf/kGXv9DfTJsEq x5+aTzNsWC8XuXcdBAS5+mJVWlsGbXu5PlDjZXWNK+MpDfrbtuQnhpmQcdRYTz/RFqwh v+ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720869211; x=1721474011; 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=GVRpAmkbpNMTuLOv+vXpL7vVOPJoLj+rF+SEti7X83I=; b=wzsnvRfI7pWAASJu86RGa06Sce8fpyG3d6X2Semap74CXIYBevyCRHOjhVxTp/VBY4 AJrLJWT/TEL6PqRp4Uw7oJsssHYp2SnwmOxwq34QB1HGR5NbO2k1xQ1gpne65TEvTI9P LR8YDoUSwfqpxGTWV6HC98gnB5d7pJYa5dXzC1Bp7AEkTaggUXAXGVIG5/TSTWQzPo+E DL2ll3PJkIcZEEDBBgzWfP9Lz1GCcuQalvrmZeLjZim/JKrwhGrgmRq/CFhPelBGNdLx PVOHj4/GJJ5mykyM+EGGavNdU8IMzCe1biPlADwlc9NDtE39kIoFfNNUXSCLhlp/fG1w v5SA== X-Gm-Message-State: AOJu0YyqHtQ466Bne/eonaqs2Xgfwsik+K65YqqmZT6mZgHlnWvNADQH wsBTFhahTkYx35yVZMnRZjdsgIi+Xnhy+/4KC2jd+1Q1fmg7VYivti/GWg== X-Google-Smtp-Source: AGHT+IEBO6Fm3aObNLWmgx/EeY0DeDkfBuJlyKv4uTkMzgRFRPPa5q+g3NJAGdM4K9DG7Gsv9r0xaQ== X-Received: by 2002:a2e:91d3:0:b0:2ee:7bed:2cff with SMTP id 38308e7fff4ca-2eeb30dc158mr101881641fa.13.1720869210990; Sat, 13 Jul 2024 04:13:30 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee179e797sm1781541fa.21.2024.07.13.04.13.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 04:13:30 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH v3 7/8] gnu: Add prusa-wxwidgets. Date: Sat, 13 Jul 2024 14:13:16 +0300 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" , Nikita Domnitskii X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (prusa-wxwidgets): New variable. * gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Register "prusa-wxwidgets-makefile-fix.patch". Co-authored-by: Nikita Domnitskii Change-Id: I9043c2acc95986275ee24d9c5d944e5fe2702e99 --- gnu/local.mk | 1 + .../prusa-wxwidgets-makefile-fix.patch | 112 ++++++++++++++++++ gnu/packages/wxwidgets.scm | 39 ++++++ 3 files changed, 152 insertions(+) create mode 100644 gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4726e2c128..541f636c35 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1847,6 +1847,7 @@ dist_patch_DATA = \ %D%/packages/patches/prusa-slicer-boost-fixes.patch \ %D%/packages/patches/prusa-slicer-fix-tests.patch \ %D%/packages/patches/prusa-slicer-with-cereal-1.3.1.patch \ + %D%/packages/patches/prusa-wxwidgets-makefile-fix.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/python-3.12-fix-tests.patch \ %D%/packages/patches/python-accupy-use-matplotx.patch \ diff --git a/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch b/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch new file mode 100644 index 0000000000..aadf976588 --- /dev/null +++ b/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch @@ -0,0 +1,112 @@ +diff --git a/Makefile.in b/Makefile.in +index 8f33aa2ff4..39928382da 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -4358,7 +4358,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ + monodll_msw_utils.o \ + monodll_utilsexc.o \ + monodll_fswatcher.o \ +- monodll_msw_secretstore.o ++ monodll_msw_secretstore.o \ + monodll_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \ +@@ -5284,7 +5284,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ + monodll_uuid.o \ + monodll_msw_evtloop.o \ + monodll_access.o \ +- monodll_dark_mode.o ++ monodll_dark_mode.o \ + monodll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \ +@@ -6196,7 +6196,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ + monodll_uuid.o \ + monodll_msw_evtloop.o \ + monodll_access.o \ +- monodll_dark_mode.o ++ monodll_dark_mode.o \ + monodll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \ +@@ -6371,7 +6371,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ + monolib_msw_utils.o \ + monolib_utilsexc.o \ + monolib_fswatcher.o \ +- monolib_msw_secretstore.o ++ monolib_msw_secretstore.o \ + monolib_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \ +@@ -7297,7 +7297,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ + monolib_uuid.o \ + monolib_msw_evtloop.o \ + monolib_access.o \ +- monolib_dark_mode.o ++ monolib_dark_mode.o \ + monolib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \ +@@ -8209,7 +8209,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ + monolib_uuid.o \ + monolib_msw_evtloop.o \ + monolib_access.o \ +- monolib_dark_mode.o ++ monolib_dark_mode.o \ + monolib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \ +@@ -8436,7 +8436,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ + basedll_msw_utils.o \ + basedll_utilsexc.o \ + basedll_fswatcher.o \ +- basedll_msw_secretstore.o ++ basedll_msw_secretstore.o \ + basedll_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \ +@@ -8523,7 +8523,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ + baselib_msw_utils.o \ + baselib_utilsexc.o \ + baselib_fswatcher.o \ +- baselib_msw_secretstore.o ++ baselib_msw_secretstore.o \ + baselib_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \ +@@ -9464,7 +9464,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ + coredll_uuid.o \ + coredll_msw_evtloop.o \ + coredll_access.o \ +- coredll_dark_mode.o ++ coredll_dark_mode.o \ + coredll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \ +@@ -10376,7 +10376,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ + coredll_uuid.o \ + coredll_msw_evtloop.o \ + coredll_access.o \ +- coredll_dark_mode.o ++ coredll_dark_mode.o \ + coredll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \ +@@ -11204,7 +11204,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ + corelib_uuid.o \ + corelib_msw_evtloop.o \ + corelib_access.o \ +- corelib_dark_mode.o ++ corelib_dark_mode.o \ + corelib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \ +@@ -12116,7 +12116,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ + corelib_uuid.o \ + corelib_msw_evtloop.o \ + corelib_access.o \ +- corelib_dark_mode.o ++ corelib_dark_mode.o \ + corelib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \ diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 973e962fb1..11c2ac2154 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -46,6 +46,7 @@ (define-module (gnu packages wxwidgets) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gl) #:use-module (gnu packages gnome) + #:use-module (gnu packages graphics) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) @@ -265,6 +266,44 @@ (define-public wxwidgets-2 (("-Wall") "-Wall -Wno-narrowing")) #t))))))) +(define-public prusa-wxwidgets + ;; There is no proper tag/release, all patches are in separate branches based on + ;; the wxWidgets release (e.g. this commit is taken from "v3.2.0-patched" branch".) + (let ((commit "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26") + (revision "0")) + (package + (inherit wxwidgets) + (name "prusa-wxwidgets") + (version (git-version "3.2.0" revision commit)) + (home-page "https://github.com/prusa3d/wxWidgets") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + ;; The patch is taken from the NixOS nixpkgs repository (see + ;; .) + (patches (search-patches "prusa-wxwidgets-makefile-fix.patch")) + (sha256 + (base32 + "1xk6w7q4xv4cj906xa5dwam5q51mc8bszbkkz7l8d3wjmsz73rwv")))) + (native-inputs (modify-inputs (package-native-inputs wxwidgets) + (prepend nanosvg))) + (arguments + (substitute-keyword-arguments (package-arguments wxwidgets) + ((#:configure-flags flags) + ;; To fix 3D rendering in PrusaSlicer, wxWidgets must be compiled with + ;; "--disable-glcanvasegl" flag (see + ;; .) + #~(cons "--disable-glcanvasegl" #$flags)) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'copy-nanosvg-source + (lambda _ + (copy-recursively #$(package-source nanosvg) "3rdparty/nanosvg/")))))))))) + (define-public python-wxpython (package (name "python-wxpython") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 07:14:44 2024 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 11:14:44 +0000 Received: from localhost ([127.0.0.1]:55221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSaiB-0002wf-9p for submit@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:44 -0400 Received: from mail-lj1-f170.google.com ([209.85.208.170]:52349) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai7-0002vW-IN for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:40 -0400 Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-2eaae2a6dc1so43695531fa.0 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 04:14:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720869212; x=1721474012; 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=sQ/cZoW5AdDegWIwoarfaTmpFei3mgHh4d+uxjAEOWE=; b=Gc1fCNYEpcXWJ5HLwX/sPx9kS1bXOYt4uiLX3OLr4LOlhl3MRI7xs9aLbDYJ767xRR W706e8BNpDTnXqaIwJoVkS9JKqUBpglyP7DZqtIOOkLtsvvUm+CyYJubrecZoWcfSg8M mCSoiKWXklO30xjdzbi+1zpBr2F0GVrXEcFfEkzYthpAvxdwk61FjwhRiPlyR9eGnL33 nj9ZBEDXsnxDcbYyzzyYqV/URFiUsOx9p924eRRSINUwqp0L1LIDttH3IhD4lb/V+oN8 18cQYw1AHHa6i2klC5moZxnF4VEIXyJ/Y5LPm8uuzMXubuDYnJ3S5n5F4fRA6z8G/fhj UW/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720869212; x=1721474012; 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=sQ/cZoW5AdDegWIwoarfaTmpFei3mgHh4d+uxjAEOWE=; b=EfrW4PkUvv7LtW2GvnI+fpn397e8Ctk9NTaBO0qd5MLZKjCTgRz2tA0oFqke4x2BNy ZhR2XfYHJfol3bonFUJj7MPddC7JzqPvO+60a5FevKZc5o5tmjmLgwVdtL9MSgNiCWs4 S2UUXrw1GqWkTHKAqjJx6dfD2A5fv82xMn9VNu+5o1xYUkv+O5Fypcb+8VrEDSmUWnQ7 HEpAb+hfvYA4/B0awiBQDEpFOUjATamb5A/AD5yEFDuob9haj/TmRJXV+jEYoKkSab+y /99KrUe1i+jeVcaNshfYU/kXoOA6VDRw1tDrmq4J0ua0tdQSkqWNzJhRC5sGQoNdXDrb FjMw== X-Gm-Message-State: AOJu0YxGmzYIBvL+aY7ODScbFnT/r72OSkWODFJQFedgFskWapsVLssv OrerEq+N0psH7A9pBqfl2wFY17P1A7vvIl18Mo6xBr4GvGySgmjXlZ8LOA== X-Google-Smtp-Source: AGHT+IEPUgyvzYP4BeIF6D7lrvh+uvYYKgZEUIuHQ6v4Ni7ResMg5nHfTJUKM6wg57mTiPxOgUWGIA== X-Received: by 2002:a2e:3315:0:b0:2ec:5777:aa5c with SMTP id 38308e7fff4ca-2eeb30529b9mr118289741fa.0.1720869211958; Sat, 13 Jul 2024 04:13:31 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee179e797sm1781541fa.21.2024.07.13.04.13.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 04:13:31 -0700 (PDT) From: "Artyom V. Poptsov" To: 70880@debbugs.gnu.org Subject: [PATCH v3 8/8] gnu: prusa-slicer: Update to 2.7.4. Date: Sat, 13 Jul 2024 14:13:17 +0300 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: "Artyom V. Poptsov" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (prusa-slicer): Update to 2.7.4. [source]: Remove "prusa-slicer-boost-fixes.patch" and "prusa-slicer-with-cereal-1.3.1.patch". Move some part of the snippet code to custom build phases. [arguments] : Add paths to external libraries. Add "fix-include-paths" phase. [native-inputs]: Add catch2. [inputs]: Use prusa-wxwidgets instead of wxwidgets to fix segfaults. Add qhull, nanosvg, heatshrink and prusa-libbgcode. Sort inputs aphabetically. * gnu/packages/patches/prusa-slicer-boost-fixes.patch, gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch: Remove unused patches. * gnu/local.mk (dist_patch_DATA): De-register "prusa-slicer-boost-fixes.patch" and "prusa-slicer-with-cereal-1.3.1.patch". Change-Id: I15e85d63c9ad6c731c8040ef2d8ec8b2f31f2ab7 --- gnu/local.mk | 2 - gnu/packages/engineering.scm | 55 +++++++---- .../patches/prusa-slicer-boost-fixes.patch | 97 ------------------- .../prusa-slicer-with-cereal-1.3.1.patch | 52 ---------- 4 files changed, 36 insertions(+), 170 deletions(-) delete mode 100644 gnu/packages/patches/prusa-slicer-boost-fixes.patch delete mode 100644 gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch diff --git a/gnu/local.mk b/gnu/local.mk index 541f636c35..92bbe821cd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1844,9 +1844,7 @@ dist_patch_DATA = \ %D%/packages/patches/pokerth-boost.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/procps-strtod-test.patch \ - %D%/packages/patches/prusa-slicer-boost-fixes.patch \ %D%/packages/patches/prusa-slicer-fix-tests.patch \ - %D%/packages/patches/prusa-slicer-with-cereal-1.3.1.patch \ %D%/packages/patches/prusa-wxwidgets-makefile-fix.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/python-3.12-fix-tests.patch \ diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 30eb5a7773..f017d75f2e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3824,7 +3824,7 @@ (define-public prusa-libbgcode (define-public prusa-slicer (package (name "prusa-slicer") - (version "2.5.2") + (version "2.7.4") (source (origin (method git-fetch) @@ -3833,13 +3833,11 @@ (define-public prusa-slicer (url "https://github.com/prusa3d/PrusaSlicer") (commit (string-append "version_" version)))) (file-name (git-file-name name version)) - (sha256 (base32 "02qcrw3fa0d8ldbp73hp14l1qxbp3f4608j4csc07ny00ra42151")) - (patches (search-patches "prusa-slicer-boost-fixes.patch" - "prusa-slicer-fix-tests.patch" - "prusa-slicer-with-cereal-1.3.1.patch")) + (sha256 (base32 "0s1cfvhfilyv0y98asr61c6rwlgyr1hf5v5hg8q9zwmzm2bkcql3")) + (patches (search-patches "prusa-slicer-fix-tests.patch")) (modules '((guix build utils))) (snippet - '(begin + `(begin ;; Prusa slicer bundles a lot of dependencies in src/ directory. ;; Most of them contain prusa-specific modifications (e.g. avrdude), ;; but others do not. Here we replace the latter with Guix packages. @@ -3847,10 +3845,12 @@ (define-public prusa-slicer (delete-file-recursively "src/hidapi") (delete-file-recursively "src/eigen") (delete-file-recursively "src/libigl/igl") + (substitute* "CMakeLists.txt" + (("add_library\\(libexpat INTERFACE\\)") + "")) + (substitute* "src/libigl/CMakeLists.txt" + (("target_link_libraries\\(libigl INTERFACE igl::core\\)") "")) (substitute* "src/CMakeLists.txt" - (("add_subdirectory\\(libigl\\)" all) - (string-append - all "\ninclude_directories(libigl INTERFACE libigl::core)")) (("add_subdirectory\\(hidapi\\)") "pkg_check_modules(HIDAPI REQUIRED hidapi-hidraw)") (("include_directories\\(hidapi/include\\)") @@ -3863,13 +3863,26 @@ (define-public prusa-slicer (("\\bhidapi\\b") "${HIDAPI_LIBRARIES}")))))) (build-system cmake-build-system) (arguments - `(#:configure-flags - '("-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard. - "-DSLIC3R_GTK=3" ;; Use GTK+ - ;; Use wxWidgets 3.0.x.x to prevent GUI crashes when adding support enforcers. - "-DSLIC3R_WX_STABLE=1"))) + (list #:configure-flags + #~(list "-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard. + "-DSLIC3R_GTK=3" ;; Use GTK+ + ;; Use wxWidgets 3.0.x.x to prevent GUI crashes when adding support enforcers. + "-DSLIC3R_WX_STABLE=1" + (format #f "-Dlibigl_DIR=~a" + (search-input-directory %build-inputs + "lib/cmake/igl/")) + (format #f "-DCatch2_DIR=~a" + (search-input-directory %build-inputs + "lib/cmake/Catch2/"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-include-paths + (lambda _ + (substitute* "tests/libslic3r/test_quadric_edge_collapse.cpp" + (("#include ") + "#include "))))))) (native-inputs - (list pkg-config)) + (list pkg-config catch2)) (inputs (list boost cereal @@ -3877,11 +3890,13 @@ (define-public prusa-slicer curl dbus eigen + eudev expat glew glib gmp gtk+ + heatshrink hidapi ilmbase libigl @@ -3889,15 +3904,17 @@ (define-public prusa-slicer libpng mesa mpfr + nanosvg nlopt opencascade-occt openvdb pango + prusa-libbgcode + ;; XXX: Using Prusa wxWidgets fork as PrusaSlicer segfaults when compiled + ;; with regular wxwidgets. + prusa-wxwidgets + qhull tbb - eudev - ;; prusa-slicer 2.5 segfaults on startup with wxwidgets 3.2 - ;; See https://github.com/prusa3d/PrusaSlicer/issues/8299 - wxwidgets-3.0 zlib)) (home-page "https://www.prusa3d.com/prusaslicer/") (synopsis "G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)") diff --git a/gnu/packages/patches/prusa-slicer-boost-fixes.patch b/gnu/packages/patches/prusa-slicer-boost-fixes.patch deleted file mode 100644 index 5bca271625..0000000000 --- a/gnu/packages/patches/prusa-slicer-boost-fixes.patch +++ /dev/null @@ -1,97 +0,0 @@ -Fixes for Boost compatibility. -This patch comes from Gentoo: - portage/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch - ---- a/src/hints/HintsToPot.cpp -+++ b/src/hints/HintsToPot.cpp -@@ -1,6 +1,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -9,7 +10,7 @@ - - bool write_to_pot(boost::filesystem::path path, const std::vector>& data) - { -- boost::filesystem::ofstream file(std::move(path), std::ios_base::app); -+ boost::nowide::ofstream file(std::move(path), std::ios_base::app); - for (const auto& element : data) - { - //Example of .pot element ---- a/src/libslic3r/Preset.cpp -+++ b/src/libslic3r/Preset.cpp -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -84,7 +85,7 @@ ConfigFileType guess_config_file_type(const ptree &tree) - VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path, bool load_all) - { - ptree tree; -- boost::filesystem::ifstream ifs(path); -+ boost::nowide::ifstream ifs(path); - boost::property_tree::read_ini(ifs, tree); - return VendorProfile::from_ini(tree, path, load_all); - } ---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp -+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp -@@ -10,6 +10,7 @@ - #include "libslic3r/Platform.hpp" - #include "libslic3r/Config.hpp" - -+#include - #include - #include - #include -@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog() - - } // namespace GUI - } // namespace Slic3r --#endif // __linux__ -\ No newline at end of file -+#endif // __linux__ ---- a/src/slic3r/GUI/GUI_App.cpp -+++ b/src/slic3r/GUI/GUI_App.cpp -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/src/slic3r/GUI/HintNotification.cpp -+++ b/src/slic3r/GUI/HintNotification.cpp -@@ -15,6 +15,7 @@ - #include "libslic3r/PrintConfig.hpp" - - #include -+#include - #include - #include - #include -@@ -65,7 +66,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f - - void write_used_binary(const std::vector& ids) - { -- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary); -+ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary); - cereal::BinaryOutputArchive archive(file); - HintsCerealData cd { ids }; - try -@@ -84,7 +85,7 @@ void read_used_binary(std::vector& ids) - BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string(); - return; - } -- boost::filesystem::ifstream file(path); -+ boost::nowide::ifstream file(path); - cereal::BinaryInputArchive archive(file); - HintsCerealData cd; - try diff --git a/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch b/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch deleted file mode 100644 index affa506b1c..0000000000 --- a/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix for building with cereal>=1.3.1. -This patch comes from Gentoo: - portage/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch - ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -127,7 +127,7 @@ - set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer") - endif () - --target_link_libraries(PrusaSlicer libslic3r cereal) -+target_link_libraries(PrusaSlicer libslic3r libcereal) - - if (APPLE) - # add_compile_options(-stdlib=libc++) ---- a/src/slic3r/CMakeLists.txt -+++ b/src/slic3r/CMakeLists.txt -@@ -260,7 +260,7 @@ - - encoding_check(libslic3r_gui) - --target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) -+target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) - - if (MSVC) - target_link_libraries(libslic3r_gui Setupapi.lib) ---- a/src/libslic3r/CMakeLists.txt -+++ b/src/libslic3r/CMakeLists.txt -@@ -395,7 +395,7 @@ - target_link_libraries(libslic3r - libnest2d - admesh -- cereal -+ libcereal - libigl - miniz - boost_libs ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -446,6 +446,12 @@ - - # Find the Cereal serialization library - find_package(cereal REQUIRED) -+add_library(libcereal INTERFACE) -+if (NOT TARGET cereal::cereal) -+ target_link_libraries(libcereal INTERFACE cereal) -+else() -+ target_link_libraries(libcereal INTERFACE cereal::cereal) -+endif() - - # l10n - set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 09:06:28 2024 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 13:06:28 +0000 Received: from localhost ([127.0.0.1]:55298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sScSK-0000OQ-5l for submit@debbugs.gnu.org; Sat, 13 Jul 2024 09:06:28 -0400 Received: from mail-lf1-f43.google.com ([209.85.167.43]:56586) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sScSH-0000OH-Oz for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 09:06:27 -0400 Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-52ea1a69624so3008289e87.1 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 06:06:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720875923; x=1721480723; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=TqNxVAii0bbi1FFophu2+UIWHMUAfeN8/K31/MFpxKU=; b=byokIqI4UJsqAhjuRNOEE7B4OZENuxd3Ui6qdEELP2nYi9fSHRJgzsu2tDZz/Drjci 8hYfmA4r7oDMXfG3QrTQqOmIcpxEk5JyR3gxR+1uGjJWPWC1jVbeWiJkZQeShx1uHdVe nXsWV0WSyG9A2gpLGdzJOaNWyN8Bvhxrbl7lXbbexgYJDB+oDgjVYt36BOAkYxnVeEaH /C2R1atb0a/wDhYtXfHUEiAyNQLysj5+n3zjF2wYC6CZ7wFH+KgDsgmdTvQeKAUa2uuK VMVTNMq/KXRhii8N4W1CzFSFZJEyaCpkDF6AD8QrqXbHlsVtWF9VZ9cbGth00y22+g/D 7RdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720875923; x=1721480723; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=TqNxVAii0bbi1FFophu2+UIWHMUAfeN8/K31/MFpxKU=; b=lW1AVRcYxIe2EJ5AECYssP7/TYHhYctlb3WUcaSL7TDA+RpS34IhXLbeq0DQkQs7Ac Fqhcn6k4rAv6Gvf1rlX8NrrKUZn6uIQgsj0PhTJYRRJZ3lpKk6R8RQdPqOBkoHJLd5LA oXkoAsikMZkOJ1Bl5N2ti9O9MbgNXTB7bu1SvW0eFg0BieM+qvvMePf2yxOMaAKBF9I/ 44/QGEYpfUNvY6DxGN+Bx+ATL+/teoBUreOyYtNcUIZ59o6MMvytMFlkM1nIHLeTdyo+ 65X5bs3gvQZ3NQ4GMHY5wrY8NakW7UhYk7lT5mKiyfGa7XYxr006ZQ5ngdbhCq8JFgwM 3QIw== X-Gm-Message-State: AOJu0YwVwGe5xVUxO81StKn8E4ZE5nIRp8LagqGZwkaWn+6z1yncijCY B6KsSH/XNFXRjcYvZMn9zyWNU9phVypYPCc/XM5wJ/GaJZ0gnK4MyS0IOw== X-Google-Smtp-Source: AGHT+IHt8JpEO/4uL6t8KUOhDrGwFflikXI9j4DCgnzlk2D6iT/ILlQJ/MNNCU9dDCtycqAIC8GvuQ== X-Received: by 2002:a05:6512:ba2:b0:52c:e3bd:c708 with SMTP id 2adb3069b0e04-52ed4105633mr499994e87.10.1720875918725; Sat, 13 Jul 2024 06:05:18 -0700 (PDT) Received: from elephant ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52ed24f3479sm188767e87.69.2024.07.13.06.05.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 06:05:18 -0700 (PDT) From: "Artyom V. Poptsov" To: Maxim Cournoyer Subject: Re: [bug#70880] [PATCH v2 8/8] gnu: prusa-slicer: Update to 2.7.4. In-Reply-To: <87o776ufw1.fsf@gmail.com> (Maxim Cournoyer's message of "Tue, 09 Jul 2024 22:42:22 -0400") References: <6ad909cee24b19c9d2e834ddbe1de8f7d8b76979.1719853592.git.poptsov.artyom@gmail.com> <87o776ufw1.fsf@gmail.com> Date: Sat, 13 Jul 2024 16:05:09 +0300 Message-ID: <87ttgt8mt6.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hello Maxim! I've sent the patchset v3 with fixes, could you please review it when you have time? Thanks! =2D avp =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJNBAEBCgA3FiEEAf2F9Bp7f4IFgwalk16+BzbchX4FAmaSe4kZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRCTXr4HNtyFfhvbD/4m13fPxLxYJF2Y+0T3dgSJ d8vrA8ttyZZWx5eek0QoCZCAFuIukahY7xit6oaYKyIsOWmf+TZpTFz+D0Gomzkq 9VHW6TIAcWZF5a6dZY+V8eKz/xsSJXQlCNKHI1uOspCvrDcjOAMblXUBzUDykKhz JFr1z0Gd6lQbaAAKJNofcgpjf0u63CcrmbtyTG6GVAQwYYU8rjOsbPqbl1Q9/+ly Mh835kM7r4TGKJu750FJxdLdeP+eZdRVfPuPoX/iCyS2yodNh30oXzevd/R+dx9P mFliI72ZPBr1OiD323HMb9O4toE+hBwe1/469jIJMDNp2pDKTzqxcq2mSIcsbDRn jkMzJe1F5feJ9oQJeDWrWUt3vxcq4+589HiU+hy355dHYwhOVvq/p5TMDNvviDDy OKfESg10EuQTkxeK9airOgANlwq9zAYjN8nkDTbRcJdmc5QztKJsbbQXikfsEKG/ BetAp+0qDdMZqqz6wnqOcheLCea+Se7Yc7rnQ4dZTMoCyLETJuzWwovfWy3pPp93 PDcw+Qyr3t3BObVSWKTZAk7htwhDCOe4kAJ2iYu26+ABUnMRnWdESZMtRfJNzmOr aGx4r72urz5zY0zPOnsbTDxTGdYPLgwliAiFqnNzV4PU10goPJDVKh3LPA5PuiFm yVE7v481gL1vnS2FQNjMdA== =0jU1 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 18 15:46:21 2024 Received: (at 70880) by debbugs.gnu.org; 18 Jul 2024 19:46:21 +0000 Received: from localhost ([127.0.0.1]:38108 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sUX53-0004IA-Gs for submit@debbugs.gnu.org; Thu, 18 Jul 2024 15:46:21 -0400 Received: from mail-lf1-f44.google.com ([209.85.167.44]:52235) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sUX4z-0004Hc-EF for 70880@debbugs.gnu.org; Thu, 18 Jul 2024 15:46:20 -0400 Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-52ea929ea56so1467877e87.0 for <70880@debbugs.gnu.org>; Thu, 18 Jul 2024 12:46:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721331906; x=1721936706; darn=debbugs.gnu.org; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=FjpWceaH2jSJ7ofjvmdxp+wsT+uLBDVSZGz/588IHN4=; b=h9ljVKIJxhgj5qN1pwf0IgfewoIwK/ZlOA9SPgqO3M/ZzVSBxHKHbHkRaocaXOQxl9 4fP6Dj+fvG1loX6bjJxa4B+NypzChaprbJEGU3uEN6QdnZH1u/mn7/oNEtC0RcvUT1BT iEVh3O1/slGolgYnkBff/7+/4EnmXgRlsf0Stp6HcdtEzoasZQ0fNfdp+wDTnBKiOaen 4Pwookdnwjp9oK5wtux+jh74ekpRFj7Po1QHNEyQHEW2LoJpuuxHtyW/I6iTD8Wkxhqu 8hzDAx/SgrKveObI+mDy3Iwvqav6lOFpmabsNnnQpNESnoiiXNBv3QweOw+m0YXMrUHv SY6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721331906; x=1721936706; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FjpWceaH2jSJ7ofjvmdxp+wsT+uLBDVSZGz/588IHN4=; b=N0Lc+Qjn3RR+4Ou8tEjJpgG73j54BxEWttFs060ivIQEnZBUnH0NlhgV/TAWTROZft IO1ezFQyUJkIDVTQZX+Rhwpxogl13dXV8GYaSaidTcU85Aj9+kPjJKxqekxalLaDLdm1 m93JfoIzrwkfKXQh/djsOoYRufKAf8AaO5glsZozwDNFDpH34yGchOpcvMQU9yUQgf44 03PKo4niHBRTzdYgVTlSYoQ1/j5csE78Gj/NpiSbrCAj0d7EVEG6V4JoIc6v3Rza46d/ znVwcByJZHRvKwO5SD6bbWvlamS7AWU2wUTw/FtIpfSuBTRqPO0vgWrYnxJnliG4ouLC rI4w== X-Gm-Message-State: AOJu0YwDgiJ6uW7nv5AbwW6XFki15nFtDYR/zUermRydx6pKo1NwQqky uSdVd28+NfMH/+N7q+XkmjlLmznb6EH21Z4W3Hc67Yg3ZrQXm05qq38XWA== X-Google-Smtp-Source: AGHT+IEUuWNpwddKtoSA0RYTWNDlg3Xl0cJ8fB47EgiGUymmCGDLnnFhQllBLhNu0srF4xFZvMkLsQ== X-Received: by 2002:a05:6512:1591:b0:52e:976a:b34b with SMTP id 2adb3069b0e04-52ee53b7768mr5087603e87.15.1721331905962; Thu, 18 Jul 2024 12:45:05 -0700 (PDT) Received: from elephant ([95.79.68.33]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52ef0744a09sm181306e87.148.2024.07.18.12.45.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jul 2024 12:45:05 -0700 (PDT) From: "Artyom V. Poptsov" To: Maxim Cournoyer Subject: Re: [bug#70880] [PATCH v2 8/8] gnu: prusa-slicer: Update to 2.7.4. In-Reply-To: <87ttgt8mt6.fsf@gmail.com> (Artyom V. Poptsov's message of "Sat, 13 Jul 2024 16:05:09 +0300") References: <6ad909cee24b19c9d2e834ddbe1de8f7d8b76979.1719853592.git.poptsov.artyom@gmail.com> <87o776ufw1.fsf@gmail.com> <87ttgt8mt6.fsf@gmail.com> Date: Thu, 18 Jul 2024 22:44:56 +0300 Message-ID: <87bk2u1o3r.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hello Maxim Cournoyer! Have you had any chance to review the new patchset? Looking forward to start my work on the further PrusaSlicer updating. :-) =2D avp =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJNBAEBCgA3FiEEAf2F9Bp7f4IFgwalk16+BzbchX4FAmaZcLwZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRCTXr4HNtyFfurtD/0XdTXzefZc8Snft9GpH6/v hT6nCmSfqoTjKPOf1/pjADhZ9vEtQWPARwHO6tFAUb6McnisaPoC0CEDBGZ0mgRh bYCay2PsGCjI1KDb9+/SMytUgzKZyenMzygqoRfT3r2LWtMqlU+7ufGbInngJA9w NK2QphKfbq4Ad/4hgRxWzXmcoorvEd10c0jrQzgP+zdl69fdDJMqk+0W/0JrobKk RE2jfLD+UYxBjgvwIpGlV+puGMnscmeLTqtkCfW8V1pVng2R2pcovZAsVktReauP pd4phEYizBnGpEvFzGXQumkj10ph1F6zpijJF7TjCV8ZiCcYP53pDctMycFZV6jo oww7a7djoB0D2Njfvf4rxS7mjG7Xw8cSuztp3ULrr5iKKl2g8J/QifJnK3lwLRCz krISApOXyhCXrMUwZAYUMfQNugaDoQJ98Xo0iBSGodD06ua2+rMlgVuBpsiu8Xug 18SPrZjCA4VZxTHm9gEHsvfrw+7gNG3cxbXZQkoauPz5Xen/McYjGD9pEUnjSwJW ifTfTK0R5YCXqylOuxfMeExV//m+B8KXxnL5z7pX5x97+iC/R1VhBMFcD55WV1Uf t1APScy5oF1GXxqctdutNggUGa3wm3XgRl2I5pHnf1lr/eutsmi6zpH4bTdBX8Vs Wmus4z/Cpp25nUKhKa5YHw== =Uhek -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 29 00:10:34 2024 Received: (at 70880) by debbugs.gnu.org; 29 Jul 2024 04:10:34 +0000 Received: from localhost ([127.0.0.1]:44742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYHiU-0006Kp-1f for submit@debbugs.gnu.org; Mon, 29 Jul 2024 00:10:34 -0400 Received: from mail-lf1-f42.google.com ([209.85.167.42]:44441) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYHiP-0006KU-KP for 70880@debbugs.gnu.org; Mon, 29 Jul 2024 00:10:32 -0400 Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-52efabf5d7bso3415098e87.1 for <70880@debbugs.gnu.org>; Sun, 28 Jul 2024 21:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722226151; x=1722830951; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=lCnc9gb4XYdzc4Sy27JdHSqYMoDiKFMkQbxy3Czr11w=; b=WjuUTrNPe01FZjy5G4Qn5Ob2kkl/paMWdQxNdmYP0ihMWPuGmcu6adVMtHKKtOZVo2 DNTqOWRZKJ7NiqAqZL+pwVpWCARGwgXgmM84SUm3D9jVLWzbP+Tz3QP12etV7gi824og Deg98oWcEEXPpArzumZdL2MGOqBavjbntqbU7RBrasdvX65mXEc0jlozsDTUfrkyy3jq 4NMM0HO+4SPbL0GsBmIptNoU1h8rKR9ps/4lkmIyokbZOwIrAksssNsu/cOQXFztofGB alU3wy8NByoCC2+rB/n5a+hiiW0KCy2feP4I4pZsnwm1PzLR0Mm7rHVTagJpNtB7sLzJ CgVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722226151; x=1722830951; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=lCnc9gb4XYdzc4Sy27JdHSqYMoDiKFMkQbxy3Czr11w=; b=RU9H8rzI4bdPg7tt9kXx8o4Z5pmGJMK4meNU0zsMyGemcO/WzbTwq2IX0wDaXCQS0U Jal+to3KnAUYy9BP5ES2BhEOOhCQMrZI+/jTiaAv8icnGnKZWU5uAPuHOhplSyv626Tb tdADbckv/GdgdHSMt44Mx1DDxmVsmt4RmFg0LAe0sksAi8qkcfg2Gj+xUGHic9K0HzIt mRbhJVea4N3Z/wdT5xi/mylURZxKTy6TNBY4/aBvPx9G9xAg+sEF8Y56mklBVXhpzwvd va+gaiK1phRno7+nNnVnu8YVl9291xdtPBri6K6OAetrakUo8d3GRC7DQjg7LCBuaLbX gZhw== X-Gm-Message-State: AOJu0YyjSVt+lP2vizONZ9oOx8wOpZSIwOXc7dYg5526J1gg/MWJBvuR HNFC9suUiDkbi4G+TCN5HxsHv7L9vH8QZCYwOO2O8MGeI8YVXvxjYoa/cZeN/4E= X-Google-Smtp-Source: AGHT+IGODZ11G3Mr2GejD/VWy8mIzjCb436wjzXNHzaQVmUG+OXBs1v2yZaxq/lIrS1c7gfDucDlPA== X-Received: by 2002:a05:6512:286:b0:52f:c2ef:a76a with SMTP id 2adb3069b0e04-5309b2720a2mr3572089e87.18.1722226150195; Sun, 28 Jul 2024 21:09:10 -0700 (PDT) Received: from elephant ([5.3.222.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52fd5c28e46sm1328915e87.242.2024.07.28.21.09.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jul 2024 21:09:09 -0700 (PDT) From: "Artyom V. Poptsov" To: Maxim Cournoyer Subject: Re: [bug#70880] [PATCH v2 8/8] gnu: prusa-slicer: Update to 2.7.4. In-Reply-To: <87bk2u1o3r.fsf@gmail.com> (Artyom V. Poptsov's message of "Thu, 18 Jul 2024 22:44:56 +0300") References: <6ad909cee24b19c9d2e834ddbe1de8f7d8b76979.1719853592.git.poptsov.artyom@gmail.com> <87o776ufw1.fsf@gmail.com> <87ttgt8mt6.fsf@gmail.com> <87bk2u1o3r.fsf@gmail.com> Date: Mon, 29 Jul 2024 07:08:59 +0300 Message-ID: <87cymwj0v8.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hello! Just a little ping. ;-) It's been more than two weeks since I've sent the patch set. =2D avp =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJNBAEBCgA3FiEEAf2F9Bp7f4IFgwalk16+BzbchX4FAmanFeEZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRCTXr4HNtyFfpUqEACrMoSrBiT8Wg5r+5vbY/go 0SwHF9Gwk85QVykJYDbgPiwBFkBB+MtX9xILBx/tCzxrc5To9z9eSDf7I2hUuImG pwa4LkDf6n4IJ9461ZQFfLmK4Mp/Su7w9SA9TWne/esGv0oy5feBw/kiZarHefUJ LaES3RmZGVggaEhviSwdlPyWqjrqlWLBHN7x53/WqwabkWu4ohQakqP2R2jddibH SEWv/RhATZZrCUOMYJF2u6u+zEE0krwkPCOspuOpfWCeq+At4NXd9MRo5zHprUYr sUF5NpEY4Bb6L7O1uL47bap2KGto6wF1No6DxK3IDWdCh/KeKlcn1DD61uGJ6ZRv 3QIkbtn482nABLT4NK4IK2qPKHJxq5Au3+j98cmLk88h8V/xm8U9eAeFhMXqkJCy FCYLGpVBMPRiP0buu5zcE5qQmeGU3aDEr2BWVNyQscyK7E+SGvaz2bdYMVTqCmRx MUS7J9b/+JGJEKc8utZZk3jcqeCgL/G+1VzW0gC9e5tCwG+/3kJX4n4JIaw70w+R 5LGAtZKUgOj/iynPRwhsSirfkyKGvH11sHFpP2r4IQ7Du/M2nyQOrvo4au2GrJ87 q0StUDV8GxBMkkaHCE/EH8IJtr4kONOaQTdB9Yl9/CZdhF9ivNXnfGQZIuGDZmrc y+LAG6QBtbK6wbLE3hNvFg== =/hvV -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 07 14:47:00 2024 Received: (at 70880) by debbugs.gnu.org; 7 Aug 2024 18:47:00 +0000 Received: from localhost ([127.0.0.1]:35079 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sblgZ-0007Rm-Q7 for submit@debbugs.gnu.org; Wed, 07 Aug 2024 14:47:00 -0400 Received: from mail-lj1-f179.google.com ([209.85.208.179]:54724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sblgY-0007Ra-BH for 70880@debbugs.gnu.org; Wed, 07 Aug 2024 14:46:59 -0400 Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2f1870c355cso1279641fa.1 for <70880@debbugs.gnu.org>; Wed, 07 Aug 2024 11:46:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723056326; x=1723661126; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=pI4LZSzZqGSPtOLUlidoUBcYNjGyjs5K34DHOpOtUSQ=; b=Ksfyz6nhom75/SZPw5DMhi+4kFyvkAhywkBz46Uld3Cc3jH+DnD8V26ks3WaKkTHTP 0yenjec2BQqFQLn2RV/P115Yj+lbA+DwCF+hPx2fsFnjvccIiM9hILgy2KssZHS71mkm KXkiI4RpGClZyth1WEKERsNvF9yo7s0mYWAd6SC8fS/YCLAuhK/TrGSQ3r3ARv+3zTsp ysUMLb5WrYyEJTFmlA1poC3bdPnAsxGPVCG3inA5LkTa9cfI2Y1RQdzktIbI14jG/eiP yhSlm7FqhgVfwh5M5Ex+WM3pcgdGAnQPZmzZDxL8kc//ne9Q/lEz7C/UJAutBs0oSazL xPnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723056326; x=1723661126; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=pI4LZSzZqGSPtOLUlidoUBcYNjGyjs5K34DHOpOtUSQ=; b=jtQckrWweVr5sW8Dkv97JUdLEP8Q53Z1dZY9cfzX6A0f4j7Gf+x9i5hEQGKcaTkKc2 bDTzV1JPWqmlhT83XNrzXCQXk0fLunDiOJttKhG80pLKqWLElI3CUPO6eBgbzjjzfOr4 n/OKu+bNyXaqzoNFiQa+JMBsxES6jbDLTudRpqhxSr8Jv324dsLj3RaANZwUOJDcF34d o+hRgYpFreYzLBK61eH0uEfsCWABZ51D9KbC71CwsySMlDg3vLhcVic4+dN8duHwkY1s zP1XvL1meHd090v3uo73haWNx9IBFLGBxateyARkh4GtHic4Osp5c6nkhGr7Vjl7nmD6 AVFQ== X-Gm-Message-State: AOJu0YzJODtZHyZVnRbB9hKzGyeBVuZ3Mrn+X60KKr83qUci0X4IN9D3 4vK2ERsZLjLmTJ6bbR8qXamh7ngYb+N1ZegE0Ig0M8X9U8KCIkrbaysTOU0h X-Google-Smtp-Source: AGHT+IGbed26dTQn1GIUe+1XoBZuEWxTg5Kg+ijFfQuQ/0az1cIj3C/vkpRNvClNibfIZx1hA22Clw== X-Received: by 2002:a2e:a555:0:b0:2f1:6cb1:44c0 with SMTP id 38308e7fff4ca-2f16cb146b9mr121090501fa.6.1723056325510; Wed, 07 Aug 2024 11:45:25 -0700 (PDT) Received: from elephant ([95.79.76.145]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2f15e17eda3sm19556601fa.17.2024.08.07.11.45.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Aug 2024 11:45:24 -0700 (PDT) From: "Artyom V. Poptsov" To: Maxim Cournoyer Subject: Re: [bug#70880] [PATCH v2 8/8] gnu: prusa-slicer: Update to 2.7.4. In-Reply-To: <87cymwj0v8.fsf@gmail.com> (Artyom V. Poptsov's message of "Mon, 29 Jul 2024 07:08:59 +0300") References: <6ad909cee24b19c9d2e834ddbe1de8f7d8b76979.1719853592.git.poptsov.artyom@gmail.com> <87o776ufw1.fsf@gmail.com> <87ttgt8mt6.fsf@gmail.com> <87bk2u1o3r.fsf@gmail.com> <87cymwj0v8.fsf@gmail.com> Date: Wed, 07 Aug 2024 21:45:12 +0300 Message-ID: <87ikwcnpdz.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880 Cc: 70880@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hello! Just a little ping. ;-) It's been more than three weeks since I've sent the patch set. =2D avp =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJNBAEBCgA3FiEEAf2F9Bp7f4IFgwalk16+BzbchX4FAmazwL8ZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRCTXr4HNtyFfsEAEAC5iGmfpwfwRlvm9BQH8A66 /kIf0hZuTfx9Rj4CO0PP91Xbc3FlaUkADYJoBP6/KD4713OyJl6Zx6+8ORwSa3Pk wMH/Z9IeABbKhYE35z5HRx47DC8rZlxoejE2laWxemmztZutwp++5h8VDXl4XJgK E3y2X6avkCJyu7iBEoA5FB3L/qSQcpnJTrYzOcL5mfa0y/OGGZVcOHk6OLHUQYIR rQOsCVSUOSnIZYg7mkWYYcK/z73q9MKKA9XYBqfARtwbAdABu27KTH5XKN56NaPW BXXA4vCYf4j2tdGh9V8nNpGpTJRsbsb8iZQCpQRAOTfcZhUnnBmyJc/H3Gn573W0 XkWqNl2jvZlACC3vUt4oK2p1XnByAoGFMUKAvaGAjSg/ox8L0grYirI7KfJCpT07 A1k3S6eMDcSfdxMN15cK4LItFI1oXOhaN6ihUQzXxxrhI5geE9f62WA1lLQSCV2J JR/SmA0UESL8TeP8y8ppoKhagjBMNwjvo7NLVhxKpCvH99u81IIsqm51Au8HGZGc 4eyx3Nsc/2jSrL6z+48rCnXD1sUDmlherst0eR+F1cOYQZsIiApS6SFxKx4Cdd7P gT3jpWe2zoSjKPy/mVrKnTv1Vc4LY+/s6eK97BSDm6ic9yCsv1SfX+ytDDKwo1R7 4M2v1BHDFlaxnBGCMPIxMA== =ISXa -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 12 18:43:09 2024 Received: (at 70880-done) by debbugs.gnu.org; 12 Aug 2024 22:43:09 +0000 Received: from localhost ([127.0.0.1]:43909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sddkr-0006sW-8l for submit@debbugs.gnu.org; Mon, 12 Aug 2024 18:43:09 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:54507) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sddkp-0006s1-5d for 70880-done@debbugs.gnu.org; Mon, 12 Aug 2024 18:43:08 -0400 Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4280bbdad3dso36655815e9.0 for <70880-done@debbugs.gnu.org>; Mon, 12 Aug 2024 15:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723502488; x=1724107288; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=lh5DBrFP1exKAQs3wug5wWg11SV/Ra0nlvJNfwZXUSU=; b=OhOtHU5OfA1pbHoOcUZr8FLBq34XWBawuZHJkb8ttNxMRwgUKe+uzGaKjyxfjE1Yw1 f7qgnkHxczPBJgCfwNtrI0h3Yjd2YGRIC9Qqoff8wXMHluOJxMW+59zWF9MBmB3qdPfK TrLbRRkHq5WJBVhwe+SgIeiQLOl4AZtA9RUaKpu349gQ0KI5CgletmeVNwR44X+zSa4Y q4QE0iPkw5u1ABjR4tsf8WCG2xK0dCQgr4OK5RUZzo7+TcV0aZDCQFPbaQUP6bpyiFQY /MHv1cnrdLHEnYnmbCqsKx+LFK5DQLH3iHaNKLe8+cgX1GiT5MOK0+6PnZMn02J6KSDz ye1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723502488; x=1724107288; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=lh5DBrFP1exKAQs3wug5wWg11SV/Ra0nlvJNfwZXUSU=; b=jwxmppYahEa98osgZ+rD5gFUp0cbypGXJy47Qu++x73qO4MLZkyP9Ts4PclsXaFEr9 yS+NhIL2FPnjEe/58ukTf4eH9DIINLizCMJJnM+YvhH1WSGSqQZu8S20OQG+vxPSuUvk emI6SqwToJDlr7K87rF9q0Z7rA10u4xAUS/iq84d+aMZFuZWD+9mSAqQBHPEPCuw1xm4 OFrC11ZUBemTIosXNskPpeuGjrdyCxzqgWFlk1SzWSGwIhGUlqoDVSrNXFdGbFLfHMCc RbvV2cIBbx+NlDply01Qu1J9ro9ABTTMo48d1k8HDCbEqGdZ0Q/wrYm8olu2IRX0Awub onAQ== X-Gm-Message-State: AOJu0YxlGa6hysf+eiZgvwC16Ywuw9LGfkUKSYcqFOz38PwTA3NG8VLW cV2PfKXnDnx7sjB0acXx9da6OAK+Kclim2tG0w3Phf1Ca3dM6p7a8V1ikzdf X-Google-Smtp-Source: AGHT+IGs4kLQdN+/L6AXmREad08/0kv/zPDfLdYXXM4c9EDs5K/4F3tYqCblj8wiUxY/7M4CEjvtkw== X-Received: by 2002:a05:600c:1da7:b0:428:1b0d:8657 with SMTP id 5b1f17b1804b1-429d48191e8mr13721865e9.22.1723502488184; Mon, 12 Aug 2024 15:41:28 -0700 (PDT) Received: from guxtil (bagu-15-b2-v4wan-170076-cust245.vm21.cable.virginm.net. [77.98.0.246]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-429c751a554sm120604685e9.22.2024.08.12.15.41.27 for <70880-done@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 15:41:27 -0700 (PDT) From: Sharlatan Hellseher To: 70880-done@debbugs.gnu.org Subject: [PATCH 0/8] gnu: prusa-slicer: Update to 2.7.4. Date: Mon, 12 Aug 2024 23:41:16 +0100 Message-ID: <87zfphz7n7.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70880-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Hi, Pushed v3 as adea135c8c...fe7c622ab0 to master. -- Oleg --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAma6j4wACgkQdtcnv/Ys 0rVh7Q//YRRiixdu83mKwPq37dmCPAcECmyGys8t4kWeZDwpTS2DLfWWbeEZP8YC rwyx6NJq9h/7Aeh9u4q7cQT+hAsWGePSdQkNW4dn+MHRtaQr44LXN4uBvMygIcZR BJ7ijjnFxPRBWKebrKXGmBEi3f3x+7bg9RU9lDRohxbIeZekyOohJHTPJnQvXGgJ u7oFnQUhCrDYL5+ooQxEqauZoglSnjniYPE5ZPV1VWC+BRyalCr8bWxDFLus0j9l TGpE3xNy73CP0153p5y6TShcztCfxEP1SIB2omPXYUeRDfx9onQI2E3rrRRl5TN/ iBocqndpOFuGd9XVzJQ/u0DkFiU/HbwoS/b3K5e6yKVQzpf8TdSR3GJu+vNyHpGG NGcoEbUSj4vBCV4Uw234cJ6X10KjG2K5cjka7nvlT39V+ZtdQKRoaaJClVb9JJ43 WvQ2SQxOy86HIXTEiVeqiDJT7LTHEpwdNeA5NUpSVAScjZ+KGUogMxBKDbrdyIem JcE9TOuEYTIS2RNXeIbeE591WG3abSza7c2aDvh/tEyYg8inNfac+APuaaGblq4k 9NY1hM6a8oXvRtwYW2Qpkv+WLguuJFQFGUbH7nyE9GmRhyqDqW3FOGGmNC+sE8++ NFdQvrWPfJXbQJx9/qfTrPkmoJe2YlHbKk+n8rjbfg2csMjkxPo= =85xA -----END PGP SIGNATURE----- --=-=-=-- From unknown Fri Jun 20 18:21:16 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 10 Sep 2024 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator