From bae8520580b683027a72beb1b8854c44da68cb1c Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Wed, 2 Apr 2025 10:38:13 -0300
Subject: [PATCH] Update modules due cmake_minimum_required() issues (#5087,
 #5071)

---
 CMakeLists.txt             | 8 +++++++-
 laf                        | 2 +-
 third_party/CMakeLists.txt | 4 +++-
 third_party/TinyEXIF       | 2 +-
 third_party/harfbuzz       | 2 +-
 third_party/json11         | 2 +-
 third_party/libarchive     | 2 +-
 third_party/libpng         | 2 +-
 8 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af562f8d4..70ea11163 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -243,7 +243,13 @@ if(USE_SHARED_LIBPNG)
   add_definitions(${PNG_DEFINITIONS})
 else()
   set(PNG_FOUND ON)
-  set(PNG_LIBRARY png_static)
+
+  # Skia on Linux includes libpng symbols
+  if(UNIX AND NOT APPLE AND LAF_BACKEND STREQUAL "skia")
+    set(PNG_LIBRARY skia)
+  else()
+    set(PNG_LIBRARY png_static)
+  endif()
   set(PNG_LIBRARIES ${PNG_LIBRARY})
   set(PNG_INCLUDE_DIRS
     ${LIBPNG_DIR}
diff --git a/laf b/laf
index fdc9001cb..221fe5eb3 160000
--- a/laf
+++ b/laf
@@ -1 +1 @@
-Subproject commit fdc9001cb0251a40092ebb9b2bca6e61fdf9f6f7
+Subproject commit 221fe5eb36248c11535f6c05c9d906183ebb2b59
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 56c345ce7..0599722b9 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Aseprite
-# Copyright (C) 2021-2024  Igara Studio S.A.
+# Copyright (C) 2021-2025  Igara Studio S.A.
 # Copyright (C) 2001-2018  David Capello
 
 include_directories(.)
@@ -12,7 +12,9 @@ if(NOT USE_SHARED_ZLIB)
   set(SKIP_INSTALL_ALL on)
   # Don't build zlib tests
   set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "Enable Zlib Examples")
+  set(ZLIB_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/zlib" CACHE INTERNAL "")
   add_subdirectory(zlib)
+  add_library(ZLIB::ZLIB ALIAS zlibstatic)
 endif()
 
 if(NOT USE_SHARED_LIBPNG)
diff --git a/third_party/TinyEXIF b/third_party/TinyEXIF
index 2283d8094..21d6cf762 160000
--- a/third_party/TinyEXIF
+++ b/third_party/TinyEXIF
@@ -1 +1 @@
-Subproject commit 2283d8094e42e6b6cef00d1d31ecadfe0d9e1f29
+Subproject commit 21d6cf762724260f8e5bcee4abdee5411ae47813
diff --git a/third_party/harfbuzz b/third_party/harfbuzz
index 3412c32b3..8607be393 160000
--- a/third_party/harfbuzz
+++ b/third_party/harfbuzz
@@ -1 +1 @@
-Subproject commit 3412c32b35db911832c0b396894203899f8f5157
+Subproject commit 8607be393dfd81614611897a6e3026fe94a3966c
diff --git a/third_party/json11 b/third_party/json11
index f1ff45a7c..f84540a0f 160000
--- a/third_party/json11
+++ b/third_party/json11
@@ -1 +1 @@
-Subproject commit f1ff45a7cd3781ab2d6bfaa8552a74172b5e6a73
+Subproject commit f84540a0fd719b757f86c93c8bafd54fbe7f7031
diff --git a/third_party/libarchive b/third_party/libarchive
index fb3d9be28..7bde8b825 160000
--- a/third_party/libarchive
+++ b/third_party/libarchive
@@ -1 +1 @@
-Subproject commit fb3d9be28cfd4551de949bb5b8c44b1d6e2aec9b
+Subproject commit 7bde8b8259921f2dcbb31a664ceb298b819d29dc
diff --git a/third_party/libpng b/third_party/libpng
index f135775ad..34005e3d3 160000
--- a/third_party/libpng
+++ b/third_party/libpng
@@ -1 +1 @@
-Subproject commit f135775ad4e5d4408d2e12ffcc71bb36e6b48551
+Subproject commit 34005e3d3d373c0c36898cc55eae48a79c8238a1