From 080d548b6edd01ffa8bc23ea9de47c043f6452e3 Mon Sep 17 00:00:00 2001 From: Gennady Feldman Date: Wed, 13 Dec 2017 07:23:15 -0500 Subject: [PATCH] tmux: Update to 2.6 * Build release instead of git "master" * Some small PKGBUILD cleanup. --- {tmux-git => tmux}/PKGBUILD | 30 ++++++++----------- {tmux-git => tmux}/msys-platform.patch | 0 .../no-check-dirs-permission.patch | 0 3 files changed, 13 insertions(+), 17 deletions(-) rename {tmux-git => tmux}/PKGBUILD (75%) rename {tmux-git => tmux}/msys-platform.patch (100%) rename {tmux-git => tmux}/no-check-dirs-permission.patch (100%) diff --git a/tmux-git/PKGBUILD b/tmux/PKGBUILD similarity index 75% rename from tmux-git/PKGBUILD rename to tmux/PKGBUILD index 3123ca06..bbece5ce 100644 --- a/tmux-git/PKGBUILD +++ b/tmux/PKGBUILD @@ -1,40 +1,36 @@ # Maintainer: Alexey Pavlov -pkgname=tmux-git -pkgver=2.5.94.g73b9328c +pkgname=tmux +pkgver=2.6 pkgrel=1 pkgdesc='A terminal multiplexer' url='https://tmux.github.io/' arch=('i686' 'x86_64') license=('BSD') -provides=('tmux') -conflicts=('tmux') +conflict=('tmux-git') +replaces=('tmux-git') depends=('ncurses' 'libevent') -makedepends=('git' 'ncurses-devel' 'libevent-devel') -source=("${pkgname}"::'git+https://github.com/tmux/tmux.git' +makedepends=('ncurses-devel' 'libevent-devel') +source=(https://github.com/tmux/tmux/releases/download/$pkgver/tmux-$pkgver.tar.gz 'msys-platform.patch' 'no-check-dirs-permission.patch') -sha256sums=('SKIP' + +sha256sums=('b17cd170a94d7b58c0698752e1f4f263ab6dc47425230df7e53a6435cc7cd7e8' 'cf7e0f642d43fc97f7c55be41c693cceab5c891f81fcee687e918075e55cd533' '8f1938c9bcb99fba5441e11379a193c17eee582a03c04f1bde8089d58a84f44f') -pkgver() { - cd "${srcdir}"/$pkgname - git describe --tags | sed -e 's|-|.|g' -e 's|v||g' -} - prepare() { - cd "${srcdir}"/$pkgname + cd "${srcdir}/$pkgname-$pkgver" patch -p1 -i "${srcdir}"/msys-platform.patch patch -p0 -i "${srcdir}"/no-check-dirs-permission.patch cp osdep-cygwin.c osdep-msys.c - msg2 "Running autogen.sh" - ./autogen.sh + #msg2 "Running autogen.sh" + #./autogen.sh } build() { - cd "${srcdir}"/$pkgname + cd "${srcdir}/$pkgname-$pkgver" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -44,7 +40,7 @@ build() { } package() { - cd "${srcdir}"/$pkgname + cd "${srcdir}/$pkgname-$pkgver" make DESTDIR="${pkgdir}" install install -d "${pkgdir}"/usr/share/licenses/tmux diff --git a/tmux-git/msys-platform.patch b/tmux/msys-platform.patch similarity index 100% rename from tmux-git/msys-platform.patch rename to tmux/msys-platform.patch diff --git a/tmux-git/no-check-dirs-permission.patch b/tmux/no-check-dirs-permission.patch similarity index 100% rename from tmux-git/no-check-dirs-permission.patch rename to tmux/no-check-dirs-permission.patch