From 0fd5efbb2bd5f50dcb7228676bc4ce5c288da8e5 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@posteo.nl>
Date: Tue, 20 Aug 2024 20:11:49 +0200
Subject: include <memory> for dstd::unique_ptr template

---
 indra/llcommon/llapr.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/llcommon/llapr.h b/indra/llcommon/llapr.h
index 00ff4d60b7..faf2d6fc92 100644
--- a/indra/llcommon/llapr.h
+++ b/indra/llcommon/llapr.h
@@ -33,6 +33,7 @@
 #include <sys/param.h>  // Need PATH_MAX in APR headers...
 #endif
 
+#include <memory>
 #include <boost/noncopyable.hpp>
 #include "llwin32headerslean.h"
 #include "apr_thread_proc.h"
-- 
cgit v1.2.3


From 2b354497c8f35b7832d1a5e310dd2096ab8c95f8 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@posteo.nl>
Date: Wed, 21 Aug 2024 12:26:49 +0200
Subject: Add zlib-ng as a dependency (for libpng).

---
 indra/llwindow/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 9ebd6ef0b0..55f97b33c5 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -58,6 +58,7 @@ set(llwindow_LINK_LIBRARIES
         ll::glext
         ll::uilibraries
         ll::SDL
+        ll::zlib-ng
         )
 
 # Libraries on which this library depends, needed for Linux builds
-- 
cgit v1.2.3


From 3ab6f187737de7d459efb33d887dc42b1263f087 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@posteo.nl>
Date: Wed, 21 Aug 2024 12:27:43 +0200
Subject: Remove packaging of libexpat.so*, this library is no statically
 linked.

---
 indra/newview/viewer_manifest.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 15cec11330..0428c6e3d5 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1409,7 +1409,6 @@ class Linux_x86_64_Manifest(LinuxManifest):
         with self.prefix(src=relpkgdir, dst="lib"):
             self.path("libapr-1.so*")
             self.path("libaprutil-1.so*")
-            self.path("libexpat.so.*")
             self.path_optional("libSDL*.so.*")
 
             self.path_optional("libjemalloc*.so")
-- 
cgit v1.2.3


From 1f1ac55f5a69ab15844dab3cc33d6a60f9f47444 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@posteo.nl>
Date: Wed, 21 Aug 2024 12:40:47 +0200
Subject: Renable Linux builds

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6fe5a75f48..1421b2bd30 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -48,9 +48,9 @@ jobs:
       matrix:
         runner: [windows-large, macos-12-xl]
         configuration: ${{ fromJSON(needs.setup.outputs.configurations) }}
-        # include:
-        # - runner: linux-large
-        #   configuration: ReleaseOS
+         include:
+         - runner: linux-large
+           configuration: ReleaseOS
     runs-on: ${{ matrix.runner }}
     outputs:
       viewer_channel: ${{ steps.build.outputs.viewer_channel }}
-- 
cgit v1.2.3