summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2026-03-31 15:39:32 +0800
committerErik Kundiman <erik@megapahit.org>2026-03-31 15:39:32 +0800
commit28a7a33328396653e550854e6e5acb3e3fc1faf3 (patch)
tree9c2e616bc3f2d23ebbf2b22e81b9ef45c4cd6532
parentaa475ebe57bce79348a74e8304e0f8d58ebb7e55 (diff)
MacPorts' zlib has been upgraded from 1.3.1 to 1.3.2
-rw-r--r--indra/newview/FixBundle.cmake.in6
-rw-r--r--indra/newview/FixPackage.cmake.in6
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in
index d75d1a0620..759a5c9100 100644
--- a/indra/newview/FixBundle.cmake.in
+++ b/indra/newview/FixBundle.cmake.in
@@ -227,9 +227,9 @@ execute_process(
COMMAND lipo libxml2.16.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libxml2.16.dylib
- COMMAND lipo libz.1.3.1.dylib
+ COMMAND lipo libz.1.3.2.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libz.1.3.1.dylib
+ -output libz.1.3.2.dylib
WORKING_DIRECTORY ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Frameworks
ERROR_QUIET
)
@@ -281,7 +281,7 @@ execute_process(
Frameworks/libvorbisenc.2.dylib
Frameworks/libvorbisfile.3.dylib
Frameworks/libxml2.16.dylib
- Frameworks/libz.1.3.1.dylib
+ Frameworks/libz.1.3.2.dylib
Resources/libndofdev.dylib
Resources/SLPlugin.app/Contents/Frameworks/media_plugin_cef.dylib
Resources/SLPlugin.app/Contents/Frameworks/media_plugin_libvlc.dylib
diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in
index a4fdb980bf..2a21282f18 100644
--- a/indra/newview/FixPackage.cmake.in
+++ b/indra/newview/FixPackage.cmake.in
@@ -227,9 +227,9 @@ execute_process(
COMMAND lipo libxml2.16.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libxml2.16.dylib
- COMMAND lipo libz.1.3.1.dylib
+ COMMAND lipo libz.1.3.2.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libz.1.3.1.dylib
+ -output libz.1.3.2.dylib
WORKING_DIRECTORY ${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Frameworks
ERROR_QUIET
)
@@ -281,7 +281,7 @@ execute_process(
Frameworks/libvorbisenc.2.dylib
Frameworks/libvorbisfile.3.dylib
Frameworks/libxml2.16.dylib
- Frameworks/libz.1.3.1.dylib
+ Frameworks/libz.1.3.2.dylib
Resources/libndofdev.dylib
Resources/SLPlugin.app/Contents/Frameworks/media_plugin_cef.dylib
Resources/SLPlugin.app/Contents/Frameworks/media_plugin_libvlc.dylib