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 6KJMI6TqeGadgQAAqHPOHw:P1 (envelope-from ) for ; Mon, 24 Jun 2024 03:40:20 +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 6KJMI6TqeGadgQAAqHPOHw (envelope-from ) for ; Mon, 24 Jun 2024 05:40:20 +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=ZB4AapaG; 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=1719200420; 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=GRvvhf0nZjHVDcFJXURWqS0LhRYz8Sc8JYgc4ge9Xpw=; b=duYFKnsHiP0fq8+5Zd3EI2pJJ7K70WnnplmaqGyZgMAYpyPMXWOUXJO6z3crH1xUVbdMBE ViXzE+b9Ugus+nozn4vE7MZ6Fk0lKi3gVY4ivs2/obDsePf8nKClIjQ/I0iPhM870s4e3i DkNinstxcOko/e0GDQ/dCbuhcxcVS7pnar9uy8AfOOtR0CYiIIhVk/W+Z+x7nf+xyi5dw+ OkzGRJNk1jYo9J5deJ0K6/IMmgIOXwPKOFINHgRiesGZmgQm8PpslmQwyZcnbwhfXxBhxM f5QJhU+VsaW1jouqZt7tklEXDTGFpioQIKtuqKXz4E1to1l+ZCYidpKK/glllg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=ZB4AapaG; 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=1719200420; a=rsa-sha256; cv=none; b=uqTrx7xADWA8fzbbegjVHnJDJ5IZDM9zYRQCfOQMDzaiUxaF4UpbCKP6XVmPi3P/R9TSaZ H/8fxhVTUpnC6722KACW6xvds9qy+MB476KRmWD8F3ekZ76wIUWi3zS/EJv4bxmnixz8gZ +Zua4YXeDWg3GSxNuqZIZ+Lg+xlURNjgFiX2KD9HKELFku7jIwRvEVdJzfmPkdAUYcH6aZ 0Wps7PUbnqde7TBjLdLki56+eU3aToK28Qd693CbFem2xLGZOkz4M9dym8JgqxwzRDXNkq vroV75qN0giVRSrxA4S+BuAs2gpkasCt1bJqRc1ndJ/RHMKZGyFuNGULsF6mBQ== 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 60F9854FD9 for ; Mon, 24 Jun 2024 05:40:20 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sLaYl-0000gn-KA; Sun, 23 Jun 2024 23:40:03 -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 1sLaYj-0000gF-Nw for guix-patches@gnu.org; Sun, 23 Jun 2024 23:40:01 -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 1sLaYj-0002q6-E0 for guix-patches@gnu.org; Sun, 23 Jun 2024 23:40:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sLaYk-0007AQ-5K for guix-patches@gnu.org; Sun, 23 Jun 2024 23:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH 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: Mon, 24 Jun 2024 03:40:02 +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.171920036627452 (code B ref 70880); Mon, 24 Jun 2024 03:40:02 +0000 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 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-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: 60F9854FD9 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -5.26 X-Spam-Score: -5.26 X-TUID: nOt7OEDJeXeM 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