archlinux/aseprite
1
0
Fork 0
generated from archlinux/template
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix aseprite compilation with GCC 13

Browse Source
This commit is contained in:
ImperatorStorm 2023-05-03 12:21:21 -07:00
parent 8f3a87e054
commit 0ae586ef92
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.SRCINFO
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 = 5 pkgrel = 6
url = https://www.aseprite.org/ url = https://www.aseprite.org/
arch = x86_64 arch = x86_64
license = custom license = custom
@ -35,6 +35,8 @@ pkgbase = aseprite
noextract = skia-m102.tar.gz noextract = skia-m102.tar.gz
source = https://github.com/aseprite/aseprite/releases/download/v1.2.40/Aseprite-v1.2.40-Source.zip source = https://github.com/aseprite/aseprite/releases/download/v1.2.40/Aseprite-v1.2.40-Source.zip
source = skia-m102.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m102-861e4743af.tar.gz source = skia-m102.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m102-861e4743af.tar.gz
source = IXWebSocket-GCC13pt1.patch::https://patch-diff.githubusercontent.com/raw/machinezone/IXWebSocket/pull/389.patch
source = IXWebSocket-GCC13pt2.patch::https://patch-diff.githubusercontent.com/raw/machinezone/IXWebSocket/pull/443.patch
source = desktop.patch source = desktop.patch
source = shared-fmt.patch source = shared-fmt.patch
source = shared-libarchive.patch source = shared-libarchive.patch
@ -43,6 +45,8 @@ pkgbase = aseprite
source = optional-pixman.patch source = optional-pixman.patch
sha256sums = cd67eaf34ee19ae5584f9052f3b385dcfa41232f38016baf08723b987ae583fb sha256sums = cd67eaf34ee19ae5584f9052f3b385dcfa41232f38016baf08723b987ae583fb
sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad
sha256sums = 540bdd2985ec1295137deab99b95cb484934ab5d6d3b080fbc21d15e50a5e429
sha256sums = 5c188f30ebf15013f346ef2868d6cfeb84f7ee8ac68f837fee6269aabfa4ae59
sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9
sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06
sha256sums = d7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53 sha256sums = d7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53

8
PKGBUILD
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=5 pkgrel=6
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/"
@ -41,6 +41,8 @@ makedepends=(# "Meta" dependencies
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`
"skia-$_skiaver.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/$_skiaver-$_skiahash.tar.gz" "skia-$_skiaver.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/$_skiaver-$_skiahash.tar.gz"
IXWebSocket-GCC13pt1.patch::https://patch-diff.githubusercontent.com/raw/machinezone/IXWebSocket/pull/389.patch
IXWebSocket-GCC13pt2.patch::https://patch-diff.githubusercontent.com/raw/machinezone/IXWebSocket/pull/443.patch
desktop.patch desktop.patch
shared-fmt.patch shared-fmt.patch
# Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch
@ -53,6 +55,8 @@ 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=('cd67eaf34ee19ae5584f9052f3b385dcfa41232f38016baf08723b987ae583fb' sha256sums=('cd67eaf34ee19ae5584f9052f3b385dcfa41232f38016baf08723b987ae583fb'
'8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad'
'540bdd2985ec1295137deab99b95cb484934ab5d6d3b080fbc21d15e50a5e429'
'5c188f30ebf15013f346ef2868d6cfeb84f7ee8ac68f837fee6269aabfa4ae59'
'8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9'
'821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06'
'd7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53' 'd7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53'
@ -77,6 +81,8 @@ prepare() {
# Their "FindSkia" module forcefully tries to use Skia's FreeType and HarfBuzz, # Their "FindSkia" module forcefully tries to use Skia's FreeType and HarfBuzz,
# but we don't clone those because we use the shared ones. Avoid overwriting the settings instead. # but we don't clone those because we use the shared ones. Avoid overwriting the settings instead.
env -C aseprite patch -tp1 <shared-skia-deps.patch env -C aseprite patch -tp1 <shared-skia-deps.patch
env -C aseprite/third_party/IXWebSocket patch -tp1 <IXWebSocket-GCC13pt1.patch
env -C aseprite/third_party/IXWebSocket patch -tp1 <IXWebSocket-GCC13pt2.patch
} }
build() { build() {