diff --git a/.SRCINFO b/.SRCINFO index 0c0befc..bfa608d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -22,6 +22,7 @@ pkgbase = aseprite depends = tinyxml depends = libfreetype.so depends = libarchive.so + depends = libfmt.so depends = libwebp.so depends = libwebpmux.so depends = libwebpdemux.so @@ -35,6 +36,7 @@ pkgbase = aseprite source = https://github.com/aseprite/aseprite/releases/download/v1.2.31/Aseprite-v1.2.31-Source.zip source = git+https://github.com/aseprite/skia.git#branch=aseprite-m96 source = desktop.patch + source = shared-fmt.patch source = shared-libarchive.patch source = shared-libwebp.patch source = shared-skia-deps.patch @@ -42,7 +44,8 @@ pkgbase = aseprite sha256sums = 966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d sha256sums = SKIP sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 - sha256sums = e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7 + sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 + sha256sums = d7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53 sha256sums = 2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055 sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0 sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654 diff --git a/.gitignore b/.gitignore index d0ea81c..50d1d8f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ !/.SRCINFO !/PKGBUILD !/desktop.patch +!/shared-fmt.patch !/shared-libarchive.patch !/shared-libwebp.patch !/shared-skia-deps.patch diff --git a/PKGBUILD b/PKGBUILD index 60ea163..6deac4e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,7 +18,7 @@ license=('custom') depends=(# ~ Aseprite's direct dependencies ~ # pixman is not linked to because we use Skia instead # harfbuzz is linked statically because Aseprite expects an older version - cmark libcurl.so libgif.so libjpeg.so zlib libpng tinyxml libfreetype.so libarchive.so + cmark libcurl.so libgif.so libjpeg.so zlib libpng tinyxml libfreetype.so libarchive.so libfmt.so libwebp.so libwebpmux.so libwebpdemux.so hicolor-icon-theme # For installing Aseprite's icons # ~ Skia deps ~ @@ -37,6 +37,7 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit # Which branch a given build of Aseprite requires is noted in its `INSTALL.md` "git+https://github.com/aseprite/skia.git#branch=aseprite-m96" desktop.patch + shared-fmt.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch shared-libarchive.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2523.patch @@ -47,7 +48,8 @@ noextract=("${source[0]##*/}") # Don't extract Aseprite sources at the root sha256sums=('966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d' 'SKIP' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' - 'e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7' + '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' + 'd7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53' '2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055' 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654') @@ -59,11 +61,10 @@ prepare() { # Fix up Aseprite's desktop integration env -C aseprite patch -tp1