diff options
Diffstat (limited to 'multimedia/aegisub')
-rw-r--r-- | multimedia/aegisub/aegisub.SlackBuild | 5 | ||||
-rw-r--r-- | multimedia/aegisub/boost-1.68.patch | 34 | ||||
-rw-r--r-- | multimedia/aegisub/icu59.patch.gz | bin | 0 -> 240 bytes |
3 files changed, 39 insertions, 0 deletions
diff --git a/multimedia/aegisub/aegisub.SlackBuild b/multimedia/aegisub/aegisub.SlackBuild index 0bdf6b18bb..9cd0eccceb 100644 --- a/multimedia/aegisub/aegisub.SlackBuild +++ b/multimedia/aegisub/aegisub.SlackBuild @@ -70,7 +70,12 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i tools/Makefile +sed 's|gil/gil_all.hpp|gil.hpp|g' -i src/*.cpp +zcat $CWD/icu59.patch.gz | patch -p1 +patch -p1 < $CWD/boost-1.68.patch + +CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1' \ LDFLAGS="$LDFLAGS -lz" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/multimedia/aegisub/boost-1.68.patch b/multimedia/aegisub/boost-1.68.patch new file mode 100644 index 0000000000..5d917f607e --- /dev/null +++ b/multimedia/aegisub/boost-1.68.patch @@ -0,0 +1,34 @@ +From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001 +From: Jan Beich <jbeich@FreeBSD.org> +Date: Mon, 9 Jul 2018 20:15:29 +0000 +Subject: [PATCH] Keep using std::distance after Boost 1.68 + +src/search_replace_engine.cpp:256:14: error: call to + 'distance' is ambiguous + count += distance( + ^~~~~~~~ +/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = + boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >] +distance(_InputIter __first, _InputIter __last) +^ +/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = + boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >] + distance(SinglePassIterator first, SinglePassIterator last) + ^ +--- + src/search_replace_engine.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/search_replace_engine.cpp b/src/search_replace_engine.cpp +index 594c21e5e..14c71680d 100644 +--- a/src/search_replace_engine.cpp ++++ b/src/search_replace_engine.cpp +@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() { + if (MatchState ms = matches(&diag, 0)) { + auto& diag_field = diag.*get_dialogue_field(settings.field); + std::string const& text = diag_field.get(); +- count += distance( ++ count += std::distance( + boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re), + boost::u32regex_iterator<std::string::const_iterator>()); + diag_field = u32regex_replace(text, *ms.re, settings.replace_with); diff --git a/multimedia/aegisub/icu59.patch.gz b/multimedia/aegisub/icu59.patch.gz Binary files differnew file mode 100644 index 0000000000..a0253432b5 --- /dev/null +++ b/multimedia/aegisub/icu59.patch.gz |