Update i3-gaps patches to match upstream

11 files changed, 9 insertions, 162 deletions

diff --git a/x11/i3-gaps/Makefile b/x11/i3-gaps/Makefile
index 70fea71..19d85e7 100644
--- a/x11/i3-gaps/Makefile
+++ b/x11/i3-gaps/Makefile
@@ -43,10 +43,8 @@ USE_GMAKE =	Yes
 CONFIGURE_STYLE =gnu
 CONFIGURE_ARGS =--enable-builddir=${WRKBUILD} \
 		--enable-debug=no
-CONFIGURE_ENV =	CPPFLAGS="-I${X11BASE}/include \
-			  -I${LOCALBASE}/include" \
-		LDFLAGS="-L${X11BASE}/lib \
-			 -L${LOCALBASE}/lib"
+CONFIGURE_ENV =	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
+		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/etc/config \
diff --git a/x11/i3-gaps/patches/patch-Makefile_in b/x11/i3-gaps/patches/patch-Makefile_in
index c2e7847..3869929 100644
--- a/x11/i3-gaps/patches/patch-Makefile_in
+++ b/x11/i3-gaps/patches/patch-Makefile_in
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2018/03/29 21:05:32 kn Exp $
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -806,10 +806,7 @@ i3include_HEADERS = \
+@@ -754,10 +754,7 @@ i3include_HEADERS = \
  dist_bin_SCRIPTS = \
  	i3-dmenu-desktop \
  	i3-migrate-config-to-v4 \
@@ -14,7 +14,7 @@ Index: Makefile.in
  
  i3confdir = $(sysconfdir)/i3
  dist_i3conf_DATA = \
-@@ -965,9 +962,6 @@ docs_poddir = ${docdir}
+@@ -913,9 +910,6 @@ docs_poddir = ${docdir}
  @BUILD_MANS_TRUE@	man/i3-nagbar.1 \
  @BUILD_MANS_TRUE@	man/i3-config-wizard.1 \
  @BUILD_MANS_TRUE@	man/i3-migrate-config-to-v4.1 \
@@ -24,7 +24,7 @@ Index: Makefile.in
  @BUILD_MANS_TRUE@	man/i3-dump-log.1
  
  @BUILD_MANS_TRUE@pod_MANS = \
-@@ -3274,7 +3268,7 @@ distclean-tags:
+@@ -3217,7 +3211,7 @@ distclean-tags:
  
  # Leading 'am--fnord' is there to ensure the list of targets does not
  # expand to empty, as could happen e.g. with make check TESTS=''.
@@ -33,7 +33,7 @@ Index: Makefile.in
  am--force-recheck:
  	@:
  
-@@ -4007,7 +4001,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
+@@ -3783,7 +3777,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
  ################################################################################
  
  anyevent-i3.stamp: AnyEvent-I3/lib/AnyEvent/I3.pm
diff --git a/x11/i3-gaps/patches/patch-Makefile_in.orig b/x11/i3-gaps/patches/patch-Makefile_in.orig
deleted file mode 100644
index 62e91c8..0000000
--- a/x11/i3-gaps/patches/patch-Makefile_in.orig
+++ /dev/null
@@ -1,44 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.4 2018/03/29 21:05:32 kn Exp $
-Index: Makefile.in
---- Makefile.in.orig
-+++ Makefile.in
-@@ -752,10 +752,7 @@ i3include_HEADERS = \
- dist_bin_SCRIPTS = \
- 	i3-dmenu-desktop \
- 	i3-migrate-config-to-v4 \
--	i3-save-tree \
--	i3-sensible-editor \
--	i3-sensible-pager \
--	i3-sensible-terminal
-+	i3-save-tree
- 
- i3confdir = $(sysconfdir)/i3
- dist_i3conf_DATA = \
-@@ -911,9 +908,6 @@ docs_poddir = ${docdir}
- @BUILD_MANS_TRUE@	man/i3-nagbar.1 \
- @BUILD_MANS_TRUE@	man/i3-config-wizard.1 \
- @BUILD_MANS_TRUE@	man/i3-migrate-config-to-v4.1 \
--@BUILD_MANS_TRUE@	man/i3-sensible-editor.1 \
--@BUILD_MANS_TRUE@	man/i3-sensible-pager.1 \
--@BUILD_MANS_TRUE@	man/i3-sensible-terminal.1 \
- @BUILD_MANS_TRUE@	man/i3-dump-log.1
- 
- @BUILD_MANS_TRUE@pod_MANS = \
-@@ -3174,7 +3168,7 @@ distclean-tags:
- 
- # Leading 'am--fnord' is there to ensure the list of targets does not
- # expand to empty, as could happen e.g. with make check TESTS=''.
--am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-+am--fnord $(TEST_LOGS): $(am__force_recheck)
- am--force-recheck:
- 	@:
- 
-@@ -3740,7 +3734,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
- ################################################################################
- 
- anyevent-i3.stamp: AnyEvent-I3/lib/AnyEvent/I3.pm
--	$(AM_V_BUILD) (cd $(top_srcdir)/AnyEvent-I3 && perl Makefile.PL && make)
-+	$(AM_V_BUILD) (cd $(top_srcdir)/AnyEvent-I3 && perl Makefile.PL && gmake)
- 	$(AM_V_at) touch $@
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/x11/i3-gaps/patches/patch-configure b/x11/i3-gaps/patches/patch-configure
index 7a8fd88..545bb9e 100644
--- a/x11/i3-gaps/patches/patch-configure
+++ b/x11/i3-gaps/patches/patch-configure
@@ -2,7 +2,7 @@ $OpenBSD: patch-configure,v 1.2 2017/09/04 14:33:07 dcoppa Exp $
 Index: configure
 --- configure.orig
 +++ configure
-@@ -6380,7 +6380,7 @@ char iconv_open ();
+@@ -6392,7 +6392,7 @@ char iconv_open ();
  int
  main ()
  {
diff --git a/x11/i3-gaps/patches/patch-configure.orig b/x11/i3-gaps/patches/patch-configure.orig
deleted file mode 100644
index e29cc01..0000000
--- a/x11/i3-gaps/patches/patch-configure.orig
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2017/09/04 14:33:07 dcoppa Exp $
-Index: configure
---- configure.orig
-+++ configure
-@@ -6388,7 +6388,7 @@ char iconv_open ();
- int
- main ()
- {
--return iconv_open ();
-+return libiconv_open ();
-   ;
-   return 0;
- }
diff --git a/x11/i3-gaps/patches/patch-i3-nagbar_main_c b/x11/i3-gaps/patches/patch-i3-nagbar_main_c
index 559b689..65d9bd4 100644
--- a/x11/i3-gaps/patches/patch-i3-nagbar_main_c
+++ b/x11/i3-gaps/patches/patch-i3-nagbar_main_c
@@ -1,17 +1,8 @@
-$OpenBSD$
+$OpenBSD: patch-i3-nagbar_main_c,v 1.13 2017/10/21 19:22:04 tb Exp $
 
 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-man_i3-config-wizard_man.orig b/x11/i3-gaps/patches/patch-man_i3-config-wizard_man.orig
deleted file mode 100644
index ffdeb89..0000000
--- a/x11/i3-gaps/patches/patch-man_i3-config-wizard_man.orig
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-man_i3-config-wizard_man,v 1.1 2016/11/13 20:46:23 dcoppa Exp $
---- man/i3-config-wizard.man.orig	Fri Nov 11 10:55:30 2016
-+++ man/i3-config-wizard.man	Fri Nov 11 11:02:04 2016
-@@ -13,7 +13,7 @@ i3-config-wizard
- 
- == FILES
- 
--=== /etc/i3/config.keycodes
-+=== ${SYSCONFDIR}/i3/config.keycodes
- 
- This file contains the default configuration with keycodes. All the bindcode
- lines will be transformed to bindsym and the user-specified modifier will be
-@@ -23,7 +23,7 @@ used.
- 
- i3-config-wizard is started by i3 in its default config, unless ~/.i3/config
- exists. i3-config-wizard creates a keysym based i3 config file (based on
--/etc/i3/config.keycodes) in ~/.i3/config.
-+${SYSCONFDIR}/i3/config.keycodes) in ~/.i3/config.
- 
- The advantage of using keysyms is that the config file is easy to read,
- understand and modify. However, if we shipped with a keysym based default
diff --git a/x11/i3-gaps/patches/patch-man_i3-nagbar_man.orig b/x11/i3-gaps/patches/patch-man_i3-nagbar_man.orig
deleted file mode 100644
index 85c670f..0000000
--- a/x11/i3-gaps/patches/patch-man_i3-nagbar_man.orig
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-man_i3-nagbar_man,v 1.1 2016/11/13 20:46:23 dcoppa Exp $
---- man/i3-nagbar.man.orig	Tue Nov  8 19:54:01 2016
-+++ man/i3-nagbar.man	Fri Nov 11 11:19:10 2016
-@@ -44,7 +44,7 @@ after modifying the configuration file.
- 
- ------------------------------------------------
- i3-nagbar -m 'You have an error in your i3 config file!' \
---b 'edit config' 'i3-sensible-editor ~/.config/i3/config'
-+-b 'edit config' '/usr/bin/vi ~/.config/i3/config'
- ------------------------------------------------
- 
- == SEE ALSO
diff --git a/x11/i3-gaps/patches/patch-man_i3_man b/x11/i3-gaps/patches/patch-man_i3_man
index 96f0de5..a5e8d0d 100644
--- a/x11/i3-gaps/patches/patch-man_i3_man
+++ b/x11/i3-gaps/patches/patch-man_i3_man
@@ -1,19 +1,7 @@
-$OpenBSD$
-
+$OpenBSD: patch-man_i3_man,v 1.2 2017/09/04 14:33:07 dcoppa Exp $
 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. ${SYSCONFIGDIR}/xdg/i3/config (or $XDG_CONFIG_DIRS/i3/config if set)
-+4. ${SYSCONFIGDIR}/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.orig b/x11/i3-gaps/patches/patch-src_bindings_c.orig
deleted file mode 100644
index 47adce4..0000000
--- a/x11/i3-gaps/patches/patch-src_bindings_c.orig
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_bindings_c,v 1.7 2017/09/04 14:33:07 dcoppa Exp $
-Index: src/bindings.c
---- src/bindings.c.orig
-+++ src/bindings.c
-@@ -843,7 +843,7 @@ CommandResult *run_binding(Binding *bind, Con *con) {
- 
-     if (result->parse_error) {
-         char *pageraction;
--        sasprintf(&pageraction, "i3-sensible-pager \"%s\"\n", errorfilename);
-+        sasprintf(&pageraction, "/usr/bin/less \"%s\"\n", errorfilename);
-         char *argv[] = {
-             NULL, /* will be replaced by the executable path */
-             "-f",
diff --git a/x11/i3-gaps/patches/patch-src_manage_c.orig b/x11/i3-gaps/patches/patch-src_manage_c.orig
deleted file mode 100644
index 1b37f3c..0000000
--- a/x11/i3-gaps/patches/patch-src_manage_c.orig
+++ /dev/null
@@ -1,27 +0,0 @@
-$OpenBSD: patch-src_manage_c,v 1.21 2018/03/29 21:05:32 kn Exp $
-
-Fix size hints for ssh-askpass
-
-Index: src/manage.c
---- src/manage.c.orig
-+++ src/manage.c
-@@ -501,10 +501,16 @@ void manage_window(xcb_window_t window, xcb_get_window
-     if (cwindow->dock)
-         want_floating = false;
- 
--    /* Plasma windows set their geometry in WM_SIZE_HINTS. */
-+    /*
-+     * Plasma windows set their geometry in WM_SIZE_HINTS.  Note that
-+     * these fields are obsolete, so ignore unless there is a width and
-+     * a height specified.
-+     */
-     if ((wm_size_hints.flags & XCB_ICCCM_SIZE_HINT_US_POSITION || wm_size_hints.flags & XCB_ICCCM_SIZE_HINT_P_POSITION) &&
--        (wm_size_hints.flags & XCB_ICCCM_SIZE_HINT_US_SIZE || wm_size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE)) {
--        DLOG("We are setting geometry according to wm_size_hints x=%d y=%d w=%d h=%d\n",
-+        (wm_size_hints.flags & XCB_ICCCM_SIZE_HINT_US_SIZE || wm_size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE) &&
-+        wm_size_hints.width != 0 && wm_size_hints.height != 0) {
-+        DLOG("We are setting geometry according to the obsolete wm_size_hints "
-+             "x=%d y=%d w=%d h=%d\n",
-              wm_size_hints.x, wm_size_hints.y, wm_size_hints.width, wm_size_hints.height);
-         geom->x = wm_size_hints.x;
-         geom->y = wm_size_hints.y;