From c2ba7c9f3699ac9802221eb16f30bba086fdc454 Mon Sep 17 00:00:00 2001 From: bapt Date: Tue, 20 Mar 2018 17:25:58 +0000 Subject: Update to 4.15 --- x11-wm/i3/Makefile | 3 +-- x11-wm/i3/distinfo | 6 +++--- x11-wm/i3/files/patch-pull2849 | 27 --------------------------- 3 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 x11-wm/i3/files/patch-pull2849 (limited to 'x11-wm') diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile index 85ebe7f79ce5..a0e0dd796b9f 100644 --- a/x11-wm/i3/Makefile +++ b/x11-wm/i3/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= i3 -DISTVERSION= 4.14.1 -PORTREVISION= 1 +DISTVERSION= 4.15 CATEGORIES= x11-wm MASTER_SITES= http://i3wm.org/downloads/ diff --git a/x11-wm/i3/distinfo b/x11-wm/i3/distinfo index 3988d145c157..2bf7a2f470cc 100644 --- a/x11-wm/i3/distinfo +++ b/x11-wm/i3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506347730 -SHA256 (i3-4.14.1.tar.bz2) = d0063ac561f3aa8d7e31e137356815bad781bd6ad774030362c89abe96ab5fb1 -SIZE (i3-4.14.1.tar.bz2) = 1173560 +TIMESTAMP = 1521566408 +SHA256 (i3-4.15.tar.bz2) = 217d524d1fbc85ae346b25f6848d1b7bcd2c23184ec88d29114bf5a621385326 +SIZE (i3-4.15.tar.bz2) = 1196263 diff --git a/x11-wm/i3/files/patch-pull2849 b/x11-wm/i3/files/patch-pull2849 deleted file mode 100644 index ced829ce747c..000000000000 --- a/x11-wm/i3/files/patch-pull2849 +++ /dev/null @@ -1,27 +0,0 @@ -From bfc6e1217265c8c77a8382f5c7970d049e958250 Mon Sep 17 00:00:00 2001 -From: Dan Elkouby -Date: Sun, 30 Jul 2017 18:49:42 +0300 -Subject: [PATCH] Create a new split container when switching a workspace - container to split layout - -The behavior before 52ce8c8 was to do it regardless of what layout we're -switching to. - -Fixes #2846 ---- - src/con.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/con.c b/src/con.c -index d346b9f45..94bfa6e9e 100644 ---- src/con.c.orig -+++ src/con.c -@@ -1719,7 +1719,7 @@ void con_set_layout(Con *con, layout_t layout) { - con->workspace_layout = ws_layout; - DLOG("Setting layout to %d\n", layout); - con->layout = layout; -- } else if (layout == L_STACKED || layout == L_TABBED) { -+ } else if (layout == L_STACKED || layout == L_TABBED || layout == L_SPLITV || layout == L_SPLITH) { - DLOG("Creating new split container\n"); - /* 1: create a new split container */ - Con *new = con_new(NULL, NULL); -- cgit