From ea1c0d3b57ae26077ed420d2d6a07e0d1211d723 Mon Sep 17 00:00:00 2001 From: plater <> Date: Feb 08 2023 21:17:01 +0000 Subject: Update aegisub to version 3.3.3 / rev 39 via SR 1063732 https://build.opensuse.org/request/show/1063732 by user plater + dimstar_suse --- diff --git a/.files b/.files index 0f27f42..d499492 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 07c1476..51f71c7 100644 --- a/.rev +++ b/.rev @@ -385,4 +385,12 @@ Removed spec file generated git_version.h, it's not needed when git metadata is 1045820 + + 81233bb392b25cc5da2219b1d2a8ee72 + 3.3.3 + + dimstar_suse + + 1063732 + diff --git a/aegisub-3.3.3-fix-boost-181-build.patch b/aegisub-3.3.3-fix-boost-181-build.patch new file mode 100644 index 0000000..f83e2f8 --- /dev/null +++ b/aegisub-3.3.3-fix-boost-181-build.patch @@ -0,0 +1,60 @@ +#Patch from gentoo copied from mageia + +Index: b/libaegisub/include/libaegisub/lua/utils.h +=================================================================== +Index: b/libaegisub/include/libaegisub/lua/utils.h +=================================================================== +--- a/libaegisub/include/libaegisub/lua/utils.h 2022-07-03 19:27:30.000000000 +0200 ++++ b/libaegisub/include/libaegisub/lua/utils.h 2023-02-08 09:17:04.471853695 +0200 +@@ -87,7 +87,10 @@ int exception_wrapper(lua_State *L) { + + template + void set_field(lua_State *L, const char *name, T value) { +- push_value(L, value); ++ if constexpr(std::is_convertible::value) ++ push_value(L, static_cast(value)); ++ else ++ push_value(L, value); + lua_setfield(L, -2, name); + } + +Index: b/src/auto4_lua.cpp +=================================================================== +--- a/src/auto4_lua.cpp 2022-07-03 19:27:30.000000000 +0200 ++++ b/src/auto4_lua.cpp 2023-02-08 09:20:53.005919645 +0200 +@@ -119,7 +119,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( _(str).utf8_str()); ++ push_value(L, val); + return 1; + } + +Index: b/src/command/video.cpp +=================================================================== +--- a/src/command/video.cpp 2022-07-03 19:27:30.000000000 +0200 ++++ b/src/command/video.cpp 2023-02-08 09:23:11.799886506 +0200 +@@ -475,7 +475,7 @@ static void save_snapshot(agi::Context * + // 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 = wxGetHomeDir().ToStdString(); + } + } + // Actual fixed (possibly relative) path, decode it +Index: b/src/dialog_attachments.cpp +=================================================================== +--- a/src/dialog_attachments.cpp 2022-07-03 19:27:30.000000000 +0200 ++++ b/src/dialog_attachments.cpp 2023-02-08 09:25:23.026182291 +0200 +@@ -161,7 +161,7 @@ void DialogAttachments::OnExtract(wxComm + + // 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 = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())).ToStdString(); + else { + path = SaveFileSelector( + _("Select the path to save the file to:"), diff --git a/aegisub.changes b/aegisub.changes index 0d889ea..566a195 100644 --- a/aegisub.changes +++ b/aegisub.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 8 07:41:42 UTC 2023 - Dave Plater + +- Add aegisub-3.3.3-fix-boost-181-build.patch copied from mageia + to fix build against boost-1.81 + +------------------------------------------------------------------- Thu Dec 29 22:16:54 UTC 2022 - Matthias Eliasson - Update to version 3.3.3 diff --git a/aegisub.spec b/aegisub.spec index 417d6d3..bd7e3f1 100644 --- a/aegisub.spec +++ b/aegisub.spec @@ -24,6 +24,7 @@ Group: Productivity/Multimedia/Video/Editors and Convertors URL: http://www.aegisub.org/ Source0: https://github.com/wangqr/Aegisub/archive/refs/tags/v%{version}.tar.gz#/Aegisub-%{version}.tar.gz Patch0: aegisub-buildfix_autotools.patch +Patch1: aegisub-3.3.3-fix-boost-181-build.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++