From 859074d1e59a25ba5c6c0847c7426040fa49c03f Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 1 Feb 2020 11:30:01 +0100
Subject: 20200201.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 multimedia/aegisub/aegisub.SlackBuild | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'multimedia/aegisub/aegisub.SlackBuild')

diff --git a/multimedia/aegisub/aegisub.SlackBuild b/multimedia/aegisub/aegisub.SlackBuild
index 0bdf6b18bb..e6f616dba4 100644
--- a/multimedia/aegisub/aegisub.SlackBuild
+++ b/multimedia/aegisub/aegisub.SlackBuild
@@ -69,10 +69,16 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i tools/Makefile
+patch -Np1 < $CWD/boost.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 < $CWD/icu.patch
+
+./autogen.sh
 
 LDFLAGS="$LDFLAGS -lz" \
 CFLAGS="$SLKCFLAGS" \
+CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1' \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-- 
cgit v1.2.3