Date: Sunday, February 14, 2016 @ 10:10:44 Author: fyan Revision: 161530
upgpkg: diff-so-fancy 0.3.0-2 use system git's diff_highlight Added: diff-so-fancy/trunk/system-diff_highlight.patch Modified: diff-so-fancy/trunk/PKGBUILD -----------------------------+ PKGBUILD | 14 ++++++++------ system-diff_highlight.patch | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-02-14 08:52:39 UTC (rev 161529) +++ PKGBUILD 2016-02-14 09:10:44 UTC (rev 161530) @@ -4,21 +4,22 @@ pkgname=diff-so-fancy pkgver=0.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any') url="https://github.com/stevemao/diff-so-fancy" license=('MIT') install="${pkgname}.install" -depends=('bash' 'perl' 'sed') -makedepends=('git') +depends=('git') checkdepends=('bash-bats') source=("git+https://github.com/so-fancy/diff-so-fancy.git#tag=v$pkgver" "git+https://github.com/ztombol/bats-core.git" - "git+https://github.com/ztombol/bats-assert.git") + "git+https://github.com/ztombol/bats-assert.git" + system-diff_highlight.patch) sha384sums=('SKIP' 'SKIP' - 'SKIP') + 'SKIP' + '586f722ae89c9d0d2ab1ce987052c7c0f4929efaad13c1c395cc15a72a47efe4214a958fdb973a17a6c761d9f7662d01') prepare() { cd "${srcdir}/${pkgname}" @@ -25,6 +26,8 @@ git config submodule."test/test_helper/bats-core".url "${srcdir}"/bats-core git config submodule."test/test_helper/bats-assert".url "${srcdir}"/bats-assert git submodule update --init + + patch -p1 -i ../system-diff_highlight.patch } check() { @@ -35,5 +38,4 @@ package() { cd "${srcdir}/${pkgname}" install -Dm755 'diff-so-fancy' "${pkgdir}/usr/bin/diff-so-fancy" - install -Dm755 'third_party/diff-highlight/diff-highlight' "${pkgdir}/usr/bin/diff-highlight" } Added: system-diff_highlight.patch =================================================================== --- system-diff_highlight.patch (rev 0) +++ system-diff_highlight.patch 2016-02-14 09:10:44 UTC (rev 161530) @@ -0,0 +1,22 @@ +From 10175a16b762282acd90ee624a73b55a362fbbca Mon Sep 17 00:00:00 2001 +From: Felix Yan <felixonm...@archlinux.org> +Date: Sun, 14 Feb 2016 17:07:07 +0800 +Subject: [PATCH] Use system git's diff_highlight + +--- + diff-so-fancy | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/diff-so-fancy b/diff-so-fancy +index b17cf29..9f62e72 100755 +--- a/diff-so-fancy ++++ b/diff-so-fancy +@@ -19,7 +19,7 @@ hash gsed 2> /dev/null && SED=gsed || SED=sed + if hash diff-highlight 2> /dev/null; then + diff_highlight=diff-highlight + else +- diff_highlight="$(get_script_dir)/third_party/diff-highlight/diff-highlight" ++ diff_highlight="/usr/share/git/diff-highlight/diff-highlight" + fi + + color_code_regex="(\x1B\[([0-9]{1,3}(;[0-9]{1,3}){0,3})[m|K])?"