upgpkg: aseprite 1.3.13-6

actually fix it for real this time
unfortunately make it awful to edit as a result
This commit is contained in:
ImperatorStorm 2025-04-30 19:46:22 -05:00
parent d3ab2df85b
commit 3da9fd70a7
3 changed files with 33 additions and 26 deletions

View File

@ -45,6 +45,7 @@ pkgbase = aseprite
source = optional-pixman.patch source = optional-pixman.patch
source = fix-shared-tinyxml2.patch source = fix-shared-tinyxml2.patch
source = shared-libwebp-found.patch source = shared-libwebp-found.patch
source = include_cstdint.patch
sha256sums = c2e639c083d99a5a478ded7c86d9d7f4e4ff9ebebf6fedac7f8bfc94d6bd94c1 sha256sums = c2e639c083d99a5a478ded7c86d9d7f4e4ff9ebebf6fedac7f8bfc94d6bd94c1
sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad
sha256sums = 8ee87f57b5792e5751f63fe37cdda8d29053cd4449e1f533e792e15abcfefa79 sha256sums = 8ee87f57b5792e5751f63fe37cdda8d29053cd4449e1f533e792e15abcfefa79
@ -56,5 +57,6 @@ pkgbase = aseprite
sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654 sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654
sha256sums = ba02fc060dc930cfd66a8903a5d8a59f981753bdf416e91cc77a48c56c86aea3 sha256sums = ba02fc060dc930cfd66a8903a5d8a59f981753bdf416e91cc77a48c56c86aea3
sha256sums = 72605d6760c29eb98f2d8d8cf2cc9f9f7d7655bcf7cfc944f6a46b0957adbb14 sha256sums = 72605d6760c29eb98f2d8d8cf2cc9f9f7d7655bcf7cfc944f6a46b0957adbb14
sha256sums = ce20c8caa61b0e4b478eb08853e1148eba76836027ec04cf5d0f76c4db9ae112
pkgname = aseprite pkgname = aseprite

View File

@ -53,7 +53,8 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit
shared-skia-deps.patch shared-skia-deps.patch
optional-pixman.patch optional-pixman.patch
fix-shared-tinyxml2.patch fix-shared-tinyxml2.patch
shared-libwebp-found.patch) shared-libwebp-found.patch
include_cstdint.patch)
noextract=("Aseprite-v$pkgver-Source.zip" noextract=("Aseprite-v$pkgver-Source.zip"
"skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root
sha256sums=('c2e639c083d99a5a478ded7c86d9d7f4e4ff9ebebf6fedac7f8bfc94d6bd94c1' sha256sums=('c2e639c083d99a5a478ded7c86d9d7f4e4ff9ebebf6fedac7f8bfc94d6bd94c1'
@ -66,8 +67,9 @@ sha256sums=('c2e639c083d99a5a478ded7c86d9d7f4e4ff9ebebf6fedac7f8bfc94d6bd94c1'
'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0'
'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654' 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654'
'ba02fc060dc930cfd66a8903a5d8a59f981753bdf416e91cc77a48c56c86aea3' 'ba02fc060dc930cfd66a8903a5d8a59f981753bdf416e91cc77a48c56c86aea3'
'72605d6760c29eb98f2d8d8cf2cc9f9f7d7655bcf7cfc944f6a46b0957adbb14') '72605d6760c29eb98f2d8d8cf2cc9f9f7d7655bcf7cfc944f6a46b0957adbb14'
_debug="true" 'ce20c8caa61b0e4b478eb08853e1148eba76836027ec04cf5d0f76c4db9ae112')
_debug="false"
prepare() { prepare() {
# Extract Aseprite's sources # Extract Aseprite's sources
mkdir -p aseprite mkdir -p aseprite
@ -96,6 +98,8 @@ prepare() {
env -C aseprite/third_party/TinyEXIF patch -tp1 <fix-shared-tinyxml2.patch env -C aseprite/third_party/TinyEXIF patch -tp1 <fix-shared-tinyxml2.patch
[[ -n $_debug ]] && echo shared-libwebp-found.patch [[ -n $_debug ]] && echo shared-libwebp-found.patch
env -C aseprite patch -tp1 <shared-libwebp-found.patch env -C aseprite patch -tp1 <shared-libwebp-found.patch
[[ -n $_debug ]] && echo include_cstdint.patch
patch -tp1 <include_cstdint.patch
} }
build() { build() {
@ -127,29 +131,7 @@ build() {
# skia_enable_{particles,skparagraph,sktext}: Aseprite does not link against this library. # skia_enable_{particles,skparagraph,sktext}: Aseprite does not link against this library.
# gn is bad software # gn is bad software
local _gn_args=( env -C skia gn gen "$_skiadir" --args='is_official_build=true skia_build_fuzzers=false skia_enable_pdf=false skia_enable_skottie=false skia_enable_sksl=false skia_enable_svg=false skia_use_libjpeg_turbo_encode=false skia_use_libjpeg_turbo_decode=false skia_use_libwebp_encode=false skia_use_libwebp_decode=false skia_use_expat=false skia_use_piex=false skia_use_xps=false skia_use_zlib=false skia_use_libgifcodec=false skia_enable_particles=false skia_enable_skparagraph=false skia_enable_sktext=false cc="clang" cxx="clang++"'
is_official_build=true
skia_build_fuzzers=false
skia_enable_pdf=false
skia_enable_skottie=false
skia_enable_sksl=false
skia_enable_svg=false
skia_use_libjpeg_turbo_encode=false
skia_use_libjpeg_turbo_decode=false
skia_use_libwebp_encode=false
skia_use_libwebp_decode=false
skia_use_expat=false
skia_use_piex=false
skia_use_xps=false
skia_use_zlib=false
skia_use_libgifcodec=false
skia_enable_particles=false
skia_enable_skparagraph=false
skia_enable_sktext=false
cc="clang"
cxx="clang++"
)
env -C skia gn gen "$_skiadir" --args="${_gn_args[@]}"
ninja -C "$_skiadir" skia modules ninja -C "$_skiadir" skia modules
echo Building Aseprite... echo Building Aseprite...

23
include_cstdint.patch Normal file
View File

@ -0,0 +1,23 @@
diff --git a/aseprite/third_party/json11/json11.cpp b/aseprite/third_party/json11/json11.cpp
index b16f409..9a45f8e 100644
--- a/aseprite/third_party/json11/json11.cpp
+++ b/aseprite/third_party/json11/json11.cpp
@@ -24,6 +24,7 @@
#include <cmath>
#include <cstdlib>
#include <cstdio>
+#include <cstdint>
#include <limits>
namespace json11 {
diff --git a/skia/src/sksl/transform/SkSLTransform.h b/skia/src/sksl/transform/SkSLTransform.h
index b2d1f90..6a34284 100644
--- a/skia/src/sksl/transform/SkSLTransform.h
+++ b/skia/src/sksl/transform/SkSLTransform.h
@@ -10,6 +10,7 @@
#include <memory>
#include <vector>
+#include <cstdint>
namespace SkSL {