Date: Friday, February 27, 2015 @ 13:53:19
Author: spupykin
Revision: 128356
archrelease: copy trunk to community-i686, community-x86_64
Added:
tmux/repos/community-i686/LICENSE
(from rev 128355, tmux/trunk/LICENSE)
tmux/repos/community-i686/PKGBUILD
(from rev 128355, tmux/trunk/PKGBUILD)
tmux/repos/community-i686/crash-fix.patch
(from rev 128355, tmux/trunk/crash-fix.patch)
tmux/repos/community-x86_64/LICENSE
(from rev 128355, tmux/trunk/LICENSE)
tmux/repos/community-x86_64/PKGBUILD
(from rev 128355, tmux/trunk/PKGBUILD)
tmux/repos/community-x86_64/crash-fix.patch
(from rev 128355, tmux/trunk/crash-fix.patch)
Deleted:
tmux/repos/community-i686/LICENSE
tmux/repos/community-i686/PKGBUILD
tmux/repos/community-x86_64/LICENSE
tmux/repos/community-x86_64/PKGBUILD
----------------------------------+
/LICENSE | 26 +++++++++++
/PKGBUILD | 86 +++++++++++++++++++++++++++++++++++++
community-i686/LICENSE | 13 -----
community-i686/PKGBUILD | 36 ---------------
community-i686/crash-fix.patch | 38 ++++++++++++++++
community-x86_64/LICENSE | 13 -----
community-x86_64/PKGBUILD | 36 ---------------
community-x86_64/crash-fix.patch | 38 ++++++++++++++++
8 files changed, 188 insertions(+), 98 deletions(-)
Deleted: community-i686/LICENSE
===================================================================
--- community-i686/LICENSE 2015-02-27 12:52:47 UTC (rev 128355)
+++ community-i686/LICENSE 2015-02-27 12:53:19 UTC (rev 128356)
@@ -1,13 +0,0 @@
-Copyright (c) 2007 Nicholas Marriott <[email protected]>
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Copied: tmux/repos/community-i686/LICENSE (from rev 128355, tmux/trunk/LICENSE)
===================================================================
--- community-i686/LICENSE (rev 0)
+++ community-i686/LICENSE 2015-02-27 12:53:19 UTC (rev 128356)
@@ -0,0 +1,13 @@
+Copyright (c) 2007 Nicholas Marriott <[email protected]>
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-02-27 12:52:47 UTC (rev 128355)
+++ community-i686/PKGBUILD 2015-02-27 12:53:19 UTC (rev 128356)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <[email protected]>
-# Maintainer: TDY <[email protected]>
-# Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
-
-pkgname=tmux
-pkgver=1.9_a
-pkgrel=1
-pkgdesc='A terminal multiplexer'
-url='http://tmux.sourceforge.net/'
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('ncurses' 'libevent')
-source=(http://downloads.sourceforge.net/tmux/tmux-${pkgver/_/}.tar.gz
- LICENSE)
-md5sums=('b07601711f96f1d260b390513b509a2d'
- '71601bc37fa44e4395580b321963018e')
-
-build() {
- cd "$srcdir/$pkgname-${pkgver/_/}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-${pkgver/_/}"
- make install DESTDIR=$pkgdir
- install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/tmux/LICENSE"
-
- install -dm755 "$pkgdir/usr/share/tmux/"
- install -m644 examples/* "$pkgdir/usr/share/tmux/"
- install -Dm644 examples/tmux.vim
"$pkgdir/usr/share/vim/vimfiles/syntax/tmux.vim"
-
- install -d $pkgdir/usr/share/bash-completion/completions/
- mv $pkgdir/usr/share/tmux/bash_completion_tmux.sh
$pkgdir/usr/share/bash-completion/completions/tmux
-}
Copied: tmux/repos/community-i686/PKGBUILD (from rev 128355,
tmux/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-02-27 12:53:19 UTC (rev 128356)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Sergej Pupykin <[email protected]>
+# Maintainer: TDY <[email protected]>
+# Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
+
+pkgname=tmux
+pkgver=1.9_a
+pkgrel=2
+pkgdesc='A terminal multiplexer'
+url='http://tmux.sourceforge.net/'
+arch=('i686' 'x86_64')
+license=('BSD')
+depends=('ncurses' 'libevent' 'libutempter')
+source=(http://downloads.sourceforge.net/tmux/tmux-${pkgver/_/}.tar.gz
+ LICENSE
+ crash-fix.patch)
+md5sums=('b07601711f96f1d260b390513b509a2d'
+ '71601bc37fa44e4395580b321963018e'
+ 'd2e0ccb68edaccaf5ffd0e0c21d1776b')
+
+prepare() {
+ cd "$srcdir/$pkgname-${pkgver/_/}"
+ patch -p1 <$srcdir/crash-fix.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-${pkgver/_/}"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-${pkgver/_/}"
+ make install DESTDIR=$pkgdir
+ install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/tmux/LICENSE"
+
+ install -dm755 "$pkgdir/usr/share/tmux/"
+ install -m644 examples/* "$pkgdir/usr/share/tmux/"
+ install -Dm644 examples/tmux.vim
"$pkgdir/usr/share/vim/vimfiles/syntax/tmux.vim"
+
+ install -d $pkgdir/usr/share/bash-completion/completions/
+ mv $pkgdir/usr/share/tmux/bash_completion_tmux.sh
$pkgdir/usr/share/bash-completion/completions/tmux
+}
Copied: tmux/repos/community-i686/crash-fix.patch (from rev 128355,
tmux/trunk/crash-fix.patch)
===================================================================
--- community-i686/crash-fix.patch (rev 0)
+++ community-i686/crash-fix.patch 2015-02-27 12:53:19 UTC (rev 128356)
@@ -0,0 +1,38 @@
+commit 78e783e7863eb33981da4a5ad48dd9e2aa2b08dd
+Author: Nicholas Marriott <[email protected]>
+Date: Thu Mar 6 13:01:51 2014 +0000
+
+ Don't segfaut when the parent of the layout cell is NULL, from Thomas Adam.
+
+diff --git a/window.c b/window.c
+index 1dd70c4..9a26b90 100644
+--- a/window.c
++++ b/window.c
+@@ -420,10 +420,15 @@ window_pane_active_set(struct window_pane *wp, struct
window_pane *nextwp)
+ void
+ window_pane_active_lost(struct window_pane *wp, struct window_pane *nextwp)
+ {
+- struct layout_cell *lc, *lc2;
++ struct layout_cell *lc, *lc2, *lcparent;
++
++ /* Get the parent cell. */
++ lcparent = nextwp->layout_cell->parent;
++ if (lcparent == NULL)
++ return;
+
+ /* Save the target pane in its parent. */
+- nextwp->layout_cell->parent->lastwp = nextwp;
++ lcparent->lastwp = nextwp;
+
+ /*
+ * Save the source pane in all of its parents up to, but not including,
+@@ -432,8 +437,7 @@ window_pane_active_lost(struct window_pane *wp, struct
window_pane *nextwp)
+ if (wp == NULL)
+ return;
+ for (lc = wp->layout_cell->parent; lc != NULL; lc = lc->parent) {
+- lc2 = nextwp->layout_cell->parent;
+- for (; lc2 != NULL; lc2 = lc2->parent) {
++ for (lc2 = lcparent; lc2 != NULL; lc2 = lc2->parent) {
+ if (lc == lc2)
+ return;
+ }
Deleted: community-x86_64/LICENSE
===================================================================
--- community-x86_64/LICENSE 2015-02-27 12:52:47 UTC (rev 128355)
+++ community-x86_64/LICENSE 2015-02-27 12:53:19 UTC (rev 128356)
@@ -1,13 +0,0 @@
-Copyright (c) 2007 Nicholas Marriott <[email protected]>
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Copied: tmux/repos/community-x86_64/LICENSE (from rev 128355,
tmux/trunk/LICENSE)
===================================================================
--- community-x86_64/LICENSE (rev 0)
+++ community-x86_64/LICENSE 2015-02-27 12:53:19 UTC (rev 128356)
@@ -0,0 +1,13 @@
+Copyright (c) 2007 Nicholas Marriott <[email protected]>
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-02-27 12:52:47 UTC (rev 128355)
+++ community-x86_64/PKGBUILD 2015-02-27 12:53:19 UTC (rev 128356)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <[email protected]>
-# Maintainer: TDY <[email protected]>
-# Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
-
-pkgname=tmux
-pkgver=1.9_a
-pkgrel=1
-pkgdesc='A terminal multiplexer'
-url='http://tmux.sourceforge.net/'
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('ncurses' 'libevent')
-source=(http://downloads.sourceforge.net/tmux/tmux-${pkgver/_/}.tar.gz
- LICENSE)
-md5sums=('b07601711f96f1d260b390513b509a2d'
- '71601bc37fa44e4395580b321963018e')
-
-build() {
- cd "$srcdir/$pkgname-${pkgver/_/}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-${pkgver/_/}"
- make install DESTDIR=$pkgdir
- install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/tmux/LICENSE"
-
- install -dm755 "$pkgdir/usr/share/tmux/"
- install -m644 examples/* "$pkgdir/usr/share/tmux/"
- install -Dm644 examples/tmux.vim
"$pkgdir/usr/share/vim/vimfiles/syntax/tmux.vim"
-
- install -d $pkgdir/usr/share/bash-completion/completions/
- mv $pkgdir/usr/share/tmux/bash_completion_tmux.sh
$pkgdir/usr/share/bash-completion/completions/tmux
-}
Copied: tmux/repos/community-x86_64/PKGBUILD (from rev 128355,
tmux/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-02-27 12:53:19 UTC (rev 128356)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Sergej Pupykin <[email protected]>
+# Maintainer: TDY <[email protected]>
+# Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
+
+pkgname=tmux
+pkgver=1.9_a
+pkgrel=2
+pkgdesc='A terminal multiplexer'
+url='http://tmux.sourceforge.net/'
+arch=('i686' 'x86_64')
+license=('BSD')
+depends=('ncurses' 'libevent' 'libutempter')
+source=(http://downloads.sourceforge.net/tmux/tmux-${pkgver/_/}.tar.gz
+ LICENSE
+ crash-fix.patch)
+md5sums=('b07601711f96f1d260b390513b509a2d'
+ '71601bc37fa44e4395580b321963018e'
+ 'd2e0ccb68edaccaf5ffd0e0c21d1776b')
+
+prepare() {
+ cd "$srcdir/$pkgname-${pkgver/_/}"
+ patch -p1 <$srcdir/crash-fix.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-${pkgver/_/}"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-${pkgver/_/}"
+ make install DESTDIR=$pkgdir
+ install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/tmux/LICENSE"
+
+ install -dm755 "$pkgdir/usr/share/tmux/"
+ install -m644 examples/* "$pkgdir/usr/share/tmux/"
+ install -Dm644 examples/tmux.vim
"$pkgdir/usr/share/vim/vimfiles/syntax/tmux.vim"
+
+ install -d $pkgdir/usr/share/bash-completion/completions/
+ mv $pkgdir/usr/share/tmux/bash_completion_tmux.sh
$pkgdir/usr/share/bash-completion/completions/tmux
+}
Copied: tmux/repos/community-x86_64/crash-fix.patch (from rev 128355,
tmux/trunk/crash-fix.patch)
===================================================================
--- community-x86_64/crash-fix.patch (rev 0)
+++ community-x86_64/crash-fix.patch 2015-02-27 12:53:19 UTC (rev 128356)
@@ -0,0 +1,38 @@
+commit 78e783e7863eb33981da4a5ad48dd9e2aa2b08dd
+Author: Nicholas Marriott <[email protected]>
+Date: Thu Mar 6 13:01:51 2014 +0000
+
+ Don't segfaut when the parent of the layout cell is NULL, from Thomas Adam.
+
+diff --git a/window.c b/window.c
+index 1dd70c4..9a26b90 100644
+--- a/window.c
++++ b/window.c
+@@ -420,10 +420,15 @@ window_pane_active_set(struct window_pane *wp, struct
window_pane *nextwp)
+ void
+ window_pane_active_lost(struct window_pane *wp, struct window_pane *nextwp)
+ {
+- struct layout_cell *lc, *lc2;
++ struct layout_cell *lc, *lc2, *lcparent;
++
++ /* Get the parent cell. */
++ lcparent = nextwp->layout_cell->parent;
++ if (lcparent == NULL)
++ return;
+
+ /* Save the target pane in its parent. */
+- nextwp->layout_cell->parent->lastwp = nextwp;
++ lcparent->lastwp = nextwp;
+
+ /*
+ * Save the source pane in all of its parents up to, but not including,
+@@ -432,8 +437,7 @@ window_pane_active_lost(struct window_pane *wp, struct
window_pane *nextwp)
+ if (wp == NULL)
+ return;
+ for (lc = wp->layout_cell->parent; lc != NULL; lc = lc->parent) {
+- lc2 = nextwp->layout_cell->parent;
+- for (; lc2 != NULL; lc2 = lc2->parent) {
++ for (lc2 = lcparent; lc2 != NULL; lc2 = lc2->parent) {
+ if (lc == lc2)
+ return;
+ }
