[arch-commits] Commit in tmux/trunk (PKGBUILD crash-fix.patch)

[Sergej Pupykin]

    Date: Thursday, May 7, 2015 @ 16:29:37
  Author: spupykin
Revision: 132877

upgpkg: tmux 2.0-1

upd

Modified:
  tmux/trunk/PKGBUILD
Deleted:
  tmux/trunk/crash-fix.patch

-----------------+
 PKGBUILD        |   17 +++++------------
 crash-fix.patch |   38 --------------------------------------
 2 files changed, 5 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-07 11:46:36 UTC (rev 132876)
+++ PKGBUILD	2015-05-07 14:29:37 UTC (rev 132877)
@@ -4,8 +4,8 @@
 # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
 
 pkgname=tmux
-pkgver=1.9_a
-pkgrel=2
+pkgver=2.0
+pkgrel=1
 pkgdesc='A terminal multiplexer'
 url='http://tmux.sourceforge.net/'
 arch=('i686' 'x86_64')
@@ -12,17 +12,10 @@
 license=('BSD')
 depends=('ncurses' 'libevent' 'libutempter')
 source=(http://downloads.sourceforge.net/tmux/tmux-${pkgver/_/}.tar.gz
-	LICENSE
-	crash-fix.patch)
-md5sums=('b07601711f96f1d260b390513b509a2d'
-         '71601bc37fa44e4395580b321963018e'
-         'd2e0ccb68edaccaf5ffd0e0c21d1776b')
+	LICENSE)
+md5sums=('9fb6b443392c3978da5d599f1e814eaa'
+         '71601bc37fa44e4395580b321963018e')
 
-prepare() {
-	cd "$srcdir/$pkgname-${pkgver/_/}"
-	patch -p1 <$srcdir/crash-fix.patch
-}
-
 build() {
 	cd "$srcdir/$pkgname-${pkgver/_/}"
 	./configure --prefix=/usr

Deleted: crash-fix.patch
===================================================================
--- crash-fix.patch	2015-05-07 11:46:36 UTC (rev 132876)
+++ crash-fix.patch	2015-05-07 14:29:37 UTC (rev 132877)
@@ -1,38 +0,0 @@
-commit 78e783e7863eb33981da4a5ad48dd9e2aa2b08dd
-Author: Nicholas Marriott <nicholas.marriott at gmail.com>
-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;
- 		}