[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#32361] [PATCH 1/1] gnu: aegisub: Fix build.
From: |
Björn Höfling |
Subject: |
[bug#32361] [PATCH 1/1] gnu: aegisub: Fix build. |
Date: |
Fri, 3 Aug 2018 13:52:13 +0200 |
* gnu/packages/video.scm (aegisub)[source]: Add patch,
[arguments]: Add CXXFLAGS, Return #t from fix-ldflags phase.
* gnu/packages/patches/aegisub-icu59-include-unistr.patch: New file
* gnu/lokal.mk (dist_patch_DATA): Register it.
---
gnu/local.mk | 1 +
.../patches/aegisub-icu59-include-unistr.patch | 12 ++++++++++++
gnu/packages/video.scm | 10 +++++++---
3 files changed, 20 insertions(+), 3 deletions(-)
create mode 100644 gnu/packages/patches/aegisub-icu59-include-unistr.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index d1f9a193b..5953cf3bb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -565,6 +565,7 @@ dist_patch_DATA =
\
%D%/packages/patches/aegis-perl-tempdir2.patch \
%D%/packages/patches/aegis-test-fixup-1.patch \
%D%/packages/patches/aegis-test-fixup-2.patch \
+ %D%/packages/patches/aegisub-icu59-include-unistr.patch \
%D%/packages/patches/agg-am_c_prototype.patch \
%D%/packages/patches/amule-crypto-6.patch \
%D%/packages/patches/ansible-wrap-program-hack.patch \
diff --git a/gnu/packages/patches/aegisub-icu59-include-unistr.patch
b/gnu/packages/patches/aegisub-icu59-include-unistr.patch
new file mode 100644
index 000000000..78414741b
--- /dev/null
+++ b/gnu/packages/patches/aegisub-icu59-include-unistr.patch
@@ -0,0 +1,12 @@
+This patch adds an include needed since icu59:
+Source:
https://git.archlinux.org/svntogit/community.git/plain/trunk/icu59.patch?h=packages/aegisub
+--- aegisub-3.2.2/src/utils.cpp 2014-12-08 02:07:09.000000000 +0200
++++ aegisub-3.2.2/src/utils.cpp 2017-04-26 11:11:15.438239182 +0300
+@@ -44,6 +44,7 @@
+ #include <boost/filesystem/path.hpp>
+ #include <map>
+ #include <unicode/locid.h>
++#include <unicode/unistr.h>
+ #include <wx/clipbrd.h>
+ #include <wx/filedlg.h>
+ #include <wx/stdpaths.h>
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 605e461a6..0b0a3b738 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -28,6 +28,7 @@
;;; Copyright © 2018 Leo Famulari <address@hidden>
;;; Copyright © 2018 Brendan Tildesley <address@hidden>
;;; Copyright © 2018 Arun Isaac <address@hidden>
+;;; Copyright © 2018 Björn Höfling <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2738,21 +2739,24 @@ programmers to access a standard API to open and
decompress media files.")
name "-" version ".tar.xz"))
(sha256
(base32
- "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5"))))
+ "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5"))
+ (patches (search-patches "aegisub-icu59-include-unistr.patch"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list "--disable-update-checker"
"--without-portaudio"
"--without-openal"
- "--without-oss")
+ "--without-oss"
+ "CXXFLAGS=-DU_USING_ICU_NAMESPACE=1")
;; tests require busted, a lua package we don't have yet
#:tests? #f
#:phases
(modify-phases %standard-phases
(add-before 'configure 'fix-ldflags
(lambda _
- (setenv "LDFLAGS" "-pthread"))))))
+ (setenv "LDFLAGS" "-pthread")
+ #t)))))
(inputs
`(("boost" ,boost)
("desktop-file-utils" ,desktop-file-utils)
--
2.18.0
pgpruEpQzqt8W.pgp
Description: OpenPGP digital signature