From: ludo@gnu.org (Ludovic Courtès)
To: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Cc: 26956-done@debbugs.gnu.org
Subject: bug#26956: [PATCH] Add MuseScore
Date: Tue, 23 May 2017 13:55:25 +0200 [thread overview]
Message-ID: <878tlnwzwy.fsf@gnu.org> (raw)
In-Reply-To: <87zie7oqc6.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Sat, 20 May 2017 11:00:25 +0200")
Hi,
Nicolas Goaziou <mail@nicolasgoaziou.fr> skribis:
>> 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?
Awesome.
> From cf05d7aa5a2030ef6cbe073f44f69c65492870b7 Mon Sep 17 00:00:00 2001
> From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
> Date: Tue, 16 May 2017 17:55:29 +0200
> Subject: [PATCH] gnu: Add MuseScore.
>
> * gnu/packages/music.scm (musescore): New variable.
Pushed!
> + (snippet
> + ;; Un-bundle OpenSSL and remove unused libraries.
> + '(begin
> + (substitute* "thirdparty/kQOAuth/CMakeLists.txt"
> + (("-I \\$\\{PROJECT_SOURCE_DIR\\}/thirdparty/openssl/include ")
> + ""))
> + (substitute* "thirdparty/kQOAuth/kqoauthutils.cpp"
> + (("#include <openssl/.*") ""))
> + (for-each delete-file-recursively
> + '("thirdparty/freetype"
> + "thirdparty/openssl"
> + "thirdparty/portmidi"))
Note that there’s still bundled software under thirdparty/ (those I
listed above), but apparently we have no existing packages for these.
So let’s assume it’s OK to have them for now, but we may have to revisit
that and actually remove them later on.
Thank you!
Ludo’.
next prev parent reply other threads:[~2017-05-23 11:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-16 16:07 bug#26956: [PATCH] Add MuseScore Nicolas Goaziou
2017-05-16 21:37 ` Ludovic Courtès
2017-05-17 12:19 ` Nicolas Goaziou
2017-05-18 12:21 ` Ludovic Courtès
2017-05-20 9:00 ` Nicolas Goaziou
2017-05-23 11:55 ` Ludovic Courtès [this message]
2017-05-23 12:13 ` Nicolas Goaziou
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=878tlnwzwy.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=26956-done@debbugs.gnu.org \
--cc=mail@nicolasgoaziou.fr \
/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).