Date: Friday, April 5, 2019 @ 14:56:44 Author: felixonmars Revision: 449844
archrelease: copy trunk to community-staging-x86_64 Added: aegisub/repos/community-staging-x86_64/ aegisub/repos/community-staging-x86_64/PKGBUILD (from rev 449843, aegisub/trunk/PKGBUILD) aegisub/repos/community-staging-x86_64/boost-1.68.patch (from rev 449843, aegisub/trunk/boost-1.68.patch) aegisub/repos/community-staging-x86_64/icu59.patch (from rev 449843, aegisub/trunk/icu59.patch) ------------------+ PKGBUILD | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++ boost-1.68.patch | 34 ++++++++++++++++++++++ icu59.patch | 11 +++++++ 3 files changed, 125 insertions(+) Copied: aegisub/repos/community-staging-x86_64/PKGBUILD (from rev 449843, aegisub/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2019-04-05 14:56:44 UTC (rev 449844) @@ -0,0 +1,80 @@ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: kozec <ko...@kozec.com> +# Contributor: Limao Luo <luolimao+...@gmail.com> + +pkgname=aegisub +pkgver=3.2.2 +pkgrel=34 +pkgdesc='A general-purpose subtitle editor with ASS/SSA support' +arch=(x86_64) +url=http://www.aegisub.org +license=( + GPL + BSD +) +depends=( + alsa-lib + boost-libs + fftw + fontconfig + hunspell + icu + libass.so + libffms2.so + libgl + libpulse + wxgtk3 + zlib +) +makedepends=( + boost + git + intltool + mesa +) +source=( + git+https://github.com/Aegisub/Aegisub.git#tag=v${pkgver} + boost-1.68.patch + icu59.patch +) +sha256sums=( + SKIP + aa1689a2204f6a617000f3380b8dea9c3dca4f500d0643e05172750c49cc5a21 + 29d8cc91e73602d5e3c8517c977dcc77cb84af7d42787f510d487d0a6abf7fa6 +) + +prepare() { + cd Aegisub + + patch -Np1 -i ../boost-1.68.patch + sed 's|gil/gil_all.hpp|gil.hpp|g' -i src/*.cpp # boost 1.69 + sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i tools/Makefile # missing link flag + patch -Np1 -i ../icu59.patch + + ./autogen.sh +} + +build() { + cd Aegisub + + # http://site.icu-project.org/download/61#TOC-Migration-Issues + CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1' + + ./configure \ + --prefix=/usr \ + --with-wx-config=/usr/bin/wx-config-gtk3 \ + --without-{portaudio,openal,oss} \ + --disable-update-checker + make +} + +package() { + cd Aegisub + + make DESTDIR="${pkgdir}" install + + install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub + install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE +} + +# vim: ts=2 sw=2 et: Copied: aegisub/repos/community-staging-x86_64/boost-1.68.patch (from rev 449843, aegisub/trunk/boost-1.68.patch) =================================================================== --- community-staging-x86_64/boost-1.68.patch (rev 0) +++ community-staging-x86_64/boost-1.68.patch 2019-04-05 14:56:44 UTC (rev 449844) @@ -0,0 +1,34 @@ +From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001 +From: Jan Beich <jbe...@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); Copied: aegisub/repos/community-staging-x86_64/icu59.patch (from rev 449843, aegisub/trunk/icu59.patch) =================================================================== --- community-staging-x86_64/icu59.patch (rev 0) +++ community-staging-x86_64/icu59.patch 2019-04-05 14:56:44 UTC (rev 449844) @@ -0,0 +1,11 @@ +diff -upr aegisub-3.2.2.orig/src/utils.cpp aegisub-3.2.2/src/utils.cpp +--- aegisub-3.2.2.orig/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>