Screw it, upstream uses clang, gcc>=13 is broken, using clang.

This commit is contained in:
ImperatorStorm 2023-05-03 12:39:37 -07:00
parent 0ae586ef92
commit bf5e8bec21
2 changed files with 17 additions and 3 deletions

View File

@ -1,7 +1,7 @@
pkgbase = aseprite pkgbase = aseprite
pkgdesc = Create animated sprites and pixel art pkgdesc = Create animated sprites and pixel art
pkgver = 1.2.40 pkgver = 1.2.40
pkgrel = 6 pkgrel = 7
url = https://www.aseprite.org/ url = https://www.aseprite.org/
arch = x86_64 arch = x86_64
license = custom license = custom
@ -12,6 +12,7 @@ pkgbase = aseprite
makedepends = libxi makedepends = libxi
makedepends = gn makedepends = gn
makedepends = harfbuzz-icu makedepends = harfbuzz-icu
makedepends = clang
depends = cmark depends = cmark
depends = libcurl.so depends = libcurl.so
depends = libgif.so depends = libgif.so

View File

@ -12,7 +12,7 @@ pkgname=aseprite
pkgver=1.2.40 pkgver=1.2.40
_skiaver=m102 _skiaver=m102
_skiahash=861e4743af _skiahash=861e4743af
pkgrel=6 pkgrel=7
pkgdesc='Create animated sprites and pixel art' pkgdesc='Create animated sprites and pixel art'
arch=('x86_64') arch=('x86_64')
url="https://www.aseprite.org/" url="https://www.aseprite.org/"
@ -36,7 +36,8 @@ makedepends=(# "Meta" dependencies
# Skia # Skia
gn harfbuzz-icu gn harfbuzz-icu
# TODO: Benchmark clang v gcc # TODO: Benchmark clang v gcc
# clang # Fuck it, compiling with GCC>=13 is broken and I'm not gonna write a patch to fix it
clang
) )
source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprite-v$pkgver-Source.zip" 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` # Which branch a given build of Aseprite requires is noted in its `INSTALL.md`
@ -88,6 +89,10 @@ prepare() {
build() { build() {
echo Building Skia... echo Building Skia...
local _skiadir="$PWD/skia/obj" local _skiadir="$PWD/skia/obj"
export CXX=clang++
export CC=clang
export AR=ar
export NM=nm
# Flags can be found by running `gn args --list "$_skiadir"` from skia's directory. # Flags can be found by running `gn args --list "$_skiadir"` from skia's directory.
# (Pipe the output somewhere, there's a LOT of args.) # (Pipe the output somewhere, there's a LOT of args.)
# #
@ -127,10 +132,18 @@ skia_enable_{particles,skparagraph,sktext}=false)"
} }
check() { check() {
export CXX=clang++
export CC=clang
export AR=ar
export NM=nm
env -C build ctest --output-on-failure env -C build ctest --output-on-failure
} }
package() { package() {
export CXX=clang++
export CC=clang
export AR=ar
export NM=nm
# Now the fun part: components of e.g. `libwebp` get installed as well, # Now the fun part: components of e.g. `libwebp` get installed as well,
# since we've had to compile it. But we don't want them. # since we've had to compile it. But we don't want them.
# So, install normally, and then cherry-pick Aseprite's files out of that. # So, install normally, and then cherry-pick Aseprite's files out of that.