From 1849f02e6a404aae140c68c5d32dc5108f220c3d Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Thu, 16 Nov 2017 10:34:29 -0400 Subject: [PATCH] Delete conflicting files with package libarchive. Must disable the compilation of these later on --- .SRCINFO | 4 ++-- PKGBUILD | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3d423a2..d384bce 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Nov 16 13:07:31 UTC 2017 +# Thu Nov 16 14:32:56 UTC 2017 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.4 - pkgrel = 2 + pkgrel = 3 url = http://www.aseprite.org/ arch = x86_64 arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 8f17c53..5412cf7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=aseprite pkgver=1.2.4 -pkgrel=2 +pkgrel=3 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url="http://www.aseprite.org/" @@ -61,6 +61,10 @@ package() { 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" + + # Remove conflicting files with libarchive + # TODO: With the current compilation options, looks like aseprite build process builds these binaries. Disable the compilation of the following files later on: + rm -f "$pkgdir/usr/bin/"{bsdcat,bsdcpio,bsdtar} } # vim:set ts=2 sw=2 et: