Subject: bug#34433: closed (Re: [bug#34433] [PATCH 1/1] gnu: Fix aegisub.)

From: [email-masked] (GNU bug Tracking System)
Date: Wed, 13 Feb 2019 09:45:04 +0000

Your bug report

#34433: [PATCH 1/1] gnu: Fix aegisub.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
34433: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=34433
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#34433] [PATCH 1/1] gnu: Fix aegisub.
From: Björn Höfling <[email-masked]>
To: Ricardo Wurmus <[email-masked]>
Cc: [email-masked]
Date: Wed, 13 Feb 2019 10:44:52 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

On Mon, 11 Feb 2019 13:42:44 +0100
Ricardo Wurmus <[email-masked]> 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

Subject: [PATCH 1/1] gnu: Fix aegisub.
From: Björn Höfling <[email-masked]>
To: <[email-masked]>
Date: Mon, 11 Feb 2019 13:36:41 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

* 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