multimedia/aegisub: Fix build for current.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 61 insertions, 2 deletions

diff --git a/multimedia/aegisub/aegisub.SlackBuild b/multimedia/aegisub/aegisub.SlackBuild
index 6bc267eb302d9..333ac97d46a49 100644
--- a/multimedia/aegisub/aegisub.SlackBuild
+++ b/multimedia/aegisub/aegisub.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2014-2022 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2023 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PRGNAM=aegisub
 SRCNAM=Aegisub
 VERSION=${VERSION:-3.3.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -75,6 +75,9 @@ 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 {} \+
 
+# Patch for current
+patch -p1 < $CWD/boost-1.81.0.patch
+
 autoreconf -fiv
 LDFLAGS="$LDFLAGS -lz" \
 CFLAGS="$SLKCFLAGS" \
diff --git a/multimedia/aegisub/boost-1.81.0.patch b/multimedia/aegisub/boost-1.81.0.patch
new file mode 100644
index 0000000000000..ac264bc706765
--- /dev/null
+++ b/multimedia/aegisub/boost-1.81.0.patch
@@ -0,0 +1,56 @@
+diff --git a/libaegisub/include/libaegisub/lua/utils.h b/libaegisub/include/libaegisub/lua/utils.h
+index c5a65d6e4..f4921d582 100644
+--- a/libaegisub/include/libaegisub/lua/utils.h
++++ b/libaegisub/include/libaegisub/lua/utils.h
+@@ -87,7 +87,10 @@ int exception_wrapper(lua_State *L) {
+ 
+ template<typename T>
+ void set_field(lua_State *L, const char *name, T value) {
+-	push_value(L, value);
++	if constexpr(std::is_convertible<T, std::string>::value)
++            push_value(L, static_cast<std::string>(value));
++	else
++            push_value(L, value);
+ 	lua_setfield(L, -2, name);
+ }
+ 
+diff --git a/src/auto4_lua.cpp b/src/auto4_lua.cpp
+index 245689679..6d479b2c3 100644
+--- a/src/auto4_lua.cpp
++++ b/src/auto4_lua.cpp
+@@ -115,7 +115,8 @@ namespace {
+ 	int get_translation(lua_State *L)
+ 	{
+ 		wxString str(check_wxstring(L, 1));
+-		push_value(L, _(str).utf8_str());
++		const char* val = static_cast<const char*>( _(str).utf8_str());
++		push_value(L, val);
+ 		return 1;
+ 	}
+ 
+diff --git a/src/command/video.cpp b/src/command/video.cpp
+index fb2bcb0ba..77e3e9ca7 100644
+--- a/src/command/video.cpp
++++ b/src/command/video.cpp
+@@ -475,7 +475,7 @@ static void save_snapshot(agi::Context *c, bool raw) {
+ 		// If where ever that is isn't defined, we can't save there
+ 		if ((basepath == "\\") || (basepath == "/")) {
+ 			// So save to the current user's home dir instead
+-			basepath = wxGetHomeDir().c_str();
++			basepath = static_cast<const char*>(wxGetHomeDir().c_str());
+ 		}
+ 	}
+ 	// Actual fixed (possibly relative) path, decode it
+diff --git a/src/dialog_attachments.cpp b/src/dialog_attachments.cpp
+index 38ff53027..e30339f81 100644
+--- a/src/dialog_attachments.cpp
++++ b/src/dialog_attachments.cpp
+@@ -161,7 +161,7 @@ void DialogAttachments::OnExtract(wxCommandEvent &) {
+ 
+ 	// Multiple or single?
+ 	if (listView->GetNextSelected(i) != -1)
+-		path = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())).c_str();
++		path = static_cast<const char*>(wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())).c_str());
+ 	else {
+ 		path = SaveFileSelector(
+ 			_("Select the path to save the file to:"),