[debbugs-tracker] bug#34433: closed ([PATCH 1/1] gnu: Fix aegisub.)

[GNU bug Tracking System]

Your message dated Wed, 13 Feb 2019 10:44:52 +0100
with message-id <address@hidden>
and subject line Re: [bug#34433] [PATCH 1/1] gnu: Fix aegisub.
has caused the debbugs.gnu.org bug report #34433,
regarding [PATCH 1/1] gnu: Fix aegisub.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
34433: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=34433
GNU Bug Tracking System
Contact address@hidden with problems

--- Begin Message --- Subject: [PATCH 1/1] gnu: Fix aegisub. Date: Mon, 11 Feb 2019 13:36:41 +0100

* 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

pgpWQKy5EASNV.pgp
Description: OpenPGP digital signature

--- End Message ---

--- Begin Message --- Subject: Re: [bug#34433] [PATCH 1/1] gnu: Fix aegisub. Date: Wed, 13 Feb 2019 10:44:52 +0100

On Mon, 11 Feb 2019 13:42:44 +0100
Ricardo Wurmus <address@hidden> 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

pgpgmxliMixsr.pgp
Description: OpenPGP digital signature

--- End Message ---