From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id vxNRLkKuR2HHfgAAgWs5BA (envelope-from ) for ; Sun, 19 Sep 2021 23:40:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id gKxFKUKuR2G4PgAAbx9fmQ (envelope-from ) for ; Sun, 19 Sep 2021 21:40:18 +0000 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 751B71DEE6 for ; Sun, 19 Sep 2021 23:40:18 +0200 (CEST) Received: from localhost ([::1]:55794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mS4Xp-0003Bd-Em for larch@yhetil.org; Sun, 19 Sep 2021 17:40:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mS4Xa-0003BT-Iu for guix-patches@gnu.org; Sun, 19 Sep 2021 17:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56851) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mS4Xa-0004K0-BO for guix-patches@gnu.org; Sun, 19 Sep 2021 17:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mS4Xa-0002N9-6g for guix-patches@gnu.org; Sun, 19 Sep 2021 17:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH 3/3] gnu: Add prusa-slicer. Resent-From: Ivan Gankevich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Sep 2021 21:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 49713@debbugs.gnu.org Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.16320875869086 (code B ref 49713); Sun, 19 Sep 2021 21:40:02 +0000 Received: (at 49713) by debbugs.gnu.org; 19 Sep 2021 21:39:46 +0000 Received: from localhost ([127.0.0.1]:40163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS4XK-0002MU-2r for submit@debbugs.gnu.org; Sun, 19 Sep 2021 17:39:46 -0400 Received: from mail.spbu.ru ([195.70.197.23]:35692 helo=cgp2.pu.ru) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS4XF-0002Lx-Qo for 49713@debbugs.gnu.org; Sun, 19 Sep 2021 17:39:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=spbu.ru; s=20180812; bh=lymUxuD384bZRxKbqlpb6oZ/Yn60DOTB+D6FLImlxYk=; h=In-Reply-To:Content-Transfer-Encoding:Content-Disposition:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; b=wBr7v0DEsQQitlM vrWug+14QtepumNDyRXTmFL449q84LFm1Gl+oqvvhlga1nxNuNo4oMqKj3LZifhbHSZEBb61rzw9p jKuaviKSSuhmDe7cXHBPKoLqL3WKrL7yd0n/UNKiYQ+E7eRus2YLdnf402d4w5W7/0ZrsNT7hMXgM dfnWyG6fnCQlsz1EGxXkkS+802bDCPV/gtr5EqY8CyQmUidNcinvf9MwBLNVWWa1rXTaMYrfdGIlU lpk3gaA/DqxADWwYuzSeFJApGD/742AqEC5MxLuOhSetBwt3zBz2MZPkKrZzRuEDc+4JzgAgDWysw SVEt5cWVp4+ztZ9xtaA== Received: from [91.122.31.171] (account st018947@spbu.ru HELO localhost) by spbu.ru (CommuniGate Pro SMTP 6.2.15) with ESMTPSA id 186751377; Mon, 20 Sep 2021 00:39:36 +0300 Date: Mon, 20 Sep 2021 00:39:36 +0300 From: Ivan Gankevich Message-ID: References: <20210723210801.9458-1-i.gankevich@spbu.ru> <1e440c6a0f9e9e328eb83519e1df38f506a3d4b3.camel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1e440c6a0f9e9e328eb83519e1df38f506a3d4b3.camel@gmail.com> 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632087618; 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: content-transfer-encoding:content-transfer-encoding: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=Do9EJcFmFQ2/5lsjZPbegw1BYSA0s8P57sLTj8jp/30=; b=BgAuS+/bWMeM4CWBzQI0MNHamca6zIqBJfgcAS/fQaR/0mZcuy6KmXt5SVI87NTaA09TfP 0RcZZJeus1wHqbkCHfLRdHVFp4Cs6fa+dTIEKDWHv3+eIKMseYVjuN5ZAisoRxQnPMaBfL r+A2MDZuR5CpFgsXU3I1wdQf0SmytE4Z9ufDue8ztq1jnvTJVs+2umTgDjLGhgJhEclAiB xXNNbF4o6Sl6O7UxcbybqbbFkGOigYDrvYHG+god+JlGYS9d8yfCLsB1bu/t0nft2Mie04 F/kt+1M9cNyAeyD0p9DghfZhMAPp8hl9QP9Ea/wF/gGu9Q2kitYFOMv1yJzwHA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632087618; a=rsa-sha256; cv=none; b=PUjj5lgRRCsp5aRPGDSLx2rYVMGXhk6KwoIeDl0GHSiInri+G81WI87HmmSzHFZffZn8F0 TA5Qf34Jytw1wjBP8STHIUoLmZedbddFwtj+u7TLcY4fSUNnzDOvq/9ZZUL/Zs0NUjMec8 QFXfZjDlYk35ctuMOCYRWNLjx65LspbE7Im1GT4+nKFZYfewPj+4HQ4muPL6mBbHz747Sv fi0L/+V8xmupuZE0YP0aCImKLWxzs3p1MhtDCSxfVdYF3q31iiLfboCVREUMqc63CIEmeC EuHevw1cS05kxAW1q98SzRWZN6OpsT5TSyToc8EGAF1NMYdIxoqzGD21orN62w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=spbu.ru header.s=20180812 header.b=wBr7v0DE; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.89 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=spbu.ru header.s=20180812 header.b=wBr7v0DE; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 751B71DEE6 X-Spam-Score: -0.89 X-Migadu-Scanner: scn0.migadu.com X-TUID: 78P0YidBBezs >> + ;; CMake is unable to find headers from glib, pango and >> gtk+ >> + ;; when compiling src/slic3r. Here we add them via >> environment variables. >> + (add-before 'configure 'add-glib-pango-gtk+ >Upstream already appears to search for GTK+3 with their CMake setup. >Perhaps that's why it doesn't find GTK+2? I changed GTK+2 to GTK+3 and removed the whole “add-glib-pango-gtk+” phase. >> + (add-before 'configure 'unbundle-3d-party-libraries >> + ;; 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. >> + (lambda _ >> + (delete-file-recursively "src/hidapi") >> + (delete-file-recursively "src/eigen") >> + (delete-file-recursively "src/libigl/igl") >> + (substitute* "src/CMakeLists.txt" >> + (("add_subdirectory\\(libigl\\)" all) >> + (string-append >> + all "\ninclude_directories(libigl INTERFACE >> libigl::core)")) >> + (("add_subdirectory\\(hidapi\\)") "") >> + (("include_directories\\(hidapi/include\\)") "")) >> + ;; Do not link with bundled hidapi library. >> + (substitute* "src/slic3r/CMakeLists.txt" >> + (("\\bhidapi\\b") ""))))))) >Unbundling should be done in the snippet rather than at build time. Moved deletion of directories to the snippet. >Try sorting the inputs alphabetically, also w.r.t. gtk+-2, see above. Now its is sorted and no more GTK+2. Thanks for your corrections. I’ve sent the updated version of this patch via “git send-email”. Regards, Ivan