From 03ebc43132331b9a8dcb3c418ec9c319a6beddda Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 5 Aug 2009 16:08:17 -0400
Subject: [PATCH] DEV-34837: Remove dependency on Leopard-only
/usr/local/lib/libexpat.0.1.0.dylib. On Mac, add libexpat[.0.5.0].dylib to
apr_suite package. Update libapr-1[.0.3.7].dylib and
libaprutil-1[.0.3.8].dylib with versions that reference this expat. Make
viewer_manifiest.py copy expat dylib to app bundle.
---
indra/newview/viewer_manifest.py | 4 +++-
install.xml | 8 ++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index c0a5ab55260..c2a9789ff12 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -490,7 +490,9 @@ def construct(self):
dylibs[lib] = True
if dylibs["llcommon"]:
- for libfile in ("libapr-1.0.3.7.dylib", "libaprutil-1.0.3.8.dylib"):
+ for libfile in ("libapr-1.0.3.7.dylib",
+ "libaprutil-1.0.3.8.dylib",
+ "libexpat.0.5.0.dylib"):
self.path(os.path.join(libdir, libfile), libfile)
#libfmodwrapper.dylib
diff --git a/install.xml b/install.xml
index df92a5d799e..e514f3b4966 100644
--- a/install.xml
+++ b/install.xml
@@ -85,9 +85,9 @@
<key>darwin</key>
<map>
<key>md5sum</key>
- <string>30e3b60d596801a4f4c74c56ece059dc</string>
+ <string>115d8ac44a91efdb173e9b3e478c46b6</string>
<key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.7-darwin-20090731.tar.bz2</uri>
+ <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.7-darwin-20090805.tar.bz2</uri>
</map>
<key>linux</key>
<map>
@@ -340,9 +340,9 @@
<key>darwin</key>
<map>
<key>md5sum</key>
- <string>9c5603e328e9f543e0a599d6b25be973</string>
+ <string>c457a0a041ac4946265889a503d26c3d</string>
<key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-darwin-20080812.tar.bz2</uri>
+ <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-darwin-20090805.tar.bz2</uri>
</map>
<key>linux</key>
<map>
--
GitLab