Hello,

ludo@gnu.org (Ludovic Courtès) writes:

> Nicolas Goaziou <mail@nicolasgoaziou.fr> skribis:
>
>> IIUC, the Makefile is a wrapper that calls the cmake command, which, in
>> turn, generates a new make target that the initial make call can
>> process... The new target is responsible for, at the very least,
>> generating the translation files.
>
> Wonderful.  :-)

It's even more wonderful when you realize that at 3am.

>> About the bundled freetype library: it is skipped per the cmake option.
>> Should we also delete it from source in a snippet or is it fine as-is?
>
> It’s always safer to remove it in a snippet.

OK.

> I started doing that and then noticed that removing all of thirdparty/
> won’t cut it.  Yet there’s quite a lot of stuff in that directory, so it
> would be good to make sure we use as little as possible of this bundled
> code:
>
> $ ls /tmp/guix-build-musescore-2.1.0.drv-0/MuseScore-2.1.0/thirdparty/
> beatroot  diff	intervaltree  kQOAuth  ofqf  portmidi  qzip  rtf2html  singleapp  xmlstream
>
> For example, we could add portmidi as an input.
>
> Could you take a look?

Fair enough.

The attached update includes the following changes:

  - un-bundle OpenSSL. Since it doesn't prevent compilation, do not even
    include ours, much like what Debian does.

  - remove unused portmidi from "thirdparty", per the following snippet
    in CMakeLists.txt

      # Disable components not supported on Linux/BSD
      if (NOT APPLE AND NOT MINGW)
             set(NIX_NOT_AVAIL "Not available on Linux/BSD")
             option(BUILD_PORTMIDI "PortMidi disabled on Linux. (It uses ALSA but it's better to use ALSA directly)" OFF)
      endif (NOT APPLE AND NOT MINGW)

  - un-bundle freetype, remove it from the "thirdparty" directory.

  - add "gtk+-bin" as inuput so that we can run `gtk-update-icon-cache'
    (still not sure this is really needed).

WDYT?

Regards,

-- 
Nicolas Goaziou                                                0x80A93738