Re: UPDATE: x11/i3

On Fri Dec 28, 2018 at 04:36:27PM +0100, Theo Buehler wrote:
> +dcoppa
>
> On Thu, Dec 27, 2018 at 08:35:09PM +0100, Rafael Sadowski wrote:
> > Simple update to the latest version 4.16.
> >
> > Works fine on amd64, OK?
>
> Tested on macppc and amd64. Works fine, thanks. Please reinstate/port
> the hunks you lost in i3-nagbar/main.c and man/i3.man.
>
> With that:
>
> ok tb
> (provided dcoppa is fine with it/doesn't object)
>

Hi i3 users,

new diff based on edd@'s work from openbsd-wip. He tweaks the test case. I
guess this is the more clean way to go into the tree!? I don't see any lost
parts in the patches, do I?

A general question: I would like to port a i3 with gaps[1], should we go
with a second port (i3-gaps) of should we improve x11/i3 with patches?

RS

[1]: https://github.com/Airblader/i3/tree/gaps

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.113
diff -u -p -u -p -r1.113 Makefile
--- Makefile 27 Jun 2018 21:04:12 -0000 1.113
+++ Makefile 5 Jan 2019 09:43:16 -0000
@@ -2,8 +2,7 @@

COMMENT = improved dynamic tiling window manager

-DISTNAME = i3-4.15
-REVISION = 0
+DISTNAME = i3-4.16

CATEGORIES = x11

@@ -36,7 +35,10 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/dmenu \
x11/i3status \
x11/p5-AnyEvent-I3
-TEST_DEPENDS = x11/p5-AnyEvent-I3
+
+# Tests now use the X11::XCB Perl module, not yet in ports.
+NO_TEST = Yes
+#TEST_DEPENDS = x11/p5-AnyEvent-I3

FAKE_FLAGS = i3confdir="${PREFIX}/share/examples/i3/"

Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/i3/distinfo,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 distinfo
--- distinfo 29 Mar 2018 21:05:32 -0000 1.29
+++ distinfo 5 Jan 2019 09:43:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (i3-4.15.tar.bz2) = IX1STR+8ha40ayX2hI0be80sIxhOyI0pEUv1piE4UyY=
-SIZE (i3-4.15.tar.bz2) = 1196263
+SHA256 (i3-4.16.tar.bz2) = zGCl9RjF43tBQ7ZEqEC7KtKmPqencZVMMyzVY322VbQ=
+SIZE (i3-4.16.tar.bz2) = 1213251
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 29 Mar 2018 21:05:32 -0000 1.4
+++ patches/patch-Makefile_in 5 Jan 2019 09:43:16 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2018/0
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -752,10 +752,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 = \
-@@ -911,9 +908,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 = \
-@@ -3174,7 +3168,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:
@:

-@@ -3740,7 +3734,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
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-configure
--- patches/patch-configure 4 Sep 2017 14:33:07 -0000 1.2
+++ patches/patch-configure 5 Jan 2019 09:43:16 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-configure,v 1.2 2017/09/
Index: configure
--- configure.orig
+++ configure
-@@ -6388,7 +6388,7 @@ char iconv_open ();
+@@ -6392,7 +6392,7 @@ char iconv_open ();
int
main ()
{
Index: patches/patch-i3-nagbar_main_c
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-i3-nagbar_main_c,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 patch-i3-nagbar_main_c
--- patches/patch-i3-nagbar_main_c 21 Oct 2017 19:22:04 -0000 1.13
+++ patches/patch-i3-nagbar_main_c 5 Jan 2019 09:43:16 -0000
@@ -3,16 +3,16 @@ $OpenBSD: patch-i3-nagbar_main_c,v 1.13
Index: i3-nagbar/main.c
--- i3-nagbar/main.c.orig
+++ i3-nagbar/main.c
-@@ -184,7 +184,7 @@ static void handle_button_release(xcb_connection_t *co
- }
+@@ -189,7 +189,7 @@ static void handle_button_release(xcb_connection_t *co

char *terminal_cmd;
-- sasprintf(&terminal_cmd, "i3-sensible-terminal -e %s", link_path);
-+ sasprintf(&terminal_cmd, "${X11BASE}/bin/xterm -e %s", link_path);
- printf("argv0 = %s\n", argv0);
- printf("terminal_cmd = %s\n", terminal_cmd);
-
-@@ -438,11 +438,6 @@ int main(int argc, char *argv[]) {
+ 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);

@@ -24,7 +24,7 @@ Index: i3-nagbar/main.c
xcb_rectangle_t win_pos = get_window_position();

xcb_cursor_t cursor;
-@@ -543,6 +538,11 @@ int main(int argc, char *argv[]) {
+@@ -562,6 +557,11 @@ int main(int argc, char *argv[]) {

/* Initialize the drawable bar */
draw_util_surface_init(conn, &bar, win, get_visualtype(root_screen), win_pos.width, win_pos.height);
@@ -34,5 +34,5 @@ Index: i3-nagbar/main.c
+ err(EXIT_FAILURE, "pledge");
+