summaryrefslogtreecommitdiff
path: root/dev-games/aseprite
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2025-01-02 06:31:11 +0000
committerV3n3RiX <venerix@koprulu.sector>2025-01-02 06:31:11 +0000
commitff733bfb4d0bd82175e03255004faef8721b53ea (patch)
treec1061dbb981bc9e61d4f31b6610569711c7b482f /dev-games/aseprite
parentc4d4d544a37efc45bd5482e62e1fcdbe7d5993d3 (diff)
gentoo auto-resync : 02:01:2025 - 06:31:11
Diffstat (limited to 'dev-games/aseprite')
-rw-r--r--dev-games/aseprite/Manifest9
-rw-r--r--dev-games/aseprite/aseprite-1.2.40.ebuild231
-rw-r--r--dev-games/aseprite/aseprite-1.3.5-r1.ebuild2
-rw-r--r--dev-games/aseprite/files/aseprite-1.2.40_ixwebsocket-gcc13.patch245
-rw-r--r--dev-games/aseprite/files/aseprite-1.2.40_laf-gcc13.patch47
-rw-r--r--dev-games/aseprite/files/aseprite-1.2.40_musl_pthreads.patch57
-rw-r--r--dev-games/aseprite/files/aseprite-1.2.40_shared_json11.patch54
-rw-r--r--dev-games/aseprite/files/aseprite-1.2.40_shared_webp.patch72
8 files changed, 2 insertions, 715 deletions
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 019685ede8ec..bc9dd9310cd7 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,10 +1,5 @@
AUX aseprite-1.2.35_laf_fixes.patch 1265 BLAKE2B 9c0c7ab527f15fdce6de34351c2f4b0a35f889f27c37cfce545dd36a7077cc9050b6922d14071713a2fd3d2afed94daea3df1c200f89ff8cf934c818155c53e2 SHA512 c8c55b3272d0caa367a8614d46ef0b6d684dd80e03d865f44ffaa71f097f7a53b193bf497ee6288c0b10b6eb7de1f521aea6212fd483a19b0d059f0cd2a8d3ba
-AUX aseprite-1.2.40_ixwebsocket-gcc13.patch 6476 BLAKE2B f265a490c4a79b373e07b567552e61ab735433258067b9680ff14c35be3d69560c5cffe016ad47acd1386ad5c22bb6abfecc22e55de57200c0296ec1ae8d2360 SHA512 863e480e2f90ee1fe3fbece6ff4367f85a20d2eb5805635850426e573680059f3022a978652629a8d85c912a6d28b0f1aeae25d48fa3b19dfb1467bba6645915
-AUX aseprite-1.2.40_laf-gcc13.patch 1095 BLAKE2B 20c1d39cde15ae5fdb2cc678a27b2068f4e849fb257b79b1554585ff208a74336d3d41be6fcaf490d18451e0d29004773752c384883b18d2b542a77a65c3992b SHA512 8756821b8cf6385e09b6d6af471a8c28fd18c79ec34ece82f7bf50dc99d83bef478169dd91d7857162917da0cf95e6e64fb17cbbf1db3b1fc6a1b972ca23b31d
-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 aseprite-1.3.2_shared_fmt.patch 1576 BLAKE2B 79480979ad9ef65b4f448e45397ddfbdcec0429c039543ba32b3d65507f86246266d739165594c9bb7e0046eb162742a0ec41fbba0f67d750fc8b8853cff02e3 SHA512 2754fab5fce3024f18719db597dbb1a37294c2f073e129427ddd5fb1190736e61396e09e0e28bdced2eec1ef88b5b75becda20bbc8fb45b54be4d8975b27edca
AUX aseprite-1.3.2_shared_json11.patch 1974 BLAKE2B ccdf9d22544e2eaaad16909fd594bae37151dd885863885fc0138e14c55e74ebab04c1a575a6a48553d1a707e05b6985a3f5a2d4513bee9aeb385c59ea31afee SHA512 775f963876822bafc4a064be02dfccfefcd7841a5354935412b2a644222dfcaccb54f343b50343267c5f9d07299392686dc5fcb2bd0f7f2a60358de21550ce41
AUX aseprite-1.3.2_shared_webp.patch 3174 BLAKE2B f3415a4a08236dd42254c9e3cc97337904f268bec28c71efcb8723bf547482bea3b30d8639a520c8e2370b81514dd882d603046fa6c1cb8a6a6186f57b5ad57c SHA512 01c7b2f6d2a2c1140067412d258718ea5fbeea21e6874fe21f659b239255976c85e93c9669ea18255e6a6c76c402d5948e748b9c22a13f4269d0f99d708a0a50
@@ -12,9 +7,7 @@ AUX aseprite-1.3.2_strict-aliasing.patch 1438 BLAKE2B e7d63e22b4e1c1ab21526b51da
AUX aseprite-1.3.5-no-fetch-in-cmake-kthx.patch 4430 BLAKE2B 485270024f22600887c33e20c36ed5e0f863fc78979915a72faa12e4f9c9bb16ba1f7034e34fd33ad6c92b8dd39a51d6047eb67a8cba791ad38dc21950d12058 SHA512 6eb5a57c7c4c4fd504abe5fc812053e1731ef1340f983f050c275cf15ab83dfd2defda30b821efc56e35efab90ea3282f7e46ffd13edcb920cdcbe4979570a1d
AUX aseprite-1.3.5_laf-strict-aliasing.patch 5164 BLAKE2B 6b7628505b10a2ffd991a3f5b7c38455da544b53ed845fafde7cf1b531021a1b261fa8c4b8d71b27f3fad0110e2305af321c5345cef68929ee556c26688b58bc SHA512 38d4b731bbf6bb76950b86d484dc51d89cd6f686e5ad4ce6942ba4df0aa58c6e9fe85f476f922b626f5b42b9c24a3f25faad668fec7457974f444831d5e0d160
AUX skia-m102_remove_angle2.patch 644 BLAKE2B 11705c6376ad85303b8d64e6046e6e31191774d940458ddc64b8bf2d2e998168d3f1c8cd4361d623c040a03fd948ee4e0b6189c774522ae255cd0f2f572bf4c0 SHA512 bc587d92286528cbaec140a0492d5381a1dfce8263e4a2c2231b1e28778e3e5919b3896ccae416faa1b39f34517b6ada77ccaf671d25ae7d3c552a7991f5bb45
-DIST Aseprite-v1.2.40-Source.zip 61802371 BLAKE2B f6f586a3ca222de208e6639e3fc94a63f98e487e1975dccd2974ffa71f937384177639e3799fb81f064afaf1c4a048394fab32a30bcda353320ac55c38b17636 SHA512 0a548428a3362f49cb6cecaa061de8371ad3f0bc22d00bc957e21f22316772e854d7ad36ebb7e5b69274eea376bb62fa39abfd4bc02250524c3707f81a628b1f
DIST Aseprite-v1.3.5-Source.zip 64189695 BLAKE2B f796f688f0ba565ae32fde2e8d84e39b610f451054440ced078ce1fc847a9208460b45aa6efa059a56c9e0603b4fd156cc476a2c40715ec2c37181e39c06a401 SHA512 885386e84c55b84cc85ffbf16f7269ac1640458abe973c3aa2e3eabd807ea3e1e06ee6e6dfaffff9dd7b09d3b37bd9ac41821152838cd80742edd4d53302c0e3
DIST skia-m102-3338e90707323d2cd3a150276acb9f39933deee2.gh.tar.gz 53944562 BLAKE2B 9da3e8386cd7a18a6ee9362743bee4146c41038af8868a6f5e8a2dce468e4dc4669b488861d117da8d1bd8461b2ad47bfc300774a33a84153bca345d63a929a7 SHA512 9ae0032ee3861ce4958af6eb7047273d28b1faa3823576ef568e3c7faed7f49a9976540a72c3fa38234a4ae6319ac381324eff807938f9763781fd33ad67d075
-EBUILD aseprite-1.2.40.ebuild 5852 BLAKE2B 304c13646d338ac0a049ae753a731fd740d2e55efa9177cdb01063338420b6f6aa8508c644696fa31e14a8abf8fe79367545068e33eca1c39c16b9769b07441f SHA512 16152159dad23c1965a4604c0512b36fc6699efd45ba7aa1548175477a52346d366c05b67ef99707f48857ca39d662cb4dc6156d3c93727ff178e8aab7f374f1
-EBUILD aseprite-1.3.5-r1.ebuild 5949 BLAKE2B 407e4faa2a766090e9f6fff44c6986970bedad48d0dcc3de5e6c40eac66f4a2dd332fe421e4643436556613515b7f28c3136a86e444ff6a405d100368e6c60f4 SHA512 81d33a305c8b66eb9d76c1195375a61bc14c39478c1eed98f649ca49e341f6902a94f4746b6f2a109df8709f49eef3178c64d5898bb87fd26f61d9881168962e
+EBUILD aseprite-1.3.5-r1.ebuild 5948 BLAKE2B 12551c3b768d77f6e17509445320bd2b2a32ec67549064a5e9fbc107419c76ebb499ca9dfd12d6867784b4910d97d4de0d175d6ac4e24450b7d394901b82dd89 SHA512 02467ad6b7ef9276e32897d434d8eb2f50eb0cd3e1d63e6c1da8c46d6e76c4486a0bdb59d07a5e63c4c0b4abc260e2ed74e94520c69b1bd2905b2b11e379e176
MISC metadata.xml 489 BLAKE2B a7c8e63d627aed0bbdcab626fd6b15941b1597b56abe3de87d172a919008122cfa9ee29dc10256c5722e6cea243d836a8d3bb9918f1d1d1963bc299d04fab285 SHA512 beb3ca2b414414980370e02138e0ec8bc931d4807fabb403e21a244365c4af65a5830dc6465d2a3798d56eec360930444a71a549d4d6d4a03f292bf3946bab79
diff --git a/dev-games/aseprite/aseprite-1.2.40.ebuild b/dev-games/aseprite/aseprite-1.2.40.ebuild
deleted file mode 100644
index 2a603fddfb1f..000000000000
--- a/dev-games/aseprite/aseprite-1.2.40.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake desktop flag-o-matic ninja-utils python-any-r1 toolchain-funcs xdg-utils
-
-SKIA_VER="m102"
-# Last commit in ${SKIA_VER} feature branch
-# Don't use skia.googlesource.com, it produces non-reproducible tarballs
-SKIA_REV="3338e90707323d2cd3a150276acb9f39933deee2"
-
-DESCRIPTION="Animated sprite editor & pixel art tool"
-HOMEPAGE="https://www.aseprite.org"
-SRC_URI="https://github.com/aseprite/aseprite/releases/download/v${PV}/Aseprite-v${PV}-Source.zip
- https://github.com/google/skia/archive/${SKIA_REV}.tar.gz -> skia-${SKIA_VER}-${SKIA_REV}.gh.tar.gz"
-
-# See https://github.com/aseprite/aseprite#license
-LICENSE="Aseprite-EULA"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="kde test webp"
-RESTRICT="bindist mirror !test? ( test )"
-
-RDEPEND="
- app-arch/libarchive:=
- app-text/cmark:=
- dev-cpp/json11
- dev-libs/tinyxml
- media-libs/freetype
- media-libs/giflib:=
- media-libs/harfbuzz:=[truetype]
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- net-misc/curl
- sys-libs/zlib:=
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libxcb:=
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- kde-frameworks/kio:5
- )
- webp? ( media-libs/libwebp:= )"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto"
-BDEPEND="
- ${PYTHON_DEPS}
- test? ( dev-cpp/gtest )
- app-arch/unzip
- dev-build/gn
- virtual/pkgconfig"
-
-DOCS=(
- docs/ase-file-specs.md
- docs/gpl-palette-extension.md
- README.md
-)
-
-S="${WORKDIR}"
-
-PATCHES=(
- "${FILESDIR}/skia-${SKIA_VER}_remove_angle2.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"
- "${FILESDIR}/${PN}-1.2.40_ixwebsocket-gcc13.patch"
- "${FILESDIR}/${PN}-1.2.40_laf-gcc13.patch"
-)
-
-src_prepare() {
- # Remove extra \r on ends, #895504
- sed -i -e 's/\r$//' \
- third_party/IXWebSocket/ixwebsocket/IXWebSocketSendData.h || die
- cmake_src_prepare
- # Skia: remove custom optimizations
- sed -i -e 's:"\/\/gn\/skia\:optimize",::g' \
- "skia-${SKIA_REV}/gn/BUILDCONFIG.gn" || die
- # Aseprite: don't install tga bundled library
- sed -i -e '/install/d' src/tga/CMakeLists.txt || die
- # Aseprite: don't use bundled gtest
- sed -i -e '/add_subdirectory(googletest)/d' \
- laf/third_party/CMakeLists.txt || die
- # Fix shebang in thumbnailer
- sed -i -e 's:#!/usr/bin/sh:#!/bin/sh:' \
- src/desktop/linux/aseprite-thumbnailer || die
-}
-
-src_configure() {
- # -Werror=strict-aliasing, -Werror=odr, -Werror=lto-type-mismatch
- # https://bugs.gentoo.org/924692
- # https://github.com/aseprite/aseprite/issues/4413
- #
- # There is a bundled skia that fails with ODR errors. When excluding just
- # skia from testing, aseprite itself fails with strict-aliasing, and when
- # that is disabled, fails again with ODR and lto-type-mismatch issues.
- #
- # There are a lot of issues, so don't trust any fixes without thorough
- # testing.
- append-flags -fno-strict-aliasing
- filter-lto
-
- einfo "Skia configuration"
- cd "${WORKDIR}/skia-${SKIA_REV}" || die
-
- tc-export AR CC CXX
-
- passflags() {
- local _f _x
- _f=( ${1} )
- _x="[$(printf '"%s", ' "${_f[@]}")]"
- myconf_gn+=( ${2}="${_x}" )
- }
-
- local myconf_gn=(
- ar=\"${AR}\"
- cc=\"${CC}\"
- cxx=\"${CXX}\"
-
- is_official_build=true
- is_component_build=false
- is_debug=false
-
- skia_use_egl=false
- skia_use_dawn=false
- skia_use_dng_sdk=false
- skia_use_metal=false
- skia_use_sfntly=false
- skia_use_wuffs=false
-
- skia_enable_pdf=false
- skia_enable_svg=false
- skia_use_expat=false
- skia_use_ffmpeg=false
- skia_use_fontconfig=false
- skia_use_freetype=true
- skia_use_gl=true
- skia_use_harfbuzz=true
- skia_use_icu=false
- skia_use_libjpeg_turbo_decode=true
- skia_use_libjpeg_turbo_encode=true
- skia_use_libpng_decode=true
- skia_use_libpng_encode=true
- skia_use_libwebp_decode=$(usex webp true false)
- skia_use_libwebp_encode=$(usex webp true false)
- skia_use_lua=false
- skia_use_vulkan=false
- skia_use_x11=false
- skia_use_xps=false
- skia_use_zlib=true
- )
-
- passflags "${CFLAGS}" extra_cflags_c
- passflags "${CXXFLAGS}" extra_cflags_cc
- passflags "${LDFLAGS}" extra_ldflags
- myconf_gn="${myconf_gn[@]}"
- set -- gn gen --args="${myconf_gn% }" out/Static
- echo "$@"
- "$@" || die
-
- einfo "Aseprite configuration"
- cd "${WORKDIR}" || die
-
- local mycmakeargs=(
- -DENABLE_CCACHE=OFF
- -DENABLE_DESKTOP_INTEGRATION=ON
- -DENABLE_STEAM=OFF
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_QT_THUMBNAILER="$(usex kde)"
- -DENABLE_UPDATER=OFF
- -DENABLE_UI=ON
- -DENABLE_WEBP="$(usex webp)"
- -DLAF_WITH_EXAMPLES=OFF
- -DLAF_WITH_TESTS="$(usex test)"
- -DFULLSCREEN_PLATFORM=ON
- -DSKIA_DIR="${WORKDIR}/skia-${SKIA_REV}/"
- -DSKIA_LIBRARY_DIR="${WORKDIR}/skia-${SKIA_REV}/out/Static/"
- -DSKIA_LIBRARY="${WORKDIR}/skia-${SKIA_REV}/out/Static/libskia.a"
- -DSKSHAPER_LIBRARY="${WORKDIR}/skia-${SKIA_REV}/out/Static/libskshaper.a"
- -DUSE_SHARED_CMARK=ON
- -DUSE_SHARED_CURL=ON
- -DUSE_SHARED_FREETYPE=ON
- -DUSE_SHARED_GIFLIB=ON
- -DUSE_SHARED_HARFBUZZ=ON
- -DUSE_SHARED_JPEGLIB=ON
- -DUSE_SHARED_JSON11=ON
- -DUSE_SHARED_LIBARCHIVE=ON
- -DUSE_SHARED_LIBPNG=ON
- -DUSE_SHARED_PIXMAN=ON
- -DUSE_SHARED_TINYXML=ON
- -DUSE_SHARED_WEBP=ON
- -DUSE_SHARED_ZLIB=ON
- )
- cmake_src_configure
-}
-
-src_compile() {
- einfo "Skia compilation"
- cd "${WORKDIR}/skia-${SKIA_REV}" || die
- eninja -C out/Static
-
- einfo "Aseprite compilation"
- cd "${WORKDIR}" || die
- cmake_src_compile
-}
-
-src_install() {
- newicon -s 64 "${S}/data/icons/ase64.png" "${PN}.png"
- cmake_src_install
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/dev-games/aseprite/aseprite-1.3.5-r1.ebuild b/dev-games/aseprite/aseprite-1.3.5-r1.ebuild
index 88154dc12a39..ae8a07e552b6 100644
--- a/dev-games/aseprite/aseprite-1.3.5-r1.ebuild
+++ b/dev-games/aseprite/aseprite-1.3.5-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/aseprite/aseprite/releases/download/v${PV}/Aseprite-
# See https://github.com/aseprite/aseprite#license
LICENSE="Aseprite-EULA MIT"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="test webp"
RESTRICT="bindist mirror !test? ( test )"
diff --git a/dev-games/aseprite/files/aseprite-1.2.40_ixwebsocket-gcc13.patch b/dev-games/aseprite/files/aseprite-1.2.40_ixwebsocket-gcc13.patch
deleted file mode 100644
index 85ae6739beb8..000000000000
--- a/dev-games/aseprite/files/aseprite-1.2.40_ixwebsocket-gcc13.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-From a5d86afd43920d2401682ecd3ec6879a574845ea Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Sun, 19 Feb 2023 21:08:36 +0300
-Subject: [PATCH] Fix compilation on GCC-13
-
-GCC-13 changes internal cstdint includes, and now files that uses
-standart integer types should directly include cstdint header.
-
-See: https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-See: https://github.com/machinezone/IXWebSocket/pull/443
-Bug: https://bugs.gentoo.org/865117
-Bug: https://bugs.gentoo.org/895440
---- a/third_party/IXWebSocket/ixwebsocket/IXBench.h
-+++ b/third_party/IXWebSocket/ixwebsocket/IXBench.h
-@@ -6,7 +6,7 @@
- #pragma once
-
- #include <chrono>
--#include <stdint.h>
-+#include <cstdint>
- #include <string>
-
- namespace ix
---- a/third_party/IXWebSocket/ixwebsocket/IXConnectionState.h
-+++ b/third_party/IXWebSocket/ixwebsocket/IXConnectionState.h
-@@ -7,9 +7,9 @@
- #pragma once
-
- #include <atomic>
-+#include <cstdint>
- #include <functional>
- #include <memory>
--#include <stdint.h>
- #include <string>
-
- namespace ix
---- a/third_party/IXWebSocket/ixwebsocket/IXDNSLookup.h
-+++ b/third_party/IXWebSocket/ixwebsocket/IXDNSLookup.h
-@@ -12,6 +12,7 @@
-
- #include "IXCancellationRequest.h"
- #include <atomic>
-+#include <cstdint>
- #include <memory>
- #include <mutex>
- #include <set>
---- a/third_party/IXWebSocket/ixwebsocket/IXHttp.h
-+++ b/third_party/IXWebSocket/ixwebsocket/IXHttp.h
-@@ -9,6 +9,7 @@
- #include "IXProgressCallback.h"
- #include "IXWebSocketHttpHeaders.h"
- #include <atomic>
-+#include <cstdint>
- #include <tuple>
- #include <unordered_map>
-
---- a/third_party/IXWebSocket/ixwebsocket/IXHttpClient.cpp
-+++ b/third_party/IXWebSocket/ixwebsocket/IXHttpClient.cpp
-@@ -12,6 +12,7 @@
- #include "IXUserAgent.h"
- #include "IXWebSocketHttpHeaders.h"
- #include <assert.h>
-+#include <cstdint>
- #include <cstring>
- #include <iomanip>
- #include <random>
---- a/third_party/IXWebSocket/ixwebsocket/IXHttpServer.cpp
-+++ b/third_party/IXWebSocket/ixwebsocket/IXHttpServer.cpp
-@@ -10,6 +10,7 @@
- #include "IXNetSystem.h"
- #include "IXSocketConnect.h"
- #include "IXUserAgent.h"
-+#include <cstdint>
- #include <cstring>
- #include <fstream>
- #include <sstream>
---- a/third_party/IXWebSocket/ixwebsocket/IXNetSystem.h
-+++ b/third_party/IXWebSocket/ixwebsocket/IXNetSystem.h
-@@ -6,6 +6,8 @@
-
- #pragma once
-
-+#include <cstdint>
-+
- #ifdef _WIN32
-
- #ifndef WIN32_LEAN_AND_MEAN
---- a/third_party/IXWebSocket/ixwebsocket/IXSelectInterrupt.h
-+++ b/third_party/IXWebSocket/ixwebsocket/IXSelectInterrupt.h
-@@ -6,8 +6,8 @@
-
- #pragma once
-
-+#include <cstdint>
- #include <memory>
--#include <stdint.h>
- #include <string>
-
- namespace ix
---- a/third_party/IXWebSocket/ixwebsocket/IXSelectInterruptEvent.h
-+++ b/third_party/IXWebSocket/ixwebsocket/IXSelectInterruptEvent.h
-@@ -5,8 +5,8 @@
- #pragma once
-
- #include "IXSelectInterrupt.h"
-+#include <cstdint>
- #include <mutex>
--#include <stdint.h>
- #include <string>
- #include <deque>
- #ifdef _WIN32
---- a/third_party/IXWebSocket/ixwebsocket/IXSelectInterruptPipe.h
-+++ b/third_party/IXWebSocket/ixwebsocket/IXSelectInterruptPipe.h
-@@ -7,6 +7,7 @@
- #pragma once
-
- #include "IXSelectInterrupt.h"
-+#include <cstdint>
- #include <mutex>
- #include <stdint.h>
- #include <string>
---- a/third_party/IXWebSocket/ixwebsocket/IXSocket.cpp
-+++ b/third_party/IXWebSocket/ixwebsocket/IXSocket.cpp
-@@ -14,7 +14,6 @@
- #include <array>
- #include <assert.h>
- #include <fcntl.h>
--#include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
---- a/third_party/IXWebSocket/ixwebsocket/IXSocket.h
-+++ b/third_party/IXWebSocket/ixwebsocket/IXSocket.h
-@@ -7,6 +7,7 @@
- #pragma once
-
- #include <atomic>
-+#include <cstdint>
- #include <functional>
- #include <memory>
- #include <mutex>
---- a/third_party/IXWebSocket/ixwebsocket/IXSocketMbedTLS.cpp
-+++ b/third_party/IXWebSocket/ixwebsocket/IXSocketMbedTLS.cpp
-@@ -14,6 +14,7 @@
- #include "IXNetSystem.h"
- #include "IXSocket.h"
- #include "IXSocketConnect.h"
-+#include <cstdint>
- #include <string.h>
-
- #ifdef _WIN32
---- a/third_party/IXWebSocket/ixwebsocket/IXUuid.cpp
-+++ b/third_party/IXWebSocket/ixwebsocket/IXUuid.cpp
-@@ -16,6 +16,7 @@
-
- #include "IXUuid.h"
-
-+#include <cstdint>
- #include <iomanip>
- #include <random>
- #include <sstream>
---- a/third_party/IXWebSocket/ixwebsocket/IXWebSocket.cpp
-+++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocket.cpp
-@@ -13,6 +13,7 @@
- #include "IXWebSocketHandshake.h"
- #include <cassert>
- #include <cmath>
-+#include <cstdint>
-
-
- namespace
---- a/third_party/IXWebSocket/ixwebsocket/IXWebSocket.h
-+++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocket.h
-@@ -21,6 +21,7 @@
- #include "IXWebSocketTransport.h"
- #include <atomic>
- #include <condition_variable>
-+#include <cstdint>
- #include <mutex>
- #include <string>
- #include <thread>
---- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflate.cpp
-+++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflate.cpp
-@@ -46,6 +46,8 @@
- *
- */
-
-+#include <cstdint>
-+
- #include "IXWebSocketPerMessageDeflate.h"
-
- #include "IXUniquePtr.h"
---- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflateCodec.h
-+++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflateCodec.h
-@@ -10,6 +10,7 @@
- #include "zlib.h"
- #endif
- #include <array>
-+#include <cstdint>
- #include <string>
- #include <vector>
- #include "IXWebSocketSendData.h"
---- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflateOptions.h
-+++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflateOptions.h
-@@ -6,6 +6,7 @@
-
- #pragma once
-
-+#include <cstdint>
- #include <string>
-
- namespace ix
---- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketSendData.h
-+++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketSendData.h
-@@ -6,6 +6,7 @@
-
- #pragma once
-
-+#include <cstdint>
- #include <string>
- #include <vector>
- #include <iterator>
---- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketTransport.cpp
-+++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketTransport.cpp
-@@ -45,7 +45,6 @@
- #include <cstdarg>
- #include <cstdlib>
- #include <sstream>
--#include <stdlib.h>
- #include <string.h>
- #include <string>
- #include <thread>
---- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketTransport.h
-+++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketTransport.h
-@@ -21,6 +21,7 @@
- #include "IXWebSocketSendData.h"
- #include "IXWebSocketSendInfo.h"
- #include <atomic>
-+#include <cstdint>
- #include <functional>
- #include <list>
- #include <memory>
---
-2.39.2
-
diff --git a/dev-games/aseprite/files/aseprite-1.2.40_laf-gcc13.patch b/dev-games/aseprite/files/aseprite-1.2.40_laf-gcc13.patch
deleted file mode 100644
index 3d7ff309342b..000000000000
--- a/dev-games/aseprite/files/aseprite-1.2.40_laf-gcc13.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 59c6af303dea4c6dc0c9da687ec73612929eacfc Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Tue, 21 Feb 2023 17:01:04 +0300
-Subject: [PATCH] Fix compilation on GCC13
-
-GCC-13 changes internal cstdint includes, and now files that uses
-standard integer types should directly include cstdint header.
-
-See: https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-See: https://github.com/aseprite/laf/pull/55
-Bug: https://bugs.gentoo.org/865117
-Bug: https://bugs.gentoo.org/895616
---- a/laf/base/file_content.h
-+++ b/laf/base/file_content.h
-@@ -9,6 +9,7 @@
- #pragma once
-
- #include "base/buffer.h"
-+#include "base/ints.h"
-
- #include <cstdio>
- #include <string>
---- a/laf/base/sha1.h
-+++ b/laf/base/sha1.h
-@@ -11,6 +11,8 @@
- #include <vector>
- #include <string>
-
-+#include "base/ints.h"
-+
- extern "C" struct SHA1Context;
-
- namespace base {
---- a/laf/base/sha1_rfc3174.h
-+++ b/laf/base/sha1_rfc3174.h
-@@ -18,6 +18,8 @@
- #define BASE_SHA1_RFC3174_H_INCLUDED
- #pragma once
-
-+#include "base/ints.h"
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
---
-2.39.2
-
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
deleted file mode 100644
index 6a6dfd9f6020..000000000000
--- a/dev-games/aseprite/files/aseprite-1.2.40_musl_pthreads.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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.40_shared_json11.patch b/dev-games/aseprite/files/aseprite-1.2.40_shared_json11.patch
deleted file mode 100644
index d4c50484c9a8..000000000000
--- a/dev-games/aseprite/files/aseprite-1.2.40_shared_json11.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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 2/3] Use shared json11 library
-
-Added option -DUSE_SHARED_JSON11
----
- CMakeLists.txt | 7 +++++++
- third_party/CMakeLists.txt | 4 +++-
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-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)
- option(USE_SHARED_CURL "Use your installed copy of curl" off)
- option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off)
- option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off)
-+option(USE_SHARED_JSON11 "Use your installed copy of json11" off)
- 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)
-@@ -301,6 +302,12 @@ else()
- endif()
- include_directories(${JPEG_INCLUDE_DIRS})
-
-+if(USE_SHARED_JSON11)
-+ find_package(PkgConfig QUIET)
-+ pkg_check_modules(JSON11 json11)
-+ include_directories(${JSON11_INCLUDE_DIRS})
-+endif()
-+
- if(USE_SHARED_CMARK)
- 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 e0a11c9c6..63ad42f23 100644
---- a/third_party/CMakeLists.txt
-+++ b/third_party/CMakeLists.txt
-@@ -123,7 +123,9 @@ if(NOT USE_SHARED_CMARK)
- endif()
-
- # JSON
--add_subdirectory(json11)
-+if(NOT USE_SHARED_JSON11)
-+ add_subdirectory(json11)
-+endif()
-
- # libarchive
- if(NOT USE_SHARED_LIBARCHIVE)
---
-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
deleted file mode 100644
index 44f46efac5d5..000000000000
--- a/dev-games/aseprite/files/aseprite-1.2.40_shared_webp.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-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
-