Final patch update for i3-gaps (4.16)

14 files changed, 34 insertions, 14 deletions

diff --git a/x11/i3-gaps/patches/patch-Makefile_in b/x11/i3-gaps/patches/patch-Makefile_in
index 3869929..098d4c3 100644
--- a/x11/i3-gaps/patches/patch-Makefile_in
+++ b/x11/i3-gaps/patches/patch-Makefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile_in,v 1.4 2018/03/29 21:05:32 kn Exp $
+$OpenBSD$
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
diff --git a/x11/i3-gaps/patches/patch-configure b/x11/i3-gaps/patches/patch-configure
index 545bb9e..52b769c 100644
--- a/x11/i3-gaps/patches/patch-configure
+++ b/x11/i3-gaps/patches/patch-configure
@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure,v 1.2 2017/09/04 14:33:07 dcoppa Exp $
+$OpenBSD$
 Index: configure
 --- configure.orig
 +++ configure
diff --git a/x11/i3-gaps/patches/patch-etc_config b/x11/i3-gaps/patches/patch-etc_config
index 388ef40..96bd5e7 100644
--- a/x11/i3-gaps/patches/patch-etc_config
+++ b/x11/i3-gaps/patches/patch-etc_config
@@ -1,4 +1,4 @@
-$OpenBSD: patch-etc_config,v 1.1 2016/11/13 20:46:23 dcoppa Exp $
+$OpenBSD$
 --- etc/config.orig	Sun Mar 29 19:07:08 2015
 +++ etc/config		Mon Mar 30 14:13:25 2015
 @@ -35,13 +35,13 @@ set $right semicolon
diff --git a/x11/i3-gaps/patches/patch-etc_config_keycodes b/x11/i3-gaps/patches/patch-etc_config_keycodes
index db58807..c7914a9 100644
--- a/x11/i3-gaps/patches/patch-etc_config_keycodes
+++ b/x11/i3-gaps/patches/patch-etc_config_keycodes
@@ -1,4 +1,4 @@
-$OpenBSD: patch-etc_config_keycodes,v 1.2 2018/03/29 21:05:32 kn Exp $
+$OpenBSD$
 
 Fix keycodes for the "Left", "Down", "Up" and "Right" keys: they're
 different between Linux and OpenBSD.
diff --git a/x11/i3-gaps/patches/patch-i3-dmenu-desktop b/x11/i3-gaps/patches/patch-i3-dmenu-desktop
index 5bf4f27..68954c1 100644
--- a/x11/i3-gaps/patches/patch-i3-dmenu-desktop
+++ b/x11/i3-gaps/patches/patch-i3-dmenu-desktop
@@ -1,4 +1,4 @@
-$OpenBSD: patch-i3-dmenu-desktop,v 1.7 2017/09/04 14:33:07 dcoppa Exp $
+$OpenBSD$
 Index: i3-dmenu-desktop
 --- i3-dmenu-desktop.orig
 +++ i3-dmenu-desktop
diff --git a/x11/i3-gaps/patches/patch-i3-nagbar_main_c b/x11/i3-gaps/patches/patch-i3-nagbar_main_c
index 65d9bd4..559b689 100644
--- a/x11/i3-gaps/patches/patch-i3-nagbar_main_c
+++ b/x11/i3-gaps/patches/patch-i3-nagbar_main_c
@@ -1,8 +1,17 @@
-$OpenBSD: patch-i3-nagbar_main_c,v 1.13 2017/10/21 19:22:04 tb Exp $
+$OpenBSD$
 
 Index: i3-nagbar/main.c
 --- i3-nagbar/main.c.orig
 +++ i3-nagbar/main.c
+@@ -189,7 +189,7 @@ static void handle_button_release(xcb_connection_t *co
+ 
+     char *terminal_cmd;
+     if (button->terminal) {
+-        sasprintf(&terminal_cmd, "i3-sensible-terminal -e %s", link_path);
++        sasprintf(&terminal_cmd, "${X11BASE}/bin/xterm -e %s", link_path);
+     } else {
+         terminal_cmd = sstrdup(link_path);
+     }
 @@ -454,11 +454,6 @@ int main(int argc, char *argv[]) {
      font = load_font(pattern, true);
      set_font(&font);
diff --git a/x11/i3-gaps/patches/patch-libi3_get_exe_path_c b/x11/i3-gaps/patches/patch-libi3_get_exe_path_c
index 2618dff..6c2a733 100644
--- a/x11/i3-gaps/patches/patch-libi3_get_exe_path_c
+++ b/x11/i3-gaps/patches/patch-libi3_get_exe_path_c
@@ -1,4 +1,4 @@
-$OpenBSD: patch-libi3_get_exe_path_c,v 1.3 2016/11/13 20:46:23 dcoppa Exp $
+$OpenBSD$
 --- libi3/get_exe_path.c.orig	Tue Nov  8 19:54:01 2016
 +++ libi3/get_exe_path.c	Thu Nov 10 18:04:35 2016
 @@ -103,5 +103,5 @@ char *get_exe_path(const char *argv0) {
diff --git a/x11/i3-gaps/patches/patch-man_i3-config-wizard_man b/x11/i3-gaps/patches/patch-man_i3-config-wizard_man
index e8c7755..3a20b9f 100644
--- a/x11/i3-gaps/patches/patch-man_i3-config-wizard_man
+++ b/x11/i3-gaps/patches/patch-man_i3-config-wizard_man
@@ -1,4 +1,4 @@
-$OpenBSD: patch-man_i3-config-wizard_man,v 1.1 2016/11/13 20:46:23 dcoppa Exp $
+$OpenBSD$
 Index: man/i3-config-wizard.man
 --- man/i3-config-wizard.man.orig
 +++ man/i3-config-wizard.man
diff --git a/x11/i3-gaps/patches/patch-man_i3-dump-log_man b/x11/i3-gaps/patches/patch-man_i3-dump-log_man
index b65d7c9..cd93b60 100644
--- a/x11/i3-gaps/patches/patch-man_i3-dump-log_man
+++ b/x11/i3-gaps/patches/patch-man_i3-dump-log_man
@@ -1,4 +1,4 @@
-$OpenBSD: patch-man_i3-dump-log_man,v 1.1 2016/11/13 20:46:23 dcoppa Exp $
+$OpenBSD$
 --- man/i3-dump-log.man.orig	Fri Nov 11 11:05:52 2016
 +++ man/i3-dump-log.man	Fri Nov 11 11:07:08 2016
 @@ -9,7 +9,7 @@ i3-dump-log - dumps the i3 SHM log
diff --git a/x11/i3-gaps/patches/patch-man_i3-nagbar_man b/x11/i3-gaps/patches/patch-man_i3-nagbar_man
index c1e38d0..c5870b1 100644
--- a/x11/i3-gaps/patches/patch-man_i3-nagbar_man
+++ b/x11/i3-gaps/patches/patch-man_i3-nagbar_man
@@ -1,4 +1,4 @@
-$OpenBSD: patch-man_i3-nagbar_man,v 1.1 2016/11/13 20:46:23 dcoppa Exp $
+$OpenBSD$
 Index: man/i3-nagbar.man
 --- man/i3-nagbar.man.orig
 +++ man/i3-nagbar.man
diff --git a/x11/i3-gaps/patches/patch-man_i3_man b/x11/i3-gaps/patches/patch-man_i3_man
index a5e8d0d..a5db5b8 100644
--- a/x11/i3-gaps/patches/patch-man_i3_man
+++ b/x11/i3-gaps/patches/patch-man_i3_man
@@ -1,7 +1,18 @@
-$OpenBSD: patch-man_i3_man,v 1.2 2017/09/04 14:33:07 dcoppa Exp $
+$OpenBSD$
 Index: man/i3.man
 --- man/i3.man.orig
 +++ man/i3.man
+@@ -172,8 +172,8 @@ When starting, i3 looks for configuration files in the
+ 
+ 1. ~/.config/i3/config (or $XDG_CONFIG_HOME/i3/config if set)
+ 2. ~/.i3/config
+-3. /etc/xdg/i3/config (or $XDG_CONFIG_DIRS/i3/config if set)
+-4. /etc/i3/config
++3. ${SYSCONFDIR}/xdg/i3/config (or $XDG_CONFIG_DIRS/i3/config if set)
++4. ${SYSCONFDIR}/i3/config
+ 
+ You can specify a custom path using the -c option.
+ 
 @@ -197,13 +197,13 @@ font pango:DejaVu Sans Mono 8
  floating_modifier Mod1
  
diff --git a/x11/i3-gaps/patches/patch-src_bindings_c b/x11/i3-gaps/patches/patch-src_bindings_c
index ce5761a..a1bbd00 100644
--- a/x11/i3-gaps/patches/patch-src_bindings_c
+++ b/x11/i3-gaps/patches/patch-src_bindings_c
@@ -1,4 +1,4 @@
-$OpenBSD: patch-src_bindings_c,v 1.7 2017/09/04 14:33:07 dcoppa Exp $
+$OpenBSD$
 Index: src/bindings.c
 --- src/bindings.c.orig
 +++ src/bindings.c
diff --git a/x11/i3-gaps/patches/patch-src_config_parser_c b/x11/i3-gaps/patches/patch-src_config_parser_c
index 321034b..5aae6be 100644
--- a/x11/i3-gaps/patches/patch-src_config_parser_c
+++ b/x11/i3-gaps/patches/patch-src_config_parser_c
@@ -1,4 +1,4 @@
-$OpenBSD: patch-src_config_parser_c,v 1.11 2018/03/29 21:05:32 kn Exp $
+$OpenBSD$
 Index: src/config_parser.c
 --- src/config_parser.c.orig
 +++ src/config_parser.c
diff --git a/x11/i3-gaps/patches/patch-src_manage_c b/x11/i3-gaps/patches/patch-src_manage_c
index 5a0736f..7111a61 100644
--- a/x11/i3-gaps/patches/patch-src_manage_c
+++ b/x11/i3-gaps/patches/patch-src_manage_c
@@ -1,4 +1,4 @@
-$OpenBSD: patch-src_manage_c,v 1.21 2018/03/29 21:05:32 kn Exp $
+$OpenBSD$
 
 Fix size hints for ssh-askpass