On Wed Mar 14, 2018 at 02:11:05PM +0100, Henrik Friedrichsen wrote:
> Some initial work to get the ball rolling. Diff updates to 4.15. Patches
> were updated to new source tarball, some of the patches are now upstream
> and where thus removed.
>
> Compiles and runs fine on amd64. Test suite fails, did it work before
> with "make test"?
Thanks Henrik! The old one was also broken. Works fine for me. ok
rsadowski@.
Someone could take a look at i3lock.
>
> Cheers
> Henrik
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/i3/Makefile,v
> retrieving revision 1.111
> diff -u -p -r1.111 Makefile
> --- Makefile 8 Nov 2017 21:14:27 -0000 1.111
> +++ Makefile 14 Mar 2018 13:08:18 -0000
> @@ -2,8 +2,7 @@
>
> COMMENT = improved dynamic tiling window manager
>
> -DISTNAME = i3-4.14.1
> -REVISION = 1
> +DISTNAME = i3-4.15
> CATEGORIES = x11
>
> EXTRACT_SUFX = .tar.bz2
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/i3/distinfo,v
> retrieving revision 1.28
> diff -u -p -r1.28 distinfo
> --- distinfo 25 Sep 2017 06:30:43 -0000 1.28
> +++ distinfo 14 Mar 2018 13:08:18 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (i3-4.14.1.tar.bz2) = 0AY6xWHzqo1+MeE3NWgVuteBvWrXdAMDYsiavparX7E=
> -SIZE (i3-4.14.1.tar.bz2) = 1173560
> +SHA256 (i3-4.15.tar.bz2) = IX1STR+8ha40ayX2hI0be80sIxhOyI0pEUv1piE4UyY=
> +SIZE (i3-4.15.tar.bz2) = 1196263
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/i3/patches/patch-Makefile_in,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-Makefile_in
> --- patches/patch-Makefile_in 25 Sep 2017 06:30:43 -0000 1.3
> +++ patches/patch-Makefile_in 14 Mar 2018 13:08:18 -0000
> @@ -14,7 +14,7 @@ Index: Makefile.in
>
> i3confdir = $(sysconfdir)/i3
> dist_i3conf_DATA = \
> -@@ -906,9 +903,6 @@ docs_poddir = ${docdir}
> +@@ -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 \
> @@ -24,7 +24,7 @@ Index: Makefile.in
> @BUILD_MANS_TRUE@ man/i3-dump-log.1
>
> @BUILD_MANS_TRUE@pod_MANS = \
> -@@ -3169,7 +3163,7 @@ distclean-tags:
> +@@ -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=''.
> @@ -33,7 +33,7 @@ Index: Makefile.in
> am--force-recheck:
> @:
>
> -@@ -3735,7 +3729,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
> +@@ -3740,7 +3734,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
>
> ################################################################################
>
> anyevent-i3.stamp: AnyEvent-I3/lib/AnyEvent/I3.pm
> Index: patches/patch-etc_config_keycodes
> ===================================================================
> RCS file: /cvs/ports/x11/i3/patches/patch-etc_config_keycodes,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-etc_config_keycodes
> --- patches/patch-etc_config_keycodes 13 Nov 2016 20:46:23 -0000 1.1
> +++ patches/patch-etc_config_keycodes 14 Mar 2018 13:08:18 -0000
> @@ -3,8 +3,9 @@ $OpenBSD: patch-etc_config_keycodes,v 1.
> Fix keycodes for the "Left", "Down", "Up" and "Right" keys: they're
> different between Linux and OpenBSD.
>
> ---- etc/config.keycodes.orig Sun Mar 29 19:07:08 2015
> -+++ etc/config.keycodes Mon Mar 30 14:13:25 2015
> +Index: etc/config.keycodes
> +--- etc/config.keycodes.orig
> ++++ etc/config.keycodes
> @@ -29,13 +29,13 @@ font pango:monospace 8
> floating_modifier $mod
>
> @@ -51,7 +52,7 @@ different between Linux and OpenBSD.
>
> # split in horizontal orientation
> bindcode $mod+43 split h
> -@@ -136,10 +136,10 @@ mode "resize" {
> +@@ -149,10 +149,10 @@ mode "resize" {
> bindcode 47 resize grow width 10 px or 10 ppt
>
> # same bindings, but for the arrow keys
> @@ -64,5 +65,5 @@ different between Linux and OpenBSD.
> + bindcode 98 resize shrink height 10 px or 10 ppt
> + bindcode 102 resize grow width 10 px or 10 ppt
>
> - # back to normal: Enter or Escape
> + # back to normal: Enter or Escape or $mod+r
> bindcode 36 mode "default"
> Index: patches/patch-src_con_c
> ===================================================================
> RCS file: patches/patch-src_con_c
> diff -N patches/patch-src_con_c
> --- patches/patch-src_con_c 8 Nov 2017 21:14:27 -0000 1.20
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,28 +0,0 @@
> -$OpenBSD: patch-src_con_c,v 1.20 2017/11/08 21:14:27 danj Exp $
> -
> -backport
> https://github.com/i3/i3/pull/2849/commits/c028f0cb173ebc4c7033c758c7f942adfbc224af
> -and
> https://github.com/i3/i3/pull/2849/commits/26014ca1a22c1b862c782f4dfa3d40a5ab629627
> -
> -Index: src/con.c
> ---- src/con.c.orig
> -+++ src/con.c
> -@@ -1735,7 +1756,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);
> -@@ -1827,6 +1848,10 @@ void con_toggle_layout(Con *con, const char *toggle_mo
> - * change to the opposite split layout. */
> - if (parent->layout != L_SPLITH && parent->layout !=
> L_SPLITV) {
> - layout = parent->last_split_layout;
> -+ /* In case last_split_layout was not initialized… */
> -+ if (layout == L_DEFAULT) {
> -+ layout = L_SPLITH;
> -+ }
> - } else {
> - layout = (parent->layout == L_SPLITH) ? L_SPLITV :
> L_SPLITH;
> - }
> Index: patches/patch-src_config_parser_c
> ===================================================================
> RCS file: /cvs/ports/x11/i3/patches/patch-src_config_parser_c,v
> retrieving revision 1.10
> diff -u -p -r1.10 patch-src_config_parser_c
> --- patches/patch-src_config_parser_c 13 Nov 2016 20:46:23 -0000 1.10
> +++ patches/patch-src_config_parser_c 14 Mar 2018 13:08:18 -0000
> @@ -1,7 +1,8 @@
> $OpenBSD: patch-src_config_parser_c,v 1.10 2016/11/13 20:46:23 dcoppa Exp $
> ---- src/config_parser.c.orig Tue Nov 8 19:54:01 2016
> -+++ src/config_parser.c Thu Nov 10 18:04:35 2016
> -@@ -789,8 +789,8 @@ static char *migrate_config(char *input, off_t size) {
> +Index: src/config_parser.c
> +--- src/config_parser.c.orig
> ++++ src/config_parser.c
> +@@ -791,8 +791,8 @@ static char *migrate_config(char *input, off_t size) {
> */
> void start_config_error_nagbar(const char *configpath, bool has_errors) {
> char *editaction, *pageraction;
> Index: patches/patch-src_manage_c
> ===================================================================
> RCS file: /cvs/ports/x11/i3/patches/patch-src_manage_c,v
> retrieving revision 1.20
> diff -u -p -r1.20 patch-src_manage_c
> --- patches/patch-src_manage_c 4 Sep 2017 14:33:07 -0000 1.20
> +++ patches/patch-src_manage_c 14 Mar 2018 13:08:18 -0000
> @@ -2,9 +2,10 @@ $OpenBSD: patch-src_manage_c,v 1.20 2017
>
> Fix size hints for ssh-askpass
>
> ---- src/manage.c.orig Tue Nov 8 19:54:01 2016
> -+++ src/manage.c Thu Nov 10 18:04:35 2016
> -@@ -480,10 +480,16 @@ void manage_window(xcb_window_t window, xcb_get_window
> +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;
>
> Index: patches/patch-testcases_inject_randr1_5_c
> ===================================================================
> RCS file: patches/patch-testcases_inject_randr1_5_c
> diff -N patches/patch-testcases_inject_randr1_5_c
> --- patches/patch-testcases_inject_randr1_5_c 4 Sep 2017 14:33:07 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-testcases_inject_randr1_5_c,v 1.1 2017/09/04 14:33:07 dcoppa
> Exp $
> -
> -missing include
> -
> -Index: testcases/inject_randr1.5.c
> ---- testcases/inject_randr1.5.c.orig
> -+++ testcases/inject_randr1.5.c
> -@@ -23,6 +23,7 @@
> - #include <sys/resource.h>
> - #include <sys/mman.h>
> - #include <sys/stat.h>
> -+#include <sys/wait.h>
> - #include <libgen.h>
> -
> - static void uds_connection_cb(EV_P_ ev_io *w, int revents);
