From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id cJJqH3v1jWZNNQEAqHPOHw:P1 (envelope-from ) for ; Wed, 10 Jul 2024 02:44:11 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id cJJqH3v1jWZNNQEAqHPOHw (envelope-from ) for ; Wed, 10 Jul 2024 04:44:11 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=W2FmMguf; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720579451; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=EU2zLwOaW8umrYoHCpYEm5YaDqJbejz25POKenSxidA=; b=F3s+fuGVoiQFyoXDwKtRuC8D3jxu1+EcVtI8kjQuu7sVwbu8ScmE9dF6L6XDfJqZvQbK5J 7AV8RUiA/PHszUoO5hqF21gAHF45KqWbWV7AkP2gE/WpizCh/YOyBw7tr8cwb6iP7B1O0e /0j/lEui1z9THEFvuDg7tttW07cn0FvTv3kWENLRB2l6Tvd02ThcNap/Y6GjzVHud4dRtN bCg4Lr4htwA1BADS5Z9bRu0wKSNSpfPOAa3Xl3gbzn93XKd/dlgVfcRuIu7Ic7zTmHnQ4w 0W0JyiLCgvS/h7Vbm3GCb3ZKljJab0dCCf+ZyvJjh9TkJoXaR1+bZi7JSwlacA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=W2FmMguf; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720579451; a=rsa-sha256; cv=none; b=E1mqzvOX5dTmibDiRJUbWctn9MvlDOjYaH9C8sAFfFrQ1VQ2kRJ1FZZZElyRC3Ixo+x6wa CtwaiQknAnGMtOM4pZGVCbiABQCsQIaOsKk/MxLu1apiIxKbq4nKmmYu0PwgbjkPX2VR3u xL6OMmuU/GQg0YvGTtgcxmu9K20IQUC4n4hbsfxEFAvFq/NfCxi7XT4ajhZ35Ml4pRtOED ZseaPBoVaKsqTOchNbrBdOatPLTsGY5Oc+GEx7vXqRcE9ZvXoqmIZjVfCPG0xxWxseNk2j ClUU1639fNBk63HyUWxagdukgeCZSj5Lx7XUOPme34LKHDU4zVMQGXWDtgvPpw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4349113D46 for ; Wed, 10 Jul 2024 04:44:11 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sRNJF-0003Z3-PO; Tue, 09 Jul 2024 22:43:57 -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 1sRNJE-0003YT-AV for guix-patches@gnu.org; Tue, 09 Jul 2024 22:43:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sRNJD-00056L-Sh for guix-patches@gnu.org; Tue, 09 Jul 2024 22:43:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sRNJJ-0006vZ-Mu for guix-patches@gnu.org; Tue, 09 Jul 2024 22:44:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v2 8/8] gnu: prusa-slicer: Update to 2.7.4. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jul 2024 02:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70880 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: "Artyom V. Poptsov" Cc: 70880@debbugs.gnu.org Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.172057941826587 (code B ref 70880); Wed, 10 Jul 2024 02:44:01 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 4349113D46 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -5.30 X-Spam-Score: -5.30 X-TUID: Rhd80+UuT6fQ 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