unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Ivan Gankevich <i.gankevich@spbu.ru>
To: Liliana Marie Prikler <liliana.prikler@gmail.com>
Cc: 49713@debbugs.gnu.org
Subject: [bug#49713] [PATCH 3/3] gnu: Add prusa-slicer.
Date: Mon, 20 Sep 2021 00:39:36 +0300	[thread overview]
Message-ID: <YUeuGPnE/7OOkO68@gust> (raw)
In-Reply-To: <1e440c6a0f9e9e328eb83519e1df38f506a3d4b3.camel@gmail.com>

>> +          ;; 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




  reply	other threads:[~2021-09-19 21:40 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-23 21:00 [bug#49713] [PATCH 1/3] gnu: cereal: Use cmake to build and install the library Ivan Gankevich
2021-07-23 21:07 ` [bug#49713] [PATCH 2/3] gnu: Add libigl Ivan Gankevich
2021-09-18 17:17   ` Liliana Marie Prikler
2021-09-19 20:18     ` Ivan Gankevich
2021-07-23 21:08 ` [bug#49713] [PATCH 3/3] gnu: Add prusa-slicer Ivan Gankevich
2021-09-18 17:26   ` Liliana Marie Prikler
2021-09-19 21:39     ` Ivan Gankevich [this message]
2021-09-19 21:53       ` Liliana Marie Prikler
2021-09-20 22:17         ` Ivan Gankevich
2021-09-21 12:12           ` bug#49713: " Liliana Marie Prikler
2021-09-18 15:53 ` [bug#49713] Patches work, how to upstream them phodina via Guix-patches via
2021-09-18 17:13 ` [bug#49713] [PATCH 1/3] gnu: cereal: Use cmake to build and install the library Liliana Marie Prikler
2021-09-19 18:27   ` Ivan Gankevich
2021-09-19 18:26 ` [bug#49713] [PATCH 1/3 v2] " Ivan Gankevich
2021-09-19 20:18 ` [bug#49713] [PATCH 2/3 v2] gnu: Add libigl Ivan Gankevich
2021-09-19 21:38 ` [bug#49713] [PATCH 3/3 v2] gnu: Add prusa-slicer Ivan Gankevich
2021-09-20 22:15 ` [bug#49713] [PATCH v3 1/3] gnu: cereal: Use cmake to build and install the library Ivan Gankevich
2021-09-20 22:15   ` [bug#49713] [PATCH v3 2/3] gnu: Add libigl Ivan Gankevich
2021-09-20 22:15   ` [bug#49713] [PATCH v3 3/3] gnu: Add prusa-slicer Ivan Gankevich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YUeuGPnE/7OOkO68@gust \
    --to=i.gankevich@spbu.ru \
    --cc=49713@debbugs.gnu.org \
    --cc=liliana.prikler@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).