Diff below brings i3 to 4.18, Release notes can be found at https://github.com/i3/i3/blob/4.18/RELEASE-NOTES-4.18.
Changes to the port: - Unfortunately pledge() support has not been fixed. As such, I added a bit of information to Makefile for future reference - Sync WANTLIB Testing: - (Very) lightly run tested on amd64 Comments/OK? diff --git Makefile Makefile index 87062cfc8b0..b25abb9d54f 100644 --- Makefile +++ Makefile @@ -2,8 +2,7 @@ COMMENT = improved dynamic tiling window manager -DISTNAME = i3-4.17.1 -REVISION = 1 +DISTNAME = i3-4.18 CATEGORIES = x11 @@ -12,9 +11,10 @@ HOMEPAGE = https://i3wm.org/ # BSD PERMIT_PACKAGE = Yes -# uses pledge() -WANTLIB += c cairo ev glib-2.0 gobject-2.0 iconv intl m pango-1.0 -WANTLIB += pangocairo-1.0 pcre pthread startup-notification-1 +# XXX use of pledge has been neutered. For more details see +# https://marc.info/?l=openbsd-ports&m=156762440931634&w=2 +WANTLIB += c cairo ev glib-2.0 gobject-2.0 harfbuzz iconv intl +WANTLIB += m pango-1.0 pangocairo-1.0 pcre pthread startup-notification-1 WANTLIB += xcb xcb-cursor xcb-icccm xcb-keysyms xcb-randr xcb-shape WANTLIB += xcb-util xcb-xinerama xcb-xkb xcb-xrm xkbcommon xkbcommon-x11 WANTLIB += yajl diff --git distinfo distinfo index afe58183839..d3908c12572 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (i3-4.17.1.tar.bz2) = Ho/hM6GVwpqOKqOxxW5bx35/VTTy3ZLgn6q+LKLYX0U= -SIZE (i3-4.17.1.tar.bz2) = 1218418 +SHA256 (i3-4.18.tar.bz2) = H7tY1YDo+K+36Af+cRZNYAPkVNcfIu6l6zJWxzx6ZTc= +SIZE (i3-4.18.tar.bz2) = 1218591 diff --git patches/patch-Makefile_in patches/patch-Makefile_in index 6c55aa0ad7c..8ad4473dd21 100644 --- patches/patch-Makefile_in +++ patches/patch-Makefile_in @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2019/08/23 15:07:20 sthen Exp $ Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -810,10 +810,7 @@ i3include_HEADERS = \ +@@ -809,10 +809,7 @@ i3include_HEADERS = \ dist_bin_SCRIPTS = \ i3-dmenu-desktop \ i3-migrate-config-to-v4 \ @@ -15,7 +15,7 @@ Index: Makefile.in i3confdir = $(sysconfdir)/i3 dist_i3conf_DATA = \ -@@ -969,9 +966,6 @@ docs_poddir = ${docdir} +@@ -968,9 +965,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 \ @@ -25,7 +25,7 @@ Index: Makefile.in @BUILD_MANS_TRUE@ man/i3-dump-log.1 @BUILD_MANS_TRUE@pod_MANS = \ -@@ -3280,7 +3274,7 @@ distclean-tags: +@@ -3298,7 +3292,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=''. @@ -34,7 +34,7 @@ Index: Makefile.in am--force-recheck: @: -@@ -4013,7 +4007,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co +@@ -4033,7 +4027,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co ################################################################################ anyevent-i3.stamp: AnyEvent-I3/lib/AnyEvent/I3.pm diff --git patches/patch-configure patches/patch-configure deleted file mode 100644 index 74f98f02d05..00000000000 --- patches/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-configure,v 1.4 2019/08/23 15:07:20 sthen Exp $ - -Index: configure ---- configure.orig -+++ configure -@@ -6400,7 +6400,7 @@ char iconv_open (); - int - main () - { --return iconv_open (); -+return libiconv_open (); - ; - return 0; - } diff --git patches/patch-i3-nagbar_main_c patches/patch-i3-nagbar_main_c index cdf7958af2a..c4978b2e14a 100644 --- patches/patch-i3-nagbar_main_c +++ patches/patch-i3-nagbar_main_c @@ -3,7 +3,7 @@ $OpenBSD: patch-i3-nagbar_main_c,v 1.16 2019/09/04 20:24:04 sthen 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 +@@ -190,7 +190,7 @@ static void handle_button_release(xcb_connection_t *co char *terminal_cmd; if (button->terminal) { @@ -12,7 +12,7 @@ Index: i3-nagbar/main.c } else { terminal_cmd = sstrdup(link_path); } -@@ -454,7 +454,7 @@ int main(int argc, char *argv[]) { +@@ -462,7 +462,7 @@ int main(int argc, char *argv[]) { font = load_font(pattern, true); set_font(&font); diff --git patches/patch-src_config_directives_c patches/patch-src_config_directives_c index bbad3e35f74..54d72e8bd23 100644 --- patches/patch-src_config_directives_c +++ patches/patch-src_config_directives_c @@ -3,7 +3,7 @@ $OpenBSD: patch-src_config_directives_c,v 1.6 2019/08/23 15:07:20 sthen Exp $ Index: src/config_directives.c --- src/config_directives.c.orig +++ src/config_directives.c -@@ -479,10 +479,6 @@ CFGFUN(no_focus) { +@@ -481,10 +481,6 @@ CFGFUN(no_focus) { TAILQ_INSERT_TAIL(&assignments, assignment, assignments); } diff --git patches/patch-src_main_c patches/patch-src_main_c index b46460cb1e5..b22e9986748 100644 --- patches/patch-src_main_c +++ patches/patch-src_main_c @@ -3,7 +3,7 @@ $OpenBSD: patch-src_main_c,v 1.19 2019/09/04 20:25:48 sthen Exp $ Index: src/main.c --- src/main.c.orig +++ src/main.c -@@ -948,7 +948,7 @@ int main(int argc, char *argv[]) { +@@ -954,7 +954,7 @@ int main(int argc, char *argv[]) { xcb_free_pixmap(conn, pixmap); }
