From 03a268d116aa806a5ab8ed2010ce06187eb012e6 Mon Sep 17 00:00:00 2001
From: Bruno Pinto <brunoferreirapinto@gmail.com>
Date: Thu, 19 Apr 2018 00:56:38 +0100
Subject: [PATCH] [dev-libs/sway] Add swaybar patch

Apply patch for issue https://github.com/swaywm/sway/issues/1785
---
 dev-libs/sway/files/sway-swaybar-fix.patch | 48 ++++++++++++++++++++++
 dev-libs/sway/sway-9999.ebuild             |  4 ++
 2 files changed, 52 insertions(+)
 create mode 100644 dev-libs/sway/files/sway-swaybar-fix.patch

diff --git a/dev-libs/sway/files/sway-swaybar-fix.patch b/dev-libs/sway/files/sway-swaybar-fix.patch
new file mode 100644
index 0000000..21aac5a
--- /dev/null
+++ b/dev-libs/sway/files/sway-swaybar-fix.patch
@@ -0,0 +1,48 @@
+diff --git a/swaybar/i3bar.c b/swaybar/i3bar.c
+index 923ad755..a0bac04f 100644
+--- a/swaybar/i3bar.c
++++ b/swaybar/i3bar.c
+@@ -142,6 +142,13 @@ bool i3bar_handle_readable(struct status_line *status) {
+ 		} else {
+ 			switch (*cur) {
+ 			case '[':
++				if (state->depth == 0) { // ignore infinite array
++					memmove(state->buffer, cur + 1,
++							state->buffer_size - (cur + 1 - state->buffer));
++					cur = state->buffer;
++					++state->depth;
++					continue;
++				}
+ 				++state->depth;
+ 				if (state->depth >
+ 						sizeof(state->nodes) / sizeof(state->nodes[0])) {
+@@ -149,7 +156,7 @@ bool i3bar_handle_readable(struct status_line *status) {
+ 					return false;
+ 				}
+ 				state->nodes[state->depth] = JSON_NODE_ARRAY;
+-				if (state->depth == 1) {
++				if (state->depth == 2) {
+ 					state->current_node = cur;
+ 				}
+ 				break;
+@@ -159,7 +166,7 @@ bool i3bar_handle_readable(struct status_line *status) {
+ 					return false;
+ 				}
+ 				--state->depth;
+-				if (state->depth == 0) {
++				if (state->depth == 1) {
+ 					// cur[1] is valid since cur[0] != '\0'
+ 					char p = cur[1];
+ 					cur[1] = '\0';
+diff --git a/swaybar/status_line.c b/swaybar/status_line.c
+index 7f3ec98f..6d734384 100644
+--- a/swaybar/status_line.c
++++ b/swaybar/status_line.c
+@@ -120,6 +120,7 @@ struct status_line *status_line_init(char *cmd) {
+ 	fcntl(status->write_fd, F_SETFL, O_NONBLOCK);
+ 
+ 	status->read = fdopen(status->read_fd, "r");
++	setvbuf(status->read, NULL, _IONBF, 0);
+ 	status->write = fdopen(status->write_fd, "w");
+ 	return status;
+ }
diff --git a/dev-libs/sway/sway-9999.ebuild b/dev-libs/sway/sway-9999.ebuild
index 6848706..5368745 100644
--- a/dev-libs/sway/sway-9999.ebuild
+++ b/dev-libs/sway/sway-9999.ebuild
@@ -33,6 +33,10 @@ DEPEND="${RDEPEND}
 	doc? ( app-text/scdoc )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-swaybar-fix.patch"
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddefault_wallpaper=$(usex wallpapers true false)