gentoo auto-resync : 22:11:2022 - 19:06:54

8 files changed, 150 insertions, 136 deletions

diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 617dc5c2f102..b845cf9ffc42 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,13 +1,13 @@
 AUX aseprite-1.1.7_type-punned_pointer.patch 836 BLAKE2B ca46926a87411fa74c7d66830bd4fc43dc3ae5130342bbb4300398c11a810949ccc530a8a7e66ae6265b2f89fe0bd667557ee7c647491e93d52768d74a340554 SHA512 c01ca8dc6bcee6276f3f4c7f7f141d8528372f0cbbb33c036b89ba64e639966d9b9955a78ec917ef7ebeda2148abc817bc4df7c1fe02818734f51cd7452df9ca
-AUX aseprite-1.2.35_check_colorSpace.patch 968 BLAKE2B a9c9e4b7b2e604e741ad0a50569e4cf0b4ea8dcdf8d66988973908e4b814e2bfe2164db0505ba24dd3a1860a6bdf322188bc5e07dd426c13709f729d3d373e81 SHA512 5647dc3a1faa6cd0ced4a781e1a9461cf499fb1f4420b6790e52a346cce6d245f3123539702976dfc66a6f5c2eda151e5aae03a91d5ebf127fa99896db512efd
 AUX aseprite-1.2.35_laf_fixes.patch 1265 BLAKE2B 9c0c7ab527f15fdce6de34351c2f4b0a35f889f27c37cfce545dd36a7077cc9050b6922d14071713a2fd3d2afed94daea3df1c200f89ff8cf934c818155c53e2 SHA512 c8c55b3272d0caa367a8614d46ef0b6d684dd80e03d865f44ffaa71f097f7a53b193bf497ee6288c0b10b6eb7de1f521aea6212fd483a19b0d059f0cd2a8d3ba
-AUX aseprite-1.2.35_shared_json11.patch 1786 BLAKE2B e2ceb13497e61f8fa9d9025ded3ee8e0ffd12dfe2024a7a14d6210c712ec8574c9be3e932b0c04a7a2aad8ebb127e303f6f8d1f29e14177103b686f645210350 SHA512 f67a7d65567204e17c134d99e79f5a7bf29e9d17d28953ebadcc3921cdb80a9dd865979878138eb7c664486706a094dbcf8c105127ba833b049c5a59eb6af1cf
-AUX aseprite-1.2.35_shared_libarchive.patch 5056 BLAKE2B b681461ccc86889fe387fe0a061e4f785f45f2d46a28dd08144a8458bf19ef19f73bea7937515f74363f77655976761c512a198ac9a562d2e2acfb116875bafe SHA512 51ba9b5fb31a2eaa5bfdff61b2ca77aeb94aa080d3b894f641bcbf46b44c81a7310c4da426b69d9399c1b414a5f843b0633466d0eec5eb9048cd8f6b5d944f9c
-AUX aseprite-1.2.35_shared_webp.patch 3815 BLAKE2B 4d7b5e66c2f8c6a53e8f35e0373ac224caaad3e1da927e1e8979d23e9106f49c8f105bd100aea06ca49b8ad5d2bbf5b868725eb9939b46fc5f69453246b1752f SHA512 b4a452b1ab1f94e4b47d0f567a7d9f35ffafc477372479701a3ba5ce2cf9860751f0f6db2d30eed9911a24959e07c2c1ba6c919f863248dbccd35b07b111b6b5
+AUX aseprite-1.2.40_musl_pthreads.patch 1575 BLAKE2B 5dfbce6090973765fb2a4b34f04f5645cbd4787f7cdd8aa6ef9e09521a6dd5701c6d06a8d0e393714b95cac90ea3280894091fce16dfc2c385f65a834d98c0c7 SHA512 8a8359b8e8034588c45324ee174445682d8ecf526f08e3de532713dafeb8a800dbcf88e5c078299fc938e7cce5224b689e5c6544ffb49df1fdf5d79248a43e47
+AUX aseprite-1.2.40_shared_json11.patch 1790 BLAKE2B 7965d8116463ec8481e14f9f773e0bc942bd18ceb418595a13418850f3bf85a07f70bc5f17a0b74d3f6ee0dc853412df8c93ae8b2bf8e8f1cb262c175c6863b1 SHA512 6b97b6a0c4469d2130cada95f88a279608571593c9b45ee8329891ac6b094dbc55b12141c7fb1c80b4770402972d09e5e7d67e556af180c74d2e62428160d5ee
+AUX aseprite-1.2.40_shared_libarchive.patch 5060 BLAKE2B 1bce76d6621810152ef59e84c4c469753e379e550d074d7b2740e7d03a3c3affa8f1e90bbe3d30de91cd5ef9fa8d7d1ce34ac4bc559ed814d2290b7780ff6d43 SHA512 f673b03344fb56d4a71c23a4cc603a4db003efa604039607d854aaa6b8c87967d64d7c8d3c5e76b7b495f93e329e0d5e3b4f425aa580c37e43419aaff472ffc8
+AUX aseprite-1.2.40_shared_webp.patch 2865 BLAKE2B d3e54e5230c6161de6221b68bbbd574580b925052a0e8d28503c879c8cb6dc87b7e9053b926cc688987418d213da1937d419c1894342474fae4288e15016e7bf SHA512 0fea1dc6b0b0acff8a9097e026f45d648fad45f7510dc9bcd9ebbec340921017c8c53962b0c186e6cc3b89ff180c00389304be27278b56a12eb9463c1e1985d0
 AUX skia-m102_remove_angle2.patch 644 BLAKE2B 11705c6376ad85303b8d64e6046e6e31191774d940458ddc64b8bf2d2e998168d3f1c8cd4361d623c040a03fd948ee4e0b6189c774522ae255cd0f2f572bf4c0 SHA512 bc587d92286528cbaec140a0492d5381a1dfce8263e4a2c2231b1e28778e3e5919b3896ccae416faa1b39f34517b6ada77ccaf671d25ae7d3c552a7991f5bb45
 DIST Aseprite-v1.1.9-Source.zip 11746265 BLAKE2B fa16be059a7bb3b83705c56e7e93cbbb71676617a8d0798f0e481b09199ae069b85826615f8609acabb10a4e9a9da0857f2f99b03c2b913f26eee6d4dfdc0f0a SHA512 44c5878c67e69d2510c862e8f6869d727aa47b3d23d41d4e7318eca54c6d72fc5f89e72c70c160ce6da78fa091e11eedefa74e0273dc4cea59b2fe16c8851d9e
-DIST Aseprite-v1.2.37-Source.zip 61977600 BLAKE2B f904e5f2a296fa5dae6dedb7b32d5249a8cda64e3b545057e9c033e3e428f050ee128b4f96098a655d871339a77b48d7be58fdad8edffd252d8bbd7b80d0db5f SHA512 c846a6bd6f11bea18e49146cac735a165c6ab7ca63f76b3dfaf7c1f64ddc6719804bfbb340e05ecb75a171b12db9a6a0444b26782d31a84cc810b7266843b0e9
+DIST Aseprite-v1.2.40-Source.zip 61802371 BLAKE2B f6f586a3ca222de208e6639e3fc94a63f98e487e1975dccd2974ffa71f937384177639e3799fb81f064afaf1c4a048394fab32a30bcda353320ac55c38b17636 SHA512 0a548428a3362f49cb6cecaa061de8371ad3f0bc22d00bc957e21f22316772e854d7ad36ebb7e5b69274eea376bb62fa39abfd4bc02250524c3707f81a628b1f
 DIST skia-m102-3338e90707323d2cd3a150276acb9f39933deee2.gh.tar.gz 53944562 BLAKE2B 9da3e8386cd7a18a6ee9362743bee4146c41038af8868a6f5e8a2dce468e4dc4669b488861d117da8d1bd8461b2ad47bfc300774a33a84153bca345d63a929a7 SHA512 9ae0032ee3861ce4958af6eb7047273d28b1faa3823576ef568e3c7faed7f49a9976540a72c3fa38234a4ae6319ac381324eff807938f9763781fd33ad67d075
 EBUILD aseprite-1.1.9.ebuild 2751 BLAKE2B 6c5780619c95e893e181291c0fbce2f826f8ac6ba2cc559fd33c1461432e2498461f02496031b0ffc50bd974dc64ae47301c4546d600c823d809a7f162c74e64 SHA512 4178e2fb7f9c8b6b267cae0bc83d9887718057c99c4f6dd9acf7c2f41f484e463e75df78a60fbd7f8699de5ae2ee221e476148bf2bb5e93e7c064b66f6b1ac2e
-EBUILD aseprite-1.2.37.ebuild 5074 BLAKE2B f2d6f624acc979bf17fe03fd2e01108477f7f68b02a850fb8216d40fd3f38d032d2fe0a1e7ab2fa56c1d25411e508015c3c306c8d326acfdb99dff0ce0cb3a94 SHA512 1620656405836b89f05538359e225ecef2c9563a7444dfbf237c7a4caa2d0c80e683e3ce07adde536de766d4b30ebb720d8f294e556fa43180af6276c607028e
+EBUILD aseprite-1.2.40.ebuild 5071 BLAKE2B 6049fc539303f6dab59362845f828de6fe9003c8b31bb42efee5758bf4eaed6755d884eecdb4c288c68b36756679f076701cc1e4ff8e981dafd679a9bcf86506 SHA512 57c012bbec87e877f6f42e5235e5972cdc658bb9fd4f830e75e7baaecae113fa5c1c18a98547e1ee4e296180cfdb81ab9200a4664c6cd5348943cf65554818bf
 MISC metadata.xml 684 BLAKE2B a1ad6d72f940738634ce874c50abaadaee4f897a1a694170da97d4403a9fa69383934fff7392c1417b9b954c3c98a4f138a9da1921e01171a8ebf1ab91d9f256 SHA512 a4d1efc2228d170e868d8328d64a8195fec01807ca4a4424e44f55354d57ab1949c827dbadf6b8a2037979fa684cb6445d95feb37a61b4d3ac637620699f9a77
diff --git a/dev-games/aseprite/aseprite-1.2.37.ebuild b/dev-games/aseprite/aseprite-1.2.40.ebuild
index 0848144f77df..a3d1b977ef33 100644
--- a/dev-games/aseprite/aseprite-1.2.37.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.40.ebuild
@@ -66,11 +66,11 @@ S="${WORKDIR}"
 
 PATCHES=(
 	"${FILESDIR}/skia-${SKIA_VER}_remove_angle2.patch"
-	"${FILESDIR}/${PN}-1.2.35_check_colorSpace.patch"
-	"${FILESDIR}/${PN}-1.2.35_shared_libarchive.patch"
-	"${FILESDIR}/${PN}-1.2.35_shared_json11.patch"
-	"${FILESDIR}/${PN}-1.2.35_shared_webp.patch"
+	"${FILESDIR}/${PN}-1.2.40_shared_libarchive.patch"
+	"${FILESDIR}/${PN}-1.2.40_shared_json11.patch"
+	"${FILESDIR}/${PN}-1.2.40_shared_webp.patch"
 	"${FILESDIR}/${PN}-1.2.35_laf_fixes.patch"
+	"${FILESDIR}/${PN}-1.2.40_musl_pthreads.patch"
 )
 
 src_prepare() {
diff --git a/dev-games/aseprite/files/aseprite-1.2.35_check_colorSpace.patch b/dev-games/aseprite/files/aseprite-1.2.35_check_colorSpace.patch
deleted file mode 100644
index e674d1409699..000000000000
--- a/dev-games/aseprite/files/aseprite-1.2.35_check_colorSpace.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7ce4c04bce391ed16b8b8eeafc1b27c36638014c Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Sun, 10 Jul 2022 19:33:44 +0300
-Subject: [PATCH] Check colorSpace before accessing
-
-In some cases internal surface may not have a colorspace.
----
- src/app/ui/color_selector.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/app/ui/color_selector.cpp b/src/app/ui/color_selector.cpp
-index 50ca45476..0aefaa52b 100644
---- a/src/app/ui/color_selector.cpp
-+++ b/src/app/ui/color_selector.cpp
-@@ -447,6 +447,7 @@ void ColorSelector::onPaint(ui::PaintEvent& ev)
-     bool isSRGB;
-     // TODO compare both color spaces
-     if (get_current_color_space()->isSRGB() &&
-+        g->getInternalSurface()->colorSpace() &&
-         g->getInternalSurface()->colorSpace()->isSRGB()) {
-       // We can render directly in the ui::Graphics surface
-       canvas = &static_cast<os::SkiaSurface*>(g->getInternalSurface())->canvas();
--- 
-2.35.1
-
diff --git a/dev-games/aseprite/files/aseprite-1.2.35_shared_webp.patch b/dev-games/aseprite/files/aseprite-1.2.35_shared_webp.patch
deleted file mode 100644
index 0344c691a06c..000000000000
--- a/dev-games/aseprite/files/aseprite-1.2.35_shared_webp.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 848e031f0289c7fd67c2d6d098de26e479a40adb Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Sun, 10 Jul 2022 20:14:00 +0300
-Subject: [PATCH] Use shared webp library
-
-Added option -DUSE_SHARED_WEBP
----
- CMakeLists.txt             | 13 ++++++++++---
- third_party/CMakeLists.txt | 34 ++++++++++++++++++----------------
- 2 files changed, 28 insertions(+), 19 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 306049917..0196a47f2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -56,6 +56,7 @@ option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off)
- option(USE_SHARED_LIBPNG  "Use your installed copy of libpng" off)
- option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
- option(USE_SHARED_PIXMAN  "Use your installed copy of pixman" off)
-+option(USE_SHARED_WEBP    "User your installed copy of webp" off)
- option(USE_SHARED_FREETYPE "Use shared FreeType library" off)
- option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off)
- option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on)
-@@ -241,9 +242,15 @@ add_definitions(-DPNG_NO_MMX_CODE) # Do not use MMX optimizations in PNG code
- 
- # libwebp
- if(ENABLE_WEBP)
--  set(WEBP_LIBRARIES webp webpdemux libwebpmux)
--  set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
--  include_directories(${WEBP_INCLUDE_DIR})
-+  if(USE_SHARED_WEBP)
-+    find_package(PkgConfig QUIET)
-+    pkg_check_modules(WEBP libwebp libwebpdemux libwebpmux)
-+    include_directories(${WEBP_INCLUDE_DIR})
-+  else()
-+    set(WEBP_LIBRARIES webp webpdemux libwebpmux)
-+    set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
-+    include_directories(${WEBP_INCLUDE_DIR})
-+  endif()
- endif()
- 
- # tinyxml
-diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
-index f499545b6..6855fd6db 100644
---- a/third_party/CMakeLists.txt
-+++ b/third_party/CMakeLists.txt
-@@ -34,22 +34,24 @@ if(NOT USE_SHARED_GIFLIB)
- endif()
- 
- if(ENABLE_WEBP)
--  set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.")
--  set(WEBP_BUILD_ANIM_UTILS OFF CACHE BOOL "Build animation utilities.")
--  set(WEBP_BUILD_CWEBP OFF CACHE BOOL "Build the cwebp command line tool.")
--  set(WEBP_BUILD_DWEBP OFF CACHE BOOL "Build the dwebp command line tool.")
--  set(WEBP_BUILD_GIF2WEBP OFF CACHE BOOL "Build the gif2webp conversion tool.")
--  set(WEBP_BUILD_IMG2WEBP OFF CACHE BOOL "Build the img2webp animation tool.")
--  set(WEBP_BUILD_VWEBP OFF CACHE BOOL "Build the vwebp viewer tool.")
--  set(WEBP_BUILD_WEBPINFO OFF CACHE BOOL "Build the webpinfo command line tool.")
--  set(WEBP_BUILD_WEBPMUX OFF CACHE BOOL "Build the webpmux command line tool.")
--
--  add_subdirectory(libwebp)
--
--  if(NOT USE_SHARED_LIBPNG)
--    add_dependencies(webp ${PNG_LIBRARY})
--    add_dependencies(webpdemux ${PNG_LIBRARY})
--    add_dependencies(libwebpmux ${PNG_LIBRARY})
-+  if(NOT USE_SHARED_WEBP)
-+    set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.")
-+    set(WEBP_BUILD_ANIM_UTILS OFF CACHE BOOL "Build animation utilities.")
-+    set(WEBP_BUILD_CWEBP OFF CACHE BOOL "Build the cwebp command line tool.")
-+    set(WEBP_BUILD_DWEBP OFF CACHE BOOL "Build the dwebp command line tool.")
-+    set(WEBP_BUILD_GIF2WEBP OFF CACHE BOOL "Build the gif2webp conversion tool.")
-+    set(WEBP_BUILD_IMG2WEBP OFF CACHE BOOL "Build the img2webp animation tool.")
-+    set(WEBP_BUILD_VWEBP OFF CACHE BOOL "Build the vwebp viewer tool.")
-+    set(WEBP_BUILD_WEBPINFO OFF CACHE BOOL "Build the webpinfo command line tool.")
-+    set(WEBP_BUILD_WEBPMUX OFF CACHE BOOL "Build the webpmux command line tool.")
-+
-+    add_subdirectory(libwebp)
-+
-+    if(NOT USE_SHARED_LIBPNG)
-+      add_dependencies(webp ${PNG_LIBRARY})
-+      add_dependencies(webpdemux ${PNG_LIBRARY})
-+      add_dependencies(libwebpmux ${PNG_LIBRARY})
-+    endif()
-   endif()
- endif()
- 
--- 
-2.35.1
-
diff --git a/dev-games/aseprite/files/aseprite-1.2.40_musl_pthreads.patch b/dev-games/aseprite/files/aseprite-1.2.40_musl_pthreads.patch
new file mode 100644
index 000000000000..6a6dfd9f6020
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.2.40_musl_pthreads.patch
@@ -0,0 +1,57 @@
+From 27403363708ca72cbbbdb085de27896485c5c422 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Sat, 12 Nov 2022 05:13:08 +0300
+Subject: [PATCH] Don't use pthread_detach() after pthread_join()
+
+After pthread_join() all allocated to thread resources are freed, so
+pthread_detach() after pthread_join() will results in undefined behavior
+with SIGSERV on some libc implementations (like MUSL). According to
+pthread_detach(3), "Either pthread_join(3) or pthread_detach() should be
+called for each thread that an application creates".
+---
+ base/thread.cpp | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/laf/base/thread.cpp b/laf/base/thread.cpp
+index 81c1284..4d5e0ce 100644
+--- a/laf/base/thread.cpp
++++ b/laf/base/thread.cpp
+@@ -55,8 +55,12 @@ thread::thread()
+ 
+ thread::~thread()
+ {
+-  if (joinable())
++  if (joinable()) {
++#if LAF_WINDOWS
++    ::CloseHandle(m_native_handle);
++#endif  
+     detach();
++  }
+ }
+ 
+ bool thread::joinable() const
+@@ -69,6 +73,7 @@ void thread::join()
+   if (joinable()) {
+ #if LAF_WINDOWS
+     ::WaitForSingleObject(m_native_handle, INFINITE);
++    ::CloseHandle(m_native_handle);
+ #else
+     ::pthread_join((pthread_t)m_native_handle, NULL);
+ #endif
+@@ -79,12 +84,7 @@ void thread::join()
+ void thread::detach()
+ {
+   if (joinable()) {
+-#if LAF_WINDOWS
+-    ::CloseHandle(m_native_handle);
+-    m_native_handle = (native_handle_type)0;
+-#else
+-    ::pthread_detach((pthread_t)m_native_handle);
+-#endif
++    m_native_handle = (native_handle_type)NULL;
+   }
+ }
+ 
+-- 
+2.37.4
+
diff --git a/dev-games/aseprite/files/aseprite-1.2.35_shared_json11.patch b/dev-games/aseprite/files/aseprite-1.2.40_shared_json11.patch
index ef962c507609..d4c50484c9a8 100644
--- a/dev-games/aseprite/files/aseprite-1.2.35_shared_json11.patch
+++ b/dev-games/aseprite/files/aseprite-1.2.40_shared_json11.patch
@@ -1,7 +1,7 @@
-From b7b1563f0a7b913bac62673b1629755eb2adafc3 Mon Sep 17 00:00:00 2001
+From d92660c3187d0e7d5a0b7b2210f328d0d0bf73f2 Mon Sep 17 00:00:00 2001
 From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
 Date: Sun, 10 Jul 2022 19:53:06 +0300
-Subject: [PATCH] Use shared json11 library
+Subject: [PATCH 2/3] Use shared json11 library
 
 Added option -DUSE_SHARED_JSON11
 ---
@@ -10,7 +10,7 @@ Added option -DUSE_SHARED_JSON11
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 26e09c418..306049917 100644
+index 85d447ac8..69ab97ed8 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -50,6 +50,7 @@ option(USE_SHARED_CMARK   "Use your installed copy of cmark" off)
@@ -21,7 +21,7 @@ index 26e09c418..306049917 100644
  option(USE_SHARED_ZLIB    "Use your installed copy of zlib" off)
  option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off)
  option(USE_SHARED_LIBPNG  "Use your installed copy of libpng" off)
-@@ -308,6 +309,12 @@ else()
+@@ -301,6 +302,12 @@ else()
  endif()
  include_directories(${JPEG_INCLUDE_DIRS})
  
@@ -35,7 +35,7 @@ index 26e09c418..306049917 100644
    find_library(CMARK_LIBRARIES NAMES cmark)
    find_path(CMARK_INCLUDE_DIRS NAMES cmark.h)
 diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
-index 12017190f..f499545b6 100644
+index e0a11c9c6..63ad42f23 100644
 --- a/third_party/CMakeLists.txt
 +++ b/third_party/CMakeLists.txt
 @@ -123,7 +123,9 @@ if(NOT USE_SHARED_CMARK)
@@ -50,5 +50,5 @@ index 12017190f..f499545b6 100644
  # libarchive
  if(NOT USE_SHARED_LIBARCHIVE)
 -- 
-2.35.1
+2.37.4
 
diff --git a/dev-games/aseprite/files/aseprite-1.2.35_shared_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.40_shared_libarchive.patch
index 0e0e1bd0e98f..ffe5ae8bdeef 100644
--- a/dev-games/aseprite/files/aseprite-1.2.35_shared_libarchive.patch
+++ b/dev-games/aseprite/files/aseprite-1.2.40_shared_libarchive.patch
@@ -1,7 +1,7 @@
-From ddc7f2c19fd104e99bc49210b1f6ac3f5cec1548 Mon Sep 17 00:00:00 2001
+From dcad402ec83ca298cc206a1e8170b13c3f9a40fd Mon Sep 17 00:00:00 2001
 From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
 Date: Fri, 9 Oct 2020 02:18:36 +0300
-Subject: [PATCH] Make LibArchive as shared library dependency
+Subject: [PATCH 1/3] Make LibArchive as shared library dependency
 
 ---
  CMakeLists.txt             | 11 +++++++++++
@@ -10,7 +10,7 @@ Subject: [PATCH] Make LibArchive as shared library dependency
  3 files changed, 32 insertions(+), 19 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1e7692679..26e09c418 100644
+index e9814380d..85d447ac8 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -51,6 +51,7 @@ option(USE_SHARED_CURL    "Use your installed copy of curl" off)
@@ -53,7 +53,7 @@ index c42768ff6..e0495f98f 100644
    tinyexpr)
  
 diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
-index 2c0a08248..12017190f 100644
+index 96a82829d..e0a11c9c6 100644
 --- a/third_party/CMakeLists.txt
 +++ b/third_party/CMakeLists.txt
 @@ -126,24 +126,26 @@ endif()
@@ -102,5 +102,5 @@ index 2c0a08248..12017190f 100644
  # benchmark
  if(ENABLE_BENCHMARKS)
 -- 
-2.35.1
+2.37.4
 
diff --git a/dev-games/aseprite/files/aseprite-1.2.40_shared_webp.patch b/dev-games/aseprite/files/aseprite-1.2.40_shared_webp.patch
new file mode 100644
index 000000000000..44f46efac5d5
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.2.40_shared_webp.patch
@@ -0,0 +1,72 @@
+From adabed7947074268be713e1da3b4cb2d6d8c88a5 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Sun, 10 Jul 2022 20:14:00 +0300
+Subject: [PATCH 3/3] Use shared webp library
+
+Added option -DUSE_SHARED_WEBP
+---
+ CMakeLists.txt             | 25 ++++++++++++++++---------
+ third_party/CMakeLists.txt |  2 +-
+ 2 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 69ab97ed8..2cb0886cd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,6 +56,7 @@ option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off)
+ option(USE_SHARED_LIBPNG  "Use your installed copy of libpng" off)
+ option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
+ option(USE_SHARED_PIXMAN  "Use your installed copy of pixman" off)
++option(USE_SHARED_WEBP    "Use your installed copy of webp" off)
+ option(USE_SHARED_FREETYPE "Use shared FreeType library" off)
+ option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off)
+ option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on)
+@@ -345,17 +346,23 @@ add_subdirectory(laf)
+ 
+ # libwebp
+ if(ENABLE_WEBP)
+-  # Use libwebp from Skia
+-  if(LAF_BACKEND STREQUAL "skia")
+-    find_library(WEBP_LIBRARIES webp
+-      NAMES libwebp # required for Windows
+-      PATHS "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH)
+-    set(WEBP_INCLUDE_DIR "${SKIA_DIR}/third_party/externals/libwebp/src")
++  if(USE_SHARED_WEBP)
++    find_package(PkgConfig QUIET)
++    pkg_check_modules(WEBP libwebp libwebpdemux libwebpmux)
++    include_directories(${WEBP_INCLUDE_DIR})
+   else()
+-    set(WEBP_LIBRARIES webp webpdemux libwebpmux)
+-    set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
++    # Use libwebp from Skia
++    if(LAF_BACKEND STREQUAL "skia")
++      find_library(WEBP_LIBRARIES webp
++        NAMES libwebp # required for Windows
++        PATHS "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH)
++      set(WEBP_INCLUDE_DIR "${SKIA_DIR}/third_party/externals/libwebp/src")
++    else()
++      set(WEBP_LIBRARIES webp webpdemux libwebpmux)
++      set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
++    endif()
++    include_directories(${WEBP_INCLUDE_DIR})
+   endif()
+-  include_directories(${WEBP_INCLUDE_DIR})
+ endif()
+ message(STATUS "aseprite libwebp: ${WEBP_LIBRARIES}")
+ 
+diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
+index 63ad42f23..9e240bc3e 100644
+--- a/third_party/CMakeLists.txt
++++ b/third_party/CMakeLists.txt
+@@ -33,7 +33,7 @@ if(NOT USE_SHARED_GIFLIB)
+   add_subdirectory(giflib)
+ endif()
+ 
+-if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia")
++if(ENABLE_WEBP AND NOT USE_SHARED_WEBP AND NOT LAF_BACKEND STREQUAL "skia")
+   set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.")
+   set(WEBP_BUILD_ANIM_UTILS OFF CACHE BOOL "Build animation utilities.")
+   set(WEBP_BUILD_CWEBP OFF CACHE BOOL "Build the cwebp command line tool.")
+-- 
+2.37.4
+