TypesettingTools · op200 · Mar 18, 2025 · Mar 19, 2025 · Mar 19, 2025 · Mar 19, 2025
diff --git a/.editorconfig b/.editorconfig
@@ -11,3 +11,8 @@ indent_style = tab
 indent_size = 2
 tab_width = 8
 trim_trailing_whitespace = false
+
+[src/libresrc/**default_*.json]
+indent_style = tab
+indent_size = 2
+trim_trailing_whitespace = true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,6 +24,7 @@ jobs:
             args: >-
               -Ddefault_library=static
               --force-fallback-for=zlib,harfbuzz,freetype2,fribidi,libpng
+              -Dfallback_nasm=true
               -Dfreetype2:harfbuzz=disabled
               -Dharfbuzz:freetype=disabled
               -Dharfbuzz:cairo=disabled
@@ -52,31 +53,43 @@ jobs:
             args: -Db_pch=false
           }
           - {
-            name: macOS Debug,
-            os: macos-13,
+            name: macOS x86_64 Debug,
+            os: macos-15-intel,
             buildtype: debugoptimized,
             args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2
           }
           - {
-            name: macOS Release,
-            os: macos-13,
+            name: macOS x86_64 Release,
+            os: macos-15-intel,
+            buildtype: release,
+            args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2
+          }
+          - {
+            name: macOS arm64 Debug,
+            os: macos-15,
+            buildtype: debugoptimized,
+            args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2
+          }
+          - {
+            name: macOS arm64 Release,
+            os: macos-15,
             buildtype: release,
             args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2
           }
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: '0'
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 
       - name: Setup Meson
         run: |
           python -m pip install --upgrade pip setuptools
-          pip install meson==1.7.2
+          pip install meson
 
       - name: Setup MSVC
         if: matrix.config.os == 'windows-latest' && matrix.config.msvc == true
@@ -95,7 +108,7 @@ jobs:
           Get-Location | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
           popd
 
-          $gettexturl = "https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.21-v1.16/gettext0.21-iconv1.16-static-64.zip"
+          $gettexturl = "https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.26-v1.17/gettext0.26-iconv1.17-static-64.zip"
           Invoke-WebRequest -Uri $gettexturl -OutFile ".\gettext.zip"
           Expand-Archive ".\gettext.zip" -DestinationPath gettext
           pushd gettext/bin
@@ -109,9 +122,7 @@ jobs:
           export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
           # Skip brew update for now, see https://github.com/actions/setup-python/issues/577
           # brew update
-          brew install luarocks ninja
-          sudo luarocks install luafilesystem 1.8.0
-          sudo luarocks install moonscript --dev
+          brew install ninja
           brew install libass zlib ffms2 fftw hunspell
           brew install pulseaudio  # NO OpenAL in github CI
 
@@ -143,15 +154,15 @@ jobs:
         run: cd build && ninja win-portable
 
       - name: Upload artifacts - win_installer
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: matrix.config.os == 'windows-latest'
         with:
           name: ${{ matrix.config.name }} - installer
           path: build/Aegisub-*.exe
           if-no-files-found: error
 
       - name: Upload artifacts - portable.zip
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: matrix.config.os == 'windows-latest'
         with:
           name: ${{ matrix.config.name }} - portable
@@ -165,7 +176,7 @@ jobs:
           meson compile osx-build-dmg -C build
 
       - name: Upload artifacts - macOS dmg
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: startsWith(matrix.config.os, 'macos-')
         with:
           name: ${{ matrix.config.name }} - installer
@@ -187,7 +198,7 @@ jobs:
           test -e distcheck/*/subprojects/LuaJIT*/meson.build
 
       - name: Upload artifacts - tarball
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: matrix.config.os == 'ubuntu-latest' && matrix.config.buildtype == 'release'
         with:
           name: Source Tarball

diff --git a/README.md b/README.md
@@ -116,6 +116,8 @@ If you are packaging Aegisub for a Linux distribution, here are a few things you
 
   Like for its other dependencies, Aegisub includes a meson subproject for LuaJIT that can be used to statically link a version of LuaJIT with 5.2 compatibility.
   For distributions that do not allow downloading additional sources at build time, the downloaded LuaJIT subproject is included in the source tarballs distributed with releases.
+- When linked against libstdc++, Aegisub needs libstdc++ 6.0.32 or later due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95048.
+  Aegisub's tests will detect this bug, but if you're not running tests on packaging you'll need to make sure the libstdc++ version is recent enough.
 
 The following commands are an example for how to build Aegisub with the goal of creating a distribution package:
 

diff --git a/automation/autoload/macro-2-mkfullwitdh.lua b/automation/autoload/macro-2-mkfullwitdh.lua
@@ -3,8 +3,8 @@
 
 local tr = aegisub.gettext
 
-script_name = tr("Make text fullwidth")
-script_description = tr("Shows how to use the unicode include to iterate over characters and a lookup table to convert those characters to something else.")
+script_name = tr"Make text fullwidth"
+script_description = tr"Shows how to use the unicode include to iterate over characters and a lookup table to convert those characters to something else."
 script_author = "Niels Martin Hansen"
 script_version = "1"
 

diff --git a/libaegisub/common/charset_conv.cpp b/libaegisub/common/charset_conv.cpp
@@ -114,26 +114,6 @@ namespace {
 		}
 	}
 
-	// Calculate the size of NUL in the given character set
-	size_t nul_size(const char *encoding) {
-		// We need a character set to convert from with a known encoding of NUL
-		// UTF-8 seems like the obvious choice
-		auto cd = Converter::create(false, "UTF-8", encoding);
-
-		char dbuff[4];
-		char sbuff[] = "";
-		char* dst = dbuff;
-		const char* src = sbuff;
-		size_t dstLen = sizeof(dbuff);
-		size_t srcLen = 1;
-
-		size_t ret = cd->Convert(&src, &srcLen, &dst, &dstLen);
-		assert(ret != iconv_failed);
-		assert(dst - dbuff > 0);
-
-		return dst - dbuff;
-	}
-
 #ifdef ICONV_POSIX
 	class ConverterImpl final : public Converter {
 		size_t bomSize;
@@ -287,12 +267,7 @@ std::unique_ptr<Converter> Converter::create(bool subst, const char *src, const
 
 IconvWrapper::IconvWrapper(const char *sourceEncoding, const char *destEncoding, bool enableSubst)
 : conv(Converter::create(enableSubst, sourceEncoding, destEncoding))
-{
-	// These need to be set only after we verify that the source and dest
-	// charsets are valid
-	toNulLen = nul_size(destEncoding);
-	fromNulLen = nul_size(sourceEncoding);
-}
+{ }
 
 IconvWrapper::~IconvWrapper() = default;
 

diff --git a/libaegisub/include/libaegisub/charset_conv.h b/libaegisub/include/libaegisub/charset_conv.h
@@ -64,8 +64,6 @@ struct Converter {
 
 /// @brief A C++ wrapper for iconv
 class IconvWrapper {
-	size_t toNulLen = 0;
-	size_t fromNulLen = 0;
 	std::unique_ptr<Converter> conv;
 
 public:

diff --git a/libaegisub/include/libaegisub/io.h b/libaegisub/include/libaegisub/io.h
@@ -12,6 +12,8 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+#pragma once
+
 #include <libaegisub/exception.h>
 #include <libaegisub/fs.h>
 

diff --git a/libaegisub/lua/modules.cpp b/libaegisub/lua/modules.cpp
@@ -28,6 +28,17 @@ extern "C" int luaopen_lpeg(lua_State *L);
 namespace agi::lua {
 int regex_init(lua_State *L);
 
+int wrap_luaopen_luabins(lua_State *L) {
+	lua_getfield(L, LUA_GLOBALSINDEX, "aegisub");
+	lua_getfield(L, -1, "__raise_warning");
+	lua_remove(L, -2);
+
+	push_value(L, "This automation script uses the library luabins. This library is deprecated and will be removed in a future version of Aegisub. If your script critically depends on luabins and cannot be adapted to work without it, please let us know at https://github.com/TypesettingTools/Aegisub/issues/382 .");
+	lua_call(L, 1, 0);
+
+	return luaopen_luabins(L);
+}
+
 void preload_modules(lua_State *L) {
 	luaL_openlibs(L);
 
@@ -38,7 +49,7 @@ void preload_modules(lua_State *L) {
 	set_field(L, "aegisub.__unicode_impl", luaopen_unicode_impl);
 	set_field(L, "aegisub.__lfs_impl", luaopen_lfs_impl);
 	set_field(L, "lpeg", luaopen_lpeg);
-	set_field(L, "luabins", luaopen_luabins);
+	set_field(L, "luabins", wrap_luaopen_luabins);
 
 	lua_pop(L, 2);
 

diff --git a/meson.build b/meson.build
@@ -23,8 +23,8 @@ if host_machine.system() == 'windows'
         add_global_arguments('-DCSRI_NO_EXPORT', language: 'c')
     endif
 
-    sys_nasm = find_program('nasm', required: false)
-    if not sys_nasm.found()
+    if get_option('fallback_nasm') or \
+       not find_program('nasm', required: false).found()
         nasm = subproject('nasm').get_variable('nasm')
         meson.override_find_program('nasm', nasm)
     endif
@@ -110,6 +110,15 @@ if not get_option('local_boost')
                             modules: boost_modules,
                             required: false,
                             static: get_option('default_library') == 'static')
+
+    if boost_dep.version().version_compare('<1.77.0')
+        # boost regex is header-only since version 1.77.0, and some distributions have stopped shipping the stub module since then.
+        # So we need to require boost.regex for older versions but can't require it for newer versions.
+        boost_dep = dependency('boost', version: '>=1.70.0',
+                                modules: boost_modules + ['regex'],
+                                required: false,
+                                static: get_option('default_library') == 'static')
+    endif
 endif
 
 if get_option('local_boost') or not boost_dep.found()
@@ -120,6 +129,13 @@ if get_option('local_boost') or not boost_dep.found()
     endforeach
 endif
 
+if cc.get_argument_syntax() == 'gcc'
+  # Work around compile error in Boost GIL, can be removed once
+  # https://github.com/boostorg/gil/commit/2956a0e9ef71f5c4f3163c8b8d675679e0fbaaff
+  # is in a boost release that's available everywhere
+  add_project_arguments(cc.get_supported_arguments(['-Wno-missing-template-arg-list-after-template-kw']), language: 'cpp')
+endif
+
 deps += boost_dep
 if host_machine.system() == 'windows'
     conf.set('BOOST_USE_WINDOWS_H', 1)

diff --git a/meson_options.txt b/meson_options.txt
@@ -15,6 +15,7 @@ option('csri', type: 'feature', description: 'CSRI support')
 
 option('system_luajit', type: 'boolean', value: false, description: 'Force using system luajit')
 option('local_boost', type: 'boolean', value: false, description: 'Force using locally compiled Boost')
+option('fallback_nasm', type: 'boolean', value: false, description: 'Force using fallback nasm')
 
 option('wx_version', type: 'string', value: '3.2.2', description: 'The minimum wxWidgets version to use')
 

diff --git a/packages/osx_bundle/Contents/Info.plist b/packages/osx_bundle/Contents/Info.plist
@@ -33,7 +33,7 @@
     <string>@PLIST_VERSION@</string>
 
     <key>CFBundleLongVersionString</key>
-    <string>@PLIST_VERSION@, Copyright 2005-2014, aegisub http://www.aegisub.org/</string>
+    <string>@PLIST_VERSION@, Copyright 2005-2014, aegisub https://aegisub.org/</string>
 
     <!-- Values: i386, ppc, x86_65, ppc64 -->
     <key>LSArchitecturePriority</key>
@@ -42,9 +42,15 @@
         <string>i386</string>
     </array>
 
+	<!-- Target platform -->
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+
     <!-- Displayed in the 'Get Info' context menu dialogue -->
     <key>CFBundleGetInfoString</key>
-    <string>aegisub version @PLIST_VERSION@ built on @PLIST_BUILD_DATE@ http://www.aegisub.org/</string>
+    <string>aegisub version @PLIST_VERSION@ built on @PLIST_BUILD_DATE@ https://aegisub.org/</string>
 
     <!-- Whether to allow multiple instances across user logins -->
     <key>LSMultipleInstancesProhibited</key>

diff --git a/packages/win_installer/dictionaries/fragment_dictbase.iss b/packages/win_installer/dictionaries/fragment_dictbase.iss
@@ -4,8 +4,8 @@ AppName=Aegisub
 AppVerName=Aegisub 3.1.0
 AppVersion=3.1.0
 AppPublisher=Aegisub Team
-AppPublisherURL=http://www.aegisub.org/
-AppSupportURL=http://forum.aegisub.org/
+AppPublisherURL=https://aegisub.org/
+AppSupportURL=https://github.com/TypesettingTools/Aegisub/issues
 AppCopyright=� 2005-2014 The Aegisub Team
 VersionInfoVersion=3.1.0
 DefaultDirName={pf}\Aegisub