summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilson E. Alvarez2017-11-16 10:34:29 -0400
committerWilson E. Alvarez2017-11-16 10:34:29 -0400
commit1849f02e6a404aae140c68c5d32dc5108f220c3d (patch)
treefdf0e89d873f6e5c9065d4f5560b5f180ea2a9db
parentc6c5dea28c06319535851023c18c0820a38aff11 (diff)
downloadaur-1849f02e6a404aae140c68c5d32dc5108f220c3d.tar.gz
Delete conflicting files with package libarchive. Must disable the compilation of these later on
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 7 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3d423a29354..d384bcef980 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 8f17c53873c..5412cf7ecba 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: