From 1fd07929842f9e0cd32af3d3f133d82eadf77774 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 15 Aug 2024 21:25:36 +0200 Subject: Add git-rediff MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- git-rediff/PKGBUILD | 23 +++++++++++++++++++++++ git-rediff/upload | 1 + 2 files changed, 24 insertions(+) create mode 100644 git-rediff/PKGBUILD create mode 120000 git-rediff/upload diff --git a/git-rediff/PKGBUILD b/git-rediff/PKGBUILD new file mode 100644 index 0000000..765a96b --- /dev/null +++ b/git-rediff/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> + +pkgname=git-rediff +pkgver=1.0 +pkgrel=1 +pkgdesc='Reduce partially resolved merge conflicts' +url='https://codeberg.org/maandree/git-rediff' +arch=(any) +license=('custom:ISC') +depends=(diffutils libsimple) +makedepends=(libsimple) +source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz) +sha512sums=(3cb70f56a30cb2871a5ead02442d5b8eaa4ea6d8546b8aff2095beb6881482abfeb337277edd63940b839b55b3cade72b5f66052698c83756619d72530af7210) + +build () { + cd "$srcdir/git-rediff" + make PREFIX=/usr +} + +package () { + cd "$srcdir/git-rediff" + make PREFIX=/usr DESTDIR="$pkgdir" install +} diff --git a/git-rediff/upload b/git-rediff/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/git-rediff/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file -- cgit v1.2.3-70-g09d2