Date: Sunday, January 7, 2018 @ 07:09:53 Author: felixonmars Revision: 279787
upgpkg: diff-so-fancy 1.2.0-1 Modified: diff-so-fancy/trunk/PKGBUILD Deleted: diff-so-fancy/trunk/system-diff_highlight.patch -----------------------------+ PKGBUILD | 20 ++++++++++---------- system-diff_highlight.patch | 33 --------------------------------- 2 files changed, 10 insertions(+), 43 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-01-07 03:29:01 UTC (rev 279786) +++ PKGBUILD 2018-01-07 07:09:53 UTC (rev 279787) @@ -3,30 +3,27 @@ # Contributor: icasdri <icasdri at gmail dot com> pkgname=diff-so-fancy -pkgver=1.0.0 +pkgver=1.2.0 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any') url="https://github.com/so-fancy/diff-so-fancy" license=('MIT') -depends=('git') +depends=('perl') +makedepends=('git') checkdepends=('bash-bats-assert' 'bash-bats-support') -source=("$pkgname-$pkgver.tar.gz::https://github.com/so-fancy/diff-so-fancy/archive/v$pkgver.tar.gz" - system-diff_highlight.patch) -sha384sums=('00361ed7b36f2b4bb1d79430175e32daadfd5590ff5656e304d7e25c739f599f266efec1664cda7e4caf017a9a56316b' - 'ec4d6df1fc6dbf9e2c2f3fdc4d1c4e57e7cb2b085136f5f84cb32761e853cbc5a3a0878a62b467c05531286b19fe185e') +source=("$pkgname-$pkgver.tar.gz::https://github.com/so-fancy/diff-so-fancy/archive/v$pkgver.tar.gz") +sha384sums=('77aa73a0fb1f76bbfe79348df11fb805ebcba6c0f7b34102dd4c071afa01a04e2e66533fb893fabdb88b5e5fc60de4d5') prepare() { cd "$srcdir"/$pkgname-$pkgver - patch -p0 -i ../system-diff_highlight.patch - rm -r third_party + rm -r third_party # lib sed -e 's|test_helper/bats-support|/usr/lib/bats-support|' \ -e 's|test_helper/bats-assert|/usr/lib/bats-assert|' \ -e "s|load'$|load.bash'|" \ -i test/*.bats - rm test/diff-highlight.bats } check() { @@ -38,7 +35,10 @@ package() { cd "$srcdir"/$pkgname-$pkgver + sed -i 's|^use lib .*$|use lib "/usr/share/diff-so-fancy";|' diff-so-fancy + install -Dm755 diff-so-fancy "$pkgdir"/usr/bin/diff-so-fancy - install -Dm644 readme.md "$pkgdir"/usr/share/doc/diff-so-fancy/readme.md + install -Dm755 lib/DiffHighlight.pm "$pkgdir"/usr/share/diff-so-fancy/DiffHighlight.pm + install -Dm644 README.md "$pkgdir"/usr/share/doc/diff-so-fancy/README.md install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } Deleted: system-diff_highlight.patch =================================================================== --- system-diff_highlight.patch 2018-01-07 03:29:01 UTC (rev 279786) +++ system-diff_highlight.patch 2018-01-07 07:09:53 UTC (rev 279787) @@ -1,33 +0,0 @@ ---- diff-so-fancy.old 2017-06-10 22:14:03.858070687 +0800 -+++ diff-so-fancy 2017-06-10 22:15:00.762691077 +0800 -@@ -572,29 +572,5 @@ - - # Find the location of diff-highlight - sub find_diff_highlight { -- my $dh = "diff-highlight"; -- my $dh_in_path = trim(`which $dh 2>/dev/null`); -- my $ret; -- -- # We check for diff-highlight in three places: -- # 1) System path -- # 2) Same dir as d-s-f -- # 3) third_party/diff-highlight/ -- -- # This is #1 -- if ($dh_in_path) { -- $ret = $dh_in_path; -- # This is #2 and #3 -- } else { -- $ret = dirname(Cwd::realpath($0)) . "/diff-highlight"; -- if (!-X $ret) { -- $ret = dirname(Cwd::realpath($0)) . "/third_party/$dh/diff-highlight"; -- } -- } -- -- if (!-X $ret) { -- die("Error locating diff-highlight\n"); -- } -- -- return $ret; -+ return "/usr/share/git/diff-highlight/diff-highlight"; - }