diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-05-02 23:20:07 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-05-02 23:20:07 +0800 |
| commit | 7c55618b3bf65070e8229124a3c0217d803329b5 (patch) | |
| tree | fe6144f1ca7fd02372b55ab8abf3a412592dd674 | |
| parent | 7a2a26f7e49d016134a64826822e74e5f631bcbe (diff) | |
| parent | 9e905bd830c7cfb79443c1ca0ee9cdf4d24bf9f9 (diff) | |
Merge branch 'main' into 2026.02
| -rw-r--r-- | indra/newview/FixBundle.cmake.in | 6 | ||||
| -rw-r--r-- | indra/newview/FixPackage.cmake.in | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in index ac5e3cbe3e..77b4683c88 100644 --- a/indra/newview/FixBundle.cmake.in +++ b/indra/newview/FixBundle.cmake.in @@ -158,9 +158,9 @@ execute_process( COMMAND lipo libbz2.1.0.8.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libbz2.1.0.8.dylib - COMMAND lipo libexpat.1.11.2.dylib + COMMAND lipo libexpat.1.11.3.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libexpat.1.11.2.dylib + -output libexpat.1.11.3.dylib COMMAND lipo libfreetype.6.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libfreetype.6.dylib @@ -258,7 +258,7 @@ execute_process( Frameworks/libbrotlidec.1.2.0.dylib Frameworks/libbz2.1.0.8.dylib Frameworks/libdiscord_partner_sdk.dylib - Frameworks/libexpat.1.11.2.dylib + Frameworks/libexpat.1.11.3.dylib Frameworks/libfreetype.6.dylib Frameworks/libhunspell-1.7.0.dylib Frameworks/libiconv.2.dylib diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in index a0eea41292..e67026aabb 100644 --- a/indra/newview/FixPackage.cmake.in +++ b/indra/newview/FixPackage.cmake.in @@ -158,9 +158,9 @@ execute_process( COMMAND lipo libbz2.1.0.8.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libbz2.1.0.8.dylib - COMMAND lipo libexpat.1.11.2.dylib + COMMAND lipo libexpat.1.11.3.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libexpat.1.11.2.dylib + -output libexpat.1.11.3.dylib COMMAND lipo libfreetype.6.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libfreetype.6.dylib @@ -258,7 +258,7 @@ execute_process( Frameworks/libbrotlidec.1.2.0.dylib Frameworks/libbz2.1.0.8.dylib Frameworks/libdiscord_partner_sdk.dylib - Frameworks/libexpat.1.11.2.dylib + Frameworks/libexpat.1.11.3.dylib Frameworks/libfreetype.6.dylib Frameworks/libhunspell-1.7.0.dylib Frameworks/libiconv.2.dylib |