Merge branch 'bugfixes' into feature

arch1t3cht · Jan 6, 2025 · b2a0b09 · b2a0b09
2 parents 7db477c + d06d9b5
commit b2a0b09
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 5 deletions.
diff --git a/packages/osx_bundle/Contents/Resources/Aegisub.icns b/packages/osx_bundle/Contents/Resources/Aegisub.icns
diff --git a/packages/osx_bundle/Contents/Resources/assIcon.icns b/packages/osx_bundle/Contents/Resources/assIcon.icns
diff --git a/packages/osx_bundle/Contents/Resources/srtIcon.icns b/packages/osx_bundle/Contents/Resources/srtIcon.icns
diff --git a/packages/osx_bundle/Contents/Resources/ssaIcon.icns b/packages/osx_bundle/Contents/Resources/ssaIcon.icns
diff --git a/packages/osx_bundle/Contents/Resources/txtIcon.icns b/packages/osx_bundle/Contents/Resources/txtIcon.icns
diff --git a/src/dialog_colorpicker.cpp b/src/dialog_colorpicker.cpp
@@ -382,10 +382,14 @@ class ColorPickerScreenDropper final : public wxControl {
 	void DropFromScreenXY(int x, int y);
 };
 
+#ifndef MAC_OS_VERSION_15_0
+#define MAC_OS_VERSION_15_0 150000
+#endif
+
 void ColorPickerScreenDropper::DropFromScreenXY(int x, int y) {
 	wxMemoryDC capdc(capture);
 	capdc.SetPen(*wxTRANSPARENT_PEN);
-#ifndef __WXMAC__
+#if !(defined(__WXMAC__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_15_0))
 	std::unique_ptr<wxDC> screen;
 
 	if (!OPT_GET("Tool/Colour Picker/Restrict to Window")->GetBool()) {

diff --git a/src/font_file_lister_coretext.mm b/src/font_file_lister_coretext.mm
@@ -14,11 +14,11 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-#include "font_file_lister.h"
-
 #include <AppKit/AppKit.h>
 #include <CoreText/CoreText.h>
 
+#include "font_file_lister.h"
+
 namespace {
 struct FontMatch {
 	NSURL *url = nil;

diff --git a/subprojects/boost.wrap b/subprojects/boost.wrap
@@ -1,6 +1,6 @@
 [wrap-file]
 directory = boost_1_83_0
-source_url = https://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.tar.gz
+source_url = https://archives.boost.io/release/1.83.0/source/boost_1_83_0.tar.gz
 source_filename = boost_1_83_0.tar.gz
 source_hash = c0685b68dd44cc46574cce86c4e17c0f611b15e195be9848dfd0769a0a207628
 patch_directory = boost
diff --git a/tools/osx-dmg.sh b/tools/osx-dmg.sh
@@ -50,7 +50,15 @@ cp -v "${SRC_DIR}/packages/osx_bundle/Contents/Resources/Aegisub.icns" "${DMG_TM
 
 echo
 echo "---- Creating image ----"
-/usr/bin/hdiutil create -srcfolder "${DMG_TMP_DIR}" -volname "${PKG_NAME}" -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDRW "${DMG_RW_PATH}"
+max_tries=10
+i=0
+until /usr/bin/hdiutil create -srcfolder "${DMG_TMP_DIR}" -volname "${PKG_NAME}" -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDRW "${DMG_RW_PATH}"; do
+  if [ $i -eq $max_tries ]; then
+    echo "Error: hdiutil failed after ${max_tries} tries."
+    exit 1
+  fi
+  i=$((i+1))
+done
 
 echo
 echo "---- Mounting image ----"