diff options
| author | Sebastian Reuße | 2015-09-12 11:21:13 +0200 |
|---|---|---|
| committer | Sebastian Reuße | 2015-09-12 11:22:33 +0200 |
| commit | b6b50ffc2dc48f4cbaa7b65241a549af7b3c75ae (patch) | |
| tree | 7110566f34c15f020a8aed73e230ca8adcdc63ce | |
| download | aur-b6b50ffc2dc48f4cbaa7b65241a549af7b3c75ae.tar.gz | |
Init.
| -rw-r--r-- | .SRCINFO | 19 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 43 |
3 files changed, 63 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..265f55153470 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,19 @@ +pkgbase = resolve-trivial-conflicts-git + pkgdesc = Resolve trivial conflicts automatically when merging branches in git repositories. + pkgver = r52.48ae21a + pkgrel = 1 + url = https://github.com/ElastiLotem/resolve-trivial-conflicts + arch = i686 + arch = x86_64 + license = GPL + makedepends = git + makedepends = cabal-install + makedepends = chrpath + depends = gmp + provides = resolve-trivial-conflicts + conflicts = resolve-trivial-conflicts + source = git+https://github.com/ElastiLotem/resolve-trivial-conflicts + md5sums = SKIP + +pkgname = resolve-trivial-conflicts-git + diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..468cd87d3ce8 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.pkg.tar.xz diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..a711e79452ce --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Sebastian Reuße <seb@wirrsal.net> +pkgname=resolve-trivial-conflicts-git +_gitname=resolve-trivial-conflicts +pkgver=r52.48ae21a +pkgrel=1 +pkgdesc="Resolve trivial conflicts automatically when merging branches in git repositories." +arch=(i686 x86_64) +url="https://github.com/ElastiLotem/resolve-trivial-conflicts" +license=(GPL) +provides=(resolve-trivial-conflicts) +conflicts=(resolve-trivial-conflicts) +makedepends=(git cabal-install chrpath) +depends=(gmp) +source=(git+https://github.com/ElastiLotem/resolve-trivial-conflicts) +md5sums=(SKIP) + +pkgver() { + cd "$_gitname" + # No tagged commits. ヽ(´ー｀)ノ + commit=$(git rev-list --count master) + hash=$(git rev-parse --short HEAD) + echo "r$commit.$hash" +} + +build() { + cd "$_gitname" + cabal update + cabal sandbox init + cabal install --dependencies-only --disable-shared + cabal configure --prefix /usr --disable-executable-dynamic + cabal build +} + +package() { + cd "$_gitname" + # Cabal 1.22 currently has an issue where it injects the paths to library dependencies + # even into statically built executables. Since this will add /tmp locations to the + # RPATH, we kill them manually until Cabal 1.23 is released. + find dist -type f -perm -+x -exec chrpath -d {} \; + cabal copy --destdir "$pkgdir" + install -m644 -D README.md "$pkgdir"/usr/share/doc/resolve-trivial-conflicts/README.md +} + |