summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorImperatorStorm2022-03-11 15:21:31 -0800
committerImperatorStorm2022-03-11 15:21:31 -0800
commit7f62495148c8b3118078b4c4197aae26878e238b (patch)
treeb17fe6b6135831cba76a8d51ab1bd51aaf94bc91
parentc83b6597a830e15d248ef9e2efe97e6fd4837a49 (diff)
downloadaur-7f62495148c8b3118078b4c4197aae26878e238b.tar.gz
Improvement to previous commit.
Download skia as `skia-$_skiaver.tar.gz` to prevent sourcefile collisions.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD5
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 44f82175cc23..472a8837e027 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 9402ffa4c30f..53a8a466cd9f 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 <desktop.patch
# Allow using more shared libs