diff --git a/scripts/deps/versions b/scripts/deps/versions index 1e3c7da06..e71835ee8 100644 --- a/scripts/deps/versions +++ b/scripts/deps/versions @@ -8,8 +8,8 @@ FREETYPE=2.14.1 FREETYPE_GZ_HASH=174d9e53402e1bf9ec7277e22ec199ba3e55a6be2c0740cb18c0ee9850fc8c34 -HARFBUZZ=11.3.3 -HARFBUZZ_GZ_HASH=5563e1eeea7399c37dc7f0f92a89bbc79d8741bbdd134d22d2885ddb95944314 +HARFBUZZ=11.5.0 +HARFBUZZ_GZ_HASH=119778e3a692806e45104b2cdfda807a8df2ccf5421c50a016aa4b7b82260205 LIBBACKTRACE_COMMIT=793921876c981ce49759114d7bb89bb89b2d3a2d LIBBACKTRACE_GZ_HASH=858b1225351052234f7e71f0f36622fc9ad33aac947db7816d0b443ae0dd33ce diff --git a/scripts/packaging/appimage/make-appimage.sh b/scripts/packaging/appimage/make-appimage.sh index 50226ad9a..4a3e15fd1 100755 --- a/scripts/packaging/appimage/make-appimage.sh +++ b/scripts/packaging/appimage/make-appimage.sh @@ -41,6 +41,7 @@ declare -a MANUAL_LIBS=( "libswscale.so.8" "libswresample.so.5" "libdiscord-rpc.so" + "libharfbuzz.so" "libfreetype.so.6" "libshaderc_ds.so" "libspirv-cross-c-shared.so.0" diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index d694b3546..bfbcb70ec 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -310,11 +310,12 @@ function(add_util_resources target) message(WARNING "MoltenVK not found in path, it will depend on the target system having it.") endif() - # Copy shaderc/spirv-cross into the bundle + # Copy dynamically-loaded libraries (harfbuzz/shaderc/spirv-cross) into the bundle + get_target_property(HARFBUZZ_LIBRARY harfbuzz::harfbuzz IMPORTED_LOCATION_RELEASE) get_target_property(SPIRV_CROSS_LIBRARY spirv-cross-c-shared IMPORTED_SONAME_RELEASE) get_target_property(SHADERC_LIBRARY Shaderc::shaderc_shared IMPORTED_LOCATION_RELEASE) - target_sources(${target} PRIVATE "${SHADERC_LIBRARY}" "${SPIRV_CROSS_LIBRARY}") - set_source_files_properties("${SHADERC_LIBRARY}" "${SPIRV_CROSS_LIBRARY}" PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks) + target_sources(${target} PRIVATE "${HARFBUZZ_LIBRARY}" "${SHADERC_LIBRARY}" "${SPIRV_CROSS_LIBRARY}") + set_source_files_properties("${HARFBUZZ_LIBRARY}" "${SHADERC_LIBRARY}" "${SPIRV_CROSS_LIBRARY}" PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks) # Copy FFmpeg libraries into the bundle foreach(component avcodec avformat avutil swresample swscale)