remove cmark/gtest conflict

This commit is contained in:
Benoit Favre 2016-12-19 21:37:17 +01:00
parent 53bb60b0c9
commit 09d3e38579
2 changed files with 6 additions and 6 deletions

View File

@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
# Sat Dec 10 15:08:29 UTC 2016
# Mon Dec 19 20:37:03 UTC 2016
pkgbase = aseprite
pkgdesc = Create animated sprites and pixel art
pkgver = 1.1.11
pkgrel = 1
pkgrel = 2
url = http://www.aseprite.org/
arch = x86_64
arch = i686
@ -20,8 +20,6 @@ pkgbase = aseprite
depends = libwebp
conflicts = aseprite-git
conflicts = aseprite-gpl
conflicts = cmark
conflicts = gtest
source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.11
source = aseprite.desktop
sha256sums = SKIP

View File

@ -4,14 +4,14 @@
pkgname=aseprite
pkgver=1.1.11
pkgrel=1
pkgrel=2
pkgdesc='Create animated sprites and pixel art'
arch=('x86_64' 'i686')
url='http://www.aseprite.org/'
license=('custom')
depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'libwebp')
makedepends=('cmake')
conflicts=('aseprite-git' 'aseprite-gpl' 'cmark' 'gtest')
conflicts=('aseprite-git' 'aseprite-gpl')
source=("git+https://github.com/aseprite/aseprite.git#tag=v${pkgver}"
"aseprite.desktop")
sha256sums=('SKIP'
@ -55,6 +55,8 @@ package() {
install -Dm644 "../data/icons/ase48.png" \
"$pkgdir/usr/share/pixmaps/$pkgname.png"
install -Dm644 "../EULA.txt" "$pkgdir/usr/share/licenses/$pkgname/EULA.txt"
# WARNING: fix for upstream including gtest and cmark in "make install"
rm -rf "$pkgdir/usr/include" "$pkgdir/usr/lib" "$pkgdir/usr/share/man" "$pkgdir/usr/bin/cmark"
}
# vim:set ts=2 sw=2 et: