unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Sughosha <Sughosha@proton.me>
Cc: "59725@debbugs.gnu.org" <59725-done@debbugs.gnu.org>
Subject: bug#59725: [PATCH] gnu: paulxstretch: Fix paths
Date: Tue, 21 Mar 2023 09:40:21 -0400	[thread overview]
Message-ID: <87ttyeql2y.fsf_-_@gmail.com> (raw)
In-Reply-To: <nwZtzlZ5wUYt32ueZDjLnJjEM7ytEUzeIG7v4p92VsKaIuekQt1AmNR32GcZVq6lCGj9-LQ7-MpWcuor_IqXsnn5L5ry7Auc6g4GyGk6ExI=@proton.me> (Sughosha@proton.me's message of "Fri, 06 Jan 2023 13:27:07 +0000")

Hi,

Sughosha <Sughosha@proton.me> writes:

> This method seems more precise, since if the file or directory does not exist, build fails.

It also allows Guix users to rewrite package inputs, contrary to the
previous approach which would have hard-coded the references to the
package variables in a definitive way.

> * gnu/packages/music.scm (paulxstretch): Fix paths.
>   [arguments]: Add fix-paths phase.
>   [inputs]: Add dconf and glib:bin.

I've modified the commit message like so:

--8<---------------cut here---------------start------------->8---
gnu: paulxstretch: Patch paths.

* gnu/packages/music.scm (paulxstretch) [arguments]: Add patch-paths phase.
[inputs]: Add dconf, fontconfig and glib:bin.
--8<---------------cut here---------------end--------------->8---

Capitalizing the sentence following the ':', removing the hanging indent
in the GNU Changelog commit message, and adding the missing fontconfig.

> ---
>  gnu/packages/music.scm | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
>
> diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
> index 5be767a138..bdd856396d 100644
> --- a/gnu/packages/music.scm
> +++ b/gnu/packages/music.scm
> @@ -2481,6 +2481,23 @@ (define-public paulxstretch
>       (list #:tests? #f                            ;no test suite
>             #:phases
>             #~(modify-phases %standard-phases
> +               (add-after 'unpack 'fix-paths
> +                 (lambda* (#:key inputs #:allow-other-keys)
> +                   (substitute*
> +                    "deps/juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CodeBlocks.h"
> +                     (("/usr/include/freetype2")
> +                      (search-input-directory inputs "/include/freetype2")))
> +                   (substitute*
> +                    "deps/juce/modules/juce_graphics/native/juce_linux_Fonts.cpp"
> +                     (("/etc/fonts")
> +                      (search-input-directory inputs "/etc/fonts")))
> +                   (substitute*
> +                    "deps/juce/modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.cpp"
> +                     (("/usr/bin/dconf")
> +                      (search-input-file inputs "/bin/dconf"))
> +                     (("/usr/bin/gsettings")
> +                      (search-input-file inputs "/bin/gsettings")))))
> +                    
>                 (replace 'install
>                   (lambda _
>                     (let* ((bin (string-append #$output "/bin"))
> @@ -2507,8 +2524,11 @@ (define-public paulxstretch
>      (native-inputs (list pkg-config))
>      (inputs (list alsa-lib
>                    curl
> +                  dconf
>                    fftwf
> +                  fontconfig
>                    freetype
> +                  `(,glib "bin")
>                    jack-1
>                    libx11
>                    libxcursor

Applied, after breaking some long lines to fit under 80 chars.

As others reported, there is still the segfault when running the binary,
but at least this probably brings us closer to something that fully works.

Let's open other issues for the remaining problems found.

-- 
Thanks,
Maxim




      parent reply	other threads:[~2023-03-21 13:41 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-30 15:04 [bug#59725] [PATCH] gnu: paulxstretch: Fix paths Sughosha via Guix-patches via
2023-01-05 21:48 ` Ludovic Courtès
2023-01-06 13:27 ` [bug#59725] [PATCH v2] " Sughosha via Guix-patches via
2023-01-31  5:51   ` [bug#59725] [PATCH] " 宋文武 via Guix-patches via
2023-02-06 22:49     ` Sughosha via Guix-patches via
2023-03-21 13:40   ` Maxim Cournoyer [this message]

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=87ttyeql2y.fsf_-_@gmail.com \
    --to=maxim.cournoyer@gmail.com \
    --cc=59725-done@debbugs.gnu.org \
    --cc=Sughosha@proton.me \
    /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).