GNU bug report logs - #34433
[PATCH 1/1] gnu: Fix aegisub.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 34433 in the body.
You can then email your comments to 34433 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: <guix-patches <at> gnu.org>
Subject: [PATCH 1/1] gnu: Fix aegisub.
Date: Mon, 11 Feb 2019 13:36:41 +0100

[Message part 1 (text/plain, inline)]

* gnu/packages/video.scm (aegisub)[arguments]: Add phase to fix
boost headers.
---
 gnu/packages/video.scm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c0f439ea93..fb964f412f 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2877,7 +2877,20 @@ programmers to access a standard API to open and decompress media files.")
          (add-before 'configure 'fix-ldflags
            (lambda _
              (setenv "LDFLAGS" "-pthread")
-             #t)))))
+             #t))
+         (add-after 'unpack 'fix-boost-headers
+               (lambda _
+                 (for-each
+                  (lambda (f)
+                    (substitute* f
+                      (("#include <boost/gil/gil_all.hpp>")
+                       "#include <boost/gil.hpp>")))
+                  (list
+                   "src/subtitles_provider_libass.cpp"
+                   "src/colour_button.cpp"
+                   "src/video_provider_dummy.cpp"
+                   "./src/video_frame.cpp"))
+                 #t)))))
     (inputs
      `(("boost" ,boost)
        ("desktop-file-utils" ,desktop-file-utils)
-- 
2.20.1

[Message part 2 (application/pgp-signature, inline)]

Message #8 received at 34433 <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
Cc: 34433 <at> debbugs.gnu.org
Subject: Re: [bug#34433] [PATCH 1/1] gnu: Fix aegisub.
Date: Mon, 11 Feb 2019 13:42:44 +0100

Hi Björn,

> * gnu/packages/video.scm (aegisub)[arguments]: Add phase to fix
> boost headers.

Thanks!

> +         (add-after 'unpack 'fix-boost-headers
> +               (lambda _
> +                 (for-each
> +                  (lambda (f)
> +                    (substitute* f
> +                      (("#include <boost/gil/gil_all.hpp>")
> +                       "#include <boost/gil.hpp>")))
> +                  (list
> +                   "src/subtitles_provider_libass.cpp"
> +                   "src/colour_button.cpp"
> +                   "src/video_provider_dummy.cpp"
> +                   "./src/video_frame.cpp"))
> +                 #t)))))

It’s better to give “substitute*” a list of files instead of using
“for-each”.

      (lambda _
        (substitute* '("src/subtitles_provider_libass.cpp"
                       "src/colour_button.cpp"
                       "src/video_provider_dummy.cpp"
                       "src/video_frame.cpp")
          (("#include <boost/gil/gil_all.hpp>")
           "#include <boost/gil.hpp>"))
        #t)

Okay with these changes.

-- 
Ricardo

Message #13 received at 34433-done <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: Ricardo Wurmus <rekado <at> elephly.net>
Cc: 34433-done <at> debbugs.gnu.org
Subject: Re: [bug#34433] [PATCH 1/1] gnu: Fix aegisub.
Date: Wed, 13 Feb 2019 10:44:52 +0100

[Message part 1 (text/plain, inline)]

On Mon, 11 Feb 2019 13:42:44 +0100
Ricardo Wurmus <rekado <at> elephly.net> wrote:

> It’s better to give “substitute*” a list of files instead of using
> “for-each”.

With this change pushed as

f6974e15cfce8128d9a3fb425671b1f6fc05e49b

Thank you,

Björn

[Message part 2 (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.