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

Use upstream is_clang.py

Browse Source 
The new version works fine under Python 3
This commit is contained in:
ISSOtm 2022-01-13 19:45:45 +01:00
parent 20382399c1
commit e1fbe636bc
4 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.SRCINFO
View File

@ -36,7 +36,6 @@ pkgbase = aseprite
source = git+https://github.com/aseprite/skia.git#branch=aseprite-m96 source = git+https://github.com/aseprite/skia.git#branch=aseprite-m96
source = git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8 source = git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8
source = git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92 source = git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92
source = is_clang.py
source = shared-libarchive.patch source = shared-libarchive.patch
source = shared-libwebp.patch source = shared-libwebp.patch
source = shared-skia-deps.patch source = shared-skia-deps.patch
@ -45,7 +44,6 @@ pkgbase = aseprite
sha256sums = SKIP sha256sums = SKIP
sha256sums = SKIP sha256sums = SKIP
sha256sums = SKIP sha256sums = SKIP
sha256sums = cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441
sha256sums = e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7 sha256sums = e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7
sha256sums = 2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055 sha256sums = 2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055
sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0 sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0

1
.gitignore vendored
View File

@ -2,7 +2,6 @@
!/.gitignore !/.gitignore
!/.SRCINFO !/.SRCINFO
!/PKGBUILD !/PKGBUILD
!/is_clang.py
!/shared-libarchive.patch !/shared-libarchive.patch
!/shared-libwebp.patch !/shared-libwebp.patch
!/shared-skia-deps.patch !/shared-skia-deps.patch

6
PKGBUILD
View File

@ -40,8 +40,6 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit
# Only pulling what we need, though # Only pulling what we need, though
"git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8" "git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8"
"git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92" "git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92"
# Python 3-compliant version of the script
is_clang.py
# 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
shared-libarchive.patch shared-libarchive.patch
# Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2523.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2523.patch
@ -53,7 +51,6 @@ sha256sums=('966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441'
'e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7' 'e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7'
'2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055' '2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055'
'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0'
@ -74,9 +71,6 @@ prepare() {
ln -svfT "$(realpath $_dep)" "skia/${_skiadeps[$_dep]}" ln -svfT "$(realpath $_dep)" "skia/${_skiadeps[$_dep]}"
done done
# Replace `is_clang.py` with Python 3-compliant version
cp -v is_clang.py skia/gn
# Allow using shared libarchive (the bundled version prevents using the `None` build type...) # Allow using shared libarchive (the bundled version prevents using the `None` build type...)
env -C aseprite patch -tp1 <shared-libarchive.patch env -C aseprite patch -tp1 <shared-libarchive.patch
# Allow using shared libwebp (breaks builds otherwise...) # Allow using shared libwebp (breaks builds otherwise...)

17
is_clang.py
View File

@ -1,17 +0,0 @@
#!/usr/bin/env python3
#
# Copyright 2016 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import subprocess
import sys
cc,cxx = sys.argv[1:3]
if (b'clang' in subprocess.check_output('%s --version' % cc, shell=True) and
b'clang' in subprocess.check_output('%s --version' % cxx, shell=True)):
print('true')
else:
print('false')