* [bug#34433] [PATCH 1/1] gnu: Fix aegisub.
@ 2019-02-11 12:36 Björn Höfling
2019-02-11 12:42 ` Ricardo Wurmus
0 siblings, 1 reply; 3+ messages in thread
From: Björn Höfling @ 2019-02-11 12:36 UTC (permalink / raw)
To: 34433
[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]
* 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#34433] [PATCH 1/1] gnu: Fix aegisub.
2019-02-11 12:36 [bug#34433] [PATCH 1/1] gnu: Fix aegisub Björn Höfling
@ 2019-02-11 12:42 ` Ricardo Wurmus
2019-02-13 9:44 ` bug#34433: " Björn Höfling
0 siblings, 1 reply; 3+ messages in thread
From: Ricardo Wurmus @ 2019-02-11 12:42 UTC (permalink / raw)
To: Björn Höfling; +Cc: 34433
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#34433: [PATCH 1/1] gnu: Fix aegisub.
2019-02-11 12:42 ` Ricardo Wurmus
@ 2019-02-13 9:44 ` Björn Höfling
0 siblings, 0 replies; 3+ messages in thread
From: Björn Höfling @ 2019-02-13 9:44 UTC (permalink / raw)
To: Ricardo Wurmus; +Cc: 34433-done
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
On Mon, 11 Feb 2019 13:42:44 +0100
Ricardo Wurmus <rekado@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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-13 9:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-11 12:36 [bug#34433] [PATCH 1/1] gnu: Fix aegisub Björn Höfling
2019-02-11 12:42 ` Ricardo Wurmus
2019-02-13 9:44 ` bug#34433: " Björn Höfling
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.