diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-10-23 21:52:49 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-10-23 21:52:49 +0800 |
| commit | 57552eb04bdbb6db875cf414ccac552934240d7c (patch) | |
| tree | 85a20ea34d4442820da488e3223134e66ea6c7a5 | |
| parent | 10fb32655dcf29a36661ab93252d87c00bd009c7 (diff) | |
| parent | cfb5e0bb3ca02fa7e8365b06e033500d3299a06a (diff) | |
Merge branch 'main' into 26.526.5
| -rw-r--r-- | indra/newview/FixBundle.cmake.in | 8 | ||||
| -rw-r--r-- | indra/newview/FixPackage.cmake.in | 8 | ||||
| -rw-r--r-- | indra/newview/SignBundle.cmake.in | 4 | ||||
| -rw-r--r-- | indra/newview/SignPackage.cmake.in | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in index 2dbb6a437d..feb974a33e 100644 --- a/indra/newview/FixBundle.cmake.in +++ b/indra/newview/FixBundle.cmake.in @@ -292,12 +292,12 @@ execute_process( COMMAND lipo libboost_url-mt.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libboost_url-mt.dylib - COMMAND lipo libbrotlicommon.1.2.0.dylib + COMMAND lipo libbrotlicommon.1.2.1.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libbrotlicommon.1.2.0.dylib - COMMAND lipo libbrotlidec.1.2.0.dylib + -output libbrotlicommon.1.2.1.dylib + COMMAND lipo libbrotlidec.1.2.1.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libbrotlidec.1.2.0.dylib + -output libbrotlidec.1.2.1.dylib COMMAND lipo libbz2.1.0.8.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libbz2.1.0.8.dylib diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in index 35f127f40c..8aaccb8f77 100644 --- a/indra/newview/FixPackage.cmake.in +++ b/indra/newview/FixPackage.cmake.in @@ -170,12 +170,12 @@ execute_process( COMMAND lipo libboost_url-mt.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libboost_url-mt.dylib - COMMAND lipo libbrotlicommon.1.2.0.dylib + COMMAND lipo libbrotlicommon.1.2.1.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libbrotlicommon.1.2.0.dylib - COMMAND lipo libbrotlidec.1.2.0.dylib + -output libbrotlicommon.1.2.1.dylib + COMMAND lipo libbrotlidec.1.2.1.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libbrotlidec.1.2.0.dylib + -output libbrotlidec.1.2.1.dylib COMMAND lipo libbz2.1.0.8.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libbz2.1.0.8.dylib diff --git a/indra/newview/SignBundle.cmake.in b/indra/newview/SignBundle.cmake.in index b5b0d858be..32ac48e78b 100644 --- a/indra/newview/SignBundle.cmake.in +++ b/indra/newview/SignBundle.cmake.in @@ -20,8 +20,8 @@ execute_process( Frameworks/libboost_system-mt.dylib Frameworks/libboost_thread-mt.dylib Frameworks/libboost_url-mt.dylib - Frameworks/libbrotlicommon.1.2.0.dylib - Frameworks/libbrotlidec.1.2.0.dylib + Frameworks/libbrotlicommon.1.2.1.dylib + Frameworks/libbrotlidec.1.2.1.dylib Frameworks/libbz2.1.0.8.dylib Frameworks/libdiscord_partner_sdk.dylib Frameworks/libexpat.1.13.0.dylib diff --git a/indra/newview/SignPackage.cmake.in b/indra/newview/SignPackage.cmake.in index 67c0cd1cf3..4b13cf333e 100644 --- a/indra/newview/SignPackage.cmake.in +++ b/indra/newview/SignPackage.cmake.in @@ -20,8 +20,8 @@ execute_process( Frameworks/libboost_system-mt.dylib Frameworks/libboost_thread-mt.dylib Frameworks/libboost_url-mt.dylib - Frameworks/libbrotlicommon.1.2.0.dylib - Frameworks/libbrotlidec.1.2.0.dylib + Frameworks/libbrotlicommon.1.2.1.dylib + Frameworks/libbrotlidec.1.2.1.dylib Frameworks/libbz2.1.0.8.dylib Frameworks/libdiscord_partner_sdk.dylib Frameworks/libexpat.1.13.0.dylib |