[aegisub] Fix build for icu-59.1

commit 6f2ba0be6ef3fb7885436245384ba316db57da7b Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Wed Dec 27 11:24:50 2017 +0000 Fix build for icu-59.1 aegisub.spec | 10 +++++++++- icu_59_buildfix.patch | 21 +++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) --- diff --git a/aegisub.spec b/aegisub.spec index 0e7d871..37bfb58 100644 --- a/aegisub.spec +++ b/aegisub.spec @@ -6,7 +6,7 @@ Name: aegisub Version: 3.2.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Tool for creating and modifying subtitles #src/gl/ - MIT license. See src/gl/glext.h @@ -17,6 +17,11 @@ URL: http://www.aegisub.org # https://github.com/Aegisub/Aegisub Source0: https://github.com/%{gituser}/%{gitname}/archive/v%{version}.tar.gz#/%{na... Patch0: %{name}-pthread.patch +# Fix compilation against icu 59.1 +# https://github.com/Aegisub/Aegisub/commit/dd67db47cb2203e7a14058e52549721... +%if 0%{?fedora} > 27 +Patch1: https://github.com/%{gituser}/%{gitname}/commit/dd67db47cb2203e7a14058e52... +%endif ExclusiveArch: i686 x86_64 armv7hl @@ -97,6 +102,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Dec 27 2017 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 3.2.2-7 +- Fix build for icu-59.1 + * Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org&gt; - 3.2.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/icu_59_buildfix.patch b/icu_59_buildfix.patch new file mode 100644 index 0000000..a15d656 --- /dev/null +++ b/icu_59_buildfix.patch @@ -0,0 +1,21 @@ +From dd67db47cb2203e7a14058e52549721f6ff16a49 Mon Sep 17 00:00:00 2001 +From: Maxime Gauduin <alucryd(a)archlinux.org&gt; +Date: Tue, 9 May 2017 04:01:47 +0200 +Subject: [PATCH] Fix compilation against icu 59.1 (#46) + +--- + src/utils.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/utils.cpp b/src/utils.cpp +index e1cde5e83..876c4c011 100644 +--- a/src/utils.cpp ++++ b/src/utils.cpp +@@ -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>