From 7f62495148c8b3118078b4c4197aae26878e238b Mon Sep 17 00:00:00 2001 From: ImperatorStorm <30777770+ImperatorStorm@users.noreply.github.com> Date: Fri, 11 Mar 2022 15:21:31 -0800 Subject: [PATCH] Improvement to previous commit. Download skia as `skia-$_skiaver.tar.gz` to prevent sourcefile collisions. --- .SRCINFO | 2 +- PKGBUILD | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 44f8217..472a883 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -33,7 +33,7 @@ pkgbase = aseprite depends = libxcursor noextract = Aseprite-v1.2.33-Source.zip source = https://github.com/aseprite/aseprite/releases/download/v1.2.33/Aseprite-v1.2.33-Source.zip - source = skia.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m96-2f1f21b8a9.tar.gz + source = skia-m96.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m96-2f1f21b8a9.tar.gz source = desktop.patch source = shared-fmt.patch source = shared-libarchive.patch diff --git a/PKGBUILD b/PKGBUILD index 9402ffa..53a8a46 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,6 +10,7 @@ pkgname=aseprite pkgver=1.2.33 +_skiaver=m96 pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') @@ -38,7 +39,7 @@ makedepends=(# "Meta" dependencies ) source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprite-v$pkgver-Source.zip" # Which branch a given build of Aseprite requires is noted in its `INSTALL.md` - "skia.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m96-2f1f21b8a9.tar.gz" + "skia-$_skiaver.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/$_skiaver-2f1f21b8a9.tar.gz" desktop.patch shared-fmt.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch @@ -63,7 +64,7 @@ prepare() { bsdtar -xf "${noextract[0]}" -C aseprite # Extract Skia's sources mkdir -p skia - bsdtar -xf skia.tar.gz -C skia + bsdtar -xf skia-$_skiaver.tar.gz -C skia # Fix up Aseprite's desktop integration env -C aseprite patch -tp1