From 3d525fbf18568659722e6c4e4d93d96e2624498f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 15 Jan 2021 23:58:06 +0200
Subject: SL-14597 Pulled in updated uriparser

Due to crash inside uriparser's code
---
 indra/cmake/Copy3rdPartyLibs.cmake | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/cmake')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 8efad33f71..578120f703 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -61,6 +61,7 @@ if(WINDOWS)
         nghttp2.dll
         glod.dll
         libhunspell.dll
+        uriparser.dll
         )
 
     # Filenames are different for 32/64 bit BugSplat file and we don't
@@ -165,6 +166,7 @@ elseif(DARWIN)
         libnghttp2.dylib
         libnghttp2.14.dylib
         libnghttp2.14.19.0.dylib
+        liburiparser.dylib
        )
 
     if (FMODSTUDIO)
-- 
cgit v1.3


From a542ceb7e1667b7ee71c9f6bda4ea6e3f8583f53 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 16 Jan 2021 03:57:12 +0200
Subject: SL-14597 Updated Mac library name

---
 indra/cmake/URIPARSER.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/URIPARSER.cmake b/indra/cmake/URIPARSER.cmake
index de146885a0..ecc5b74ef1 100644
--- a/indra/cmake/URIPARSER.cmake
+++ b/indra/cmake/URIPARSER.cmake
@@ -29,7 +29,7 @@ else (USESYSTEMLIBS)
     set(URIPARSER_PRELOAD_ARCHIVES -Wl,--whole-archive uriparser -Wl,--no-whole-archive)
     set(URIPARSER_LIBRARIES uriparser)
   elseif (DARWIN)
-    set(URIPARSER_LIBRARIES uriparser)
+    set(URIPARSER_LIBRARIES liburiparser.dylib)
   endif (WINDOWS)
   set(URIPARSER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/uriparser)
 endif (USESYSTEMLIBS)
-- 
cgit v1.3


From 2f00eef6b40568643150af3bdb78c8b6ccf080c2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 16 Jan 2021 13:16:12 +0200
Subject: SL-14597 Fixed mac library only including symlink

---
 autobuild.xml                      | 12 ++++++------
 indra/cmake/Copy3rdPartyLibs.cmake |  2 ++
 indra/newview/viewer_manifest.py   |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'indra/cmake')

diff --git a/autobuild.xml b/autobuild.xml
index a88d168f8f..cfb267cc34 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3128,9 +3128,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e9c36803b32f1750490e159b58cc217c</string>
+              <string>60f008c5fd31641ad4e61ac751ce15d1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/75707/723304/uriparser-0.9.4-darwin64-555093.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/75748/723495/uriparser-0.9.4-darwin64-555117.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -3164,9 +3164,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>aa90a3cf93cc7675bb8177b218de743e</string>
+              <string>00aff37a6f5e1fe08456702d28706cf6</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/75708/723315/uriparser-0.9.4-windows-555093.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/75751/723507/uriparser-0.9.4-windows-555117.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -3176,9 +3176,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>223077dd896ae94f212db3a163b7442d</string>
+              <string>ff27a91f3941c7bef5e1613a064cb048</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/75709/723316/uriparser-0.9.4-windows64-555093.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/75750/723506/uriparser-0.9.4-windows64-555117.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 578120f703..de81512eef 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -167,6 +167,8 @@ elseif(DARWIN)
         libnghttp2.14.dylib
         libnghttp2.14.19.0.dylib
         liburiparser.dylib
+        liburiparser.1.dylib
+        liburiparser.1.0.27.dylib
        )
 
     if (FMODSTUDIO)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index bc121c92ac..0c9fd3984b 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1036,7 +1036,7 @@ class DarwinManifest(ViewerManifest):
                                 # libnghttp2.major.dylib, which is a symlink to
                                 # libnghttp2.version.dylib. Get all of them.
                                 "libnghttp2.*dylib",
-                                "liburiparser.dylib",
+                                "liburiparser.*dylib",
                                 ):
                     dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)
 
-- 
cgit v1.3