From e9f02645951e0b96d7031b76d8f7ce7886a2bbc8 Mon Sep 17 00:00:00 2001 From: rsadowski Date: Fri, 12 Nov 2021 09:28:46 +0000 Subject: [PATCH] Update i3-gaps to 4.20.1 OK sthen@ --- x11/i3-gaps/Makefile | 7 +-- x11/i3-gaps/distinfo | 4 +- x11/i3-gaps/patches/patch-etc_config | 6 +-- x11/i3-gaps/patches/patch-etc_config_keycodes | 10 ++--- x11/i3-gaps/patches/patch-i3-dmenu-desktop | 12 ++--- x11/i3-gaps/patches/patch-i3-nagbar_main_c | 4 +- x11/i3-gaps/patches/patch-man_i3-nagbar_man | 4 +- x11/i3-gaps/patches/patch-man_i3_man | 8 ++-- x11/i3-gaps/patches/patch-meson_build | 4 +- x11/i3-gaps/patches/patch-src_bindings_c | 4 +- .../patches/patch-src_config_directives_c | 44 +++++++++++++++++++ x11/i3-gaps/patches/patch-src_config_parser_c | 4 +- x11/i3-gaps/patches/patch-src_main_c | 6 +-- 13 files changed, 81 insertions(+), 36 deletions(-) create mode 100644 x11/i3-gaps/patches/patch-src_config_directives_c diff --git a/x11/i3-gaps/Makefile b/x11/i3-gaps/Makefile index 33438279cd0..bc758453ee3 100644 --- a/x11/i3-gaps/Makefile +++ b/x11/i3-gaps/Makefile @@ -1,15 +1,16 @@ -# $OpenBSD: Makefile,v 1.13 2021/02/27 13:55:47 sthen Exp $ +# $OpenBSD: Makefile,v 1.14 2021/11/12 09:28:46 rsadowski Exp $ COMMENT = improved dynamic tiling window manager, fork with gaps -V = 4.19.1 -REVISION = 1 +V = 4.20.1 DISTNAME = i3-gaps-${V} CATEGORIES = x11 HOMEPAGE = https://i3wm.org/ +MAINTAINER = Rafael Sadowski + # BSD PERMIT_PACKAGE = Yes diff --git a/x11/i3-gaps/distinfo b/x11/i3-gaps/distinfo index 87fdb641170..c812842825e 100644 --- a/x11/i3-gaps/distinfo +++ b/x11/i3-gaps/distinfo @@ -1,2 +1,2 @@ -SHA256 (gaps-i3-4.19.1.tar.xz) = +yZ4Pc7zPZfwgBKbjQsrlXxIaxJBmIdE47lljx8FZG0= -SIZE (gaps-i3-4.19.1.tar.xz) = 1280920 +SHA256 (gaps-i3-4.20.1.tar.xz) = /Y4ttm8dqCojtnFAQHj4/BAT67oarNQkXl0cLTMaOtg= +SIZE (gaps-i3-4.20.1.tar.xz) = 1288400 diff --git a/x11/i3-gaps/patches/patch-etc_config b/x11/i3-gaps/patches/patch-etc_config index 3ea94cf7324..eae895a24d7 100644 --- a/x11/i3-gaps/patches/patch-etc_config +++ b/x11/i3-gaps/patches/patch-etc_config @@ -1,9 +1,9 @@ -$OpenBSD: patch-etc_config,v 1.4 2021/02/13 05:59:02 rsadowski Exp $ +$OpenBSD: patch-etc_config,v 1.5 2021/11/12 09:28:46 rsadowski Exp $ Index: etc/config --- etc/config.orig +++ etc/config -@@ -22,18 +22,18 @@ font pango:monospace 8 +@@ -26,18 +26,18 @@ exec --no-startup-id dex --autostart --environment i3 # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the # screen before suspend. Use loginctl lock-session to lock your screen. @@ -29,7 +29,7 @@ Index: etc/config # use these keys for focus, movement, and resize directions when reaching for # the arrows is not convenient -@@ -46,13 +46,13 @@ set $right semicolon +@@ -50,13 +50,13 @@ set $right semicolon floating_modifier Mod1 # start a terminal diff --git a/x11/i3-gaps/patches/patch-etc_config_keycodes b/x11/i3-gaps/patches/patch-etc_config_keycodes index 6fc3cc043dc..41cc483f2cd 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.4 2021/02/13 05:59:02 rsadowski Exp $ +$OpenBSD: patch-etc_config_keycodes,v 1.5 2021/11/12 09:28:46 rsadowski Exp $ Fix keycodes for the "Left", "Down", "Up" and "Right" keys: they're different between Linux and OpenBSD. @@ -6,7 +6,7 @@ different between Linux and OpenBSD. Index: etc/config.keycodes --- etc/config.keycodes.orig +++ etc/config.keycodes -@@ -23,30 +23,30 @@ font pango:monospace 8 +@@ -27,30 +27,30 @@ exec --no-startup-id dex --autostart --environment i3 # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the # screen before suspend. Use loginctl lock-session to lock your screen. @@ -46,7 +46,7 @@ Index: etc/config.keycodes # A more modern dmenu replacement is rofi: # bindcode $mod+40 exec "rofi -modi drun,run -show drun" # There also is i3-dmenu-desktop which only displays applications shipping a -@@ -60,10 +60,10 @@ bindcode $mod+46 focus up +@@ -64,10 +64,10 @@ bindcode $mod+46 focus up bindcode $mod+47 focus right # alternatively, you can use the cursor keys: @@ -61,7 +61,7 @@ Index: etc/config.keycodes # move focused window bindcode $mod+Shift+44 move left -@@ -72,10 +72,10 @@ bindcode $mod+Shift+46 move up +@@ -76,10 +76,10 @@ bindcode $mod+Shift+46 move up bindcode $mod+Shift+47 move right # alternatively, you can use the cursor keys: @@ -76,7 +76,7 @@ Index: etc/config.keycodes # split in horizontal orientation bindcode $mod+43 split h -@@ -161,10 +161,10 @@ mode "resize" { +@@ -165,10 +165,10 @@ mode "resize" { bindcode 47 resize grow width 10 px or 10 ppt # same bindings, but for the arrow keys diff --git a/x11/i3-gaps/patches/patch-i3-dmenu-desktop b/x11/i3-gaps/patches/patch-i3-dmenu-desktop index 47f769becea..de84f680dcb 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.3 2021/02/13 05:59:02 rsadowski Exp $ +$OpenBSD: patch-i3-dmenu-desktop,v 1.4 2021/11/12 09:28:46 rsadowski Exp $ Index: i3-dmenu-desktop --- i3-dmenu-desktop.orig @@ -12,7 +12,7 @@ Index: i3-dmenu-desktop !defined($xdg_data_dirs) || $xdg_data_dirs eq ''; -@@ -224,12 +224,12 @@ for my $file (values %desktops) { +@@ -226,12 +226,12 @@ for my $file (values %desktops) { # 'evince.desktop' => { # 'Exec' => 'evince %U', # 'Name' => 'Dokumentenbetrachter', @@ -27,7 +27,7 @@ Index: i3-dmenu-desktop # } # }; -@@ -461,7 +461,7 @@ if (exists($app->{Terminal}) && $app->{Terminal}) { +@@ -463,7 +463,7 @@ if (exists($app->{Terminal}) && $app->{Terminal}) { # we need to create a temporary script that contains the full command line # as the syntax for starting commands with arguments varies from terminal # emulator to terminal emulator. @@ -36,7 +36,7 @@ Index: i3-dmenu-desktop my ($fh, $filename) = tempfile(); binmode($fh, ':utf8'); say $fh <> ~/.i3/logfile diff --git a/x11/i3-gaps/patches/patch-meson_build b/x11/i3-gaps/patches/patch-meson_build index c3f0686a1fd..1ea4980e8ca 100644 --- a/x11/i3-gaps/patches/patch-meson_build +++ b/x11/i3-gaps/patches/patch-meson_build @@ -1,9 +1,9 @@ -$OpenBSD: patch-meson_build,v 1.1 2021/02/13 10:51:01 rsadowski Exp $ +$OpenBSD: patch-meson_build,v 1.2 2021/11/12 09:28:46 rsadowski Exp $ Index: meson.build --- meson.build.orig +++ meson.build -@@ -598,7 +598,7 @@ install_headers( +@@ -607,7 +607,7 @@ install_headers( # because configure_file strips the backslash in e.g. \@display, # resulting in @display, breaking our Perl code: # https://github.com/mesonbuild/meson/issues/7165 diff --git a/x11/i3-gaps/patches/patch-src_bindings_c b/x11/i3-gaps/patches/patch-src_bindings_c index 7ffa59f68da..6a995b1c3fb 100644 --- a/x11/i3-gaps/patches/patch-src_bindings_c +++ b/x11/i3-gaps/patches/patch-src_bindings_c @@ -1,9 +1,9 @@ -$OpenBSD: patch-src_bindings_c,v 1.3 2021/02/13 05:59:02 rsadowski Exp $ +$OpenBSD: patch-src_bindings_c,v 1.4 2021/11/12 09:28:46 rsadowski Exp $ Index: src/bindings.c --- src/bindings.c.orig +++ src/bindings.c -@@ -835,7 +835,7 @@ CommandResult *run_binding(Binding *bind, Con *con) { +@@ -851,7 +851,7 @@ CommandResult *run_binding(Binding *bind, Con *con) { if (result->parse_error) { char *pageraction; diff --git a/x11/i3-gaps/patches/patch-src_config_directives_c b/x11/i3-gaps/patches/patch-src_config_directives_c new file mode 100644 index 00000000000..a4c83aab3bc --- /dev/null +++ b/x11/i3-gaps/patches/patch-src_config_directives_c @@ -0,0 +1,44 @@ +$OpenBSD: patch-src_config_directives_c,v 1.3 2021/11/12 09:28:46 rsadowski Exp $ + +Index: src/config_directives.c +--- src/config_directives.c.orig ++++ src/config_directives.c +@@ -9,7 +9,7 @@ + */ + #include "all.h" + +-#include ++#include + + /******************************************************************************* + * Include functions. +@@ -18,15 +18,15 @@ + CFGFUN(include, const char *pattern) { + DLOG("include %s\n", pattern); + +- wordexp_t p; +- const int ret = wordexp(pattern, &p, 0); ++ glob_t p; ++ const int ret = glob(pattern, GLOB_ERR, NULL, &p ); + if (ret != 0) { +- ELOG("wordexp(%s): error %d\n", pattern, ret); ++ ELOG("glob(%s): error %d\n", pattern, ret); + result->has_errors = true; + return; + } +- char **w = p.we_wordv; +- for (size_t i = 0; i < p.we_wordc; i++) { ++ char **w = p.gl_pathv; ++ for (size_t i = 0; i < p.gl_pathc; i++) { + char resolved_path[PATH_MAX] = {'\0'}; + if (realpath(w[i], resolved_path) == NULL) { + LOG("Skipping %s: %s\n", w[i], strerror(errno)); +@@ -86,7 +86,7 @@ CFGFUN(include, const char *pattern) { + break; + } + } +- wordfree(&p); ++ globfree(&p); + } + + /******************************************************************************* diff --git a/x11/i3-gaps/patches/patch-src_config_parser_c b/x11/i3-gaps/patches/patch-src_config_parser_c index 677db48dd6d..c1caae08d16 100644 --- a/x11/i3-gaps/patches/patch-src_config_parser_c +++ b/x11/i3-gaps/patches/patch-src_config_parser_c @@ -1,9 +1,9 @@ -$OpenBSD: patch-src_config_parser_c,v 1.3 2021/02/13 05:59:02 rsadowski Exp $ +$OpenBSD: patch-src_config_parser_c,v 1.4 2021/11/12 09:28:46 rsadowski Exp $ Index: src/config_parser.c --- src/config_parser.c.orig +++ src/config_parser.c -@@ -792,8 +792,8 @@ static char *migrate_config(char *input, off_t size) { +@@ -752,8 +752,8 @@ static char *migrate_config(char *input, off_t size) { */ void start_config_error_nagbar(const char *configpath, bool has_errors) { char *editaction, *pageraction; diff --git a/x11/i3-gaps/patches/patch-src_main_c b/x11/i3-gaps/patches/patch-src_main_c index e791b75ab31..84367e0a321 100644 --- a/x11/i3-gaps/patches/patch-src_main_c +++ b/x11/i3-gaps/patches/patch-src_main_c @@ -1,10 +1,10 @@ -$OpenBSD: patch-src_main_c,v 1.3 2021/02/13 05:59:02 rsadowski Exp $ +$OpenBSD: patch-src_main_c,v 1.4 2021/11/12 09:28:46 rsadowski Exp $ Index: src/main.c --- src/main.c.orig +++ src/main.c -@@ -970,7 +970,7 @@ int main(int argc, char *argv[]) { - xcb_free_pixmap(conn, pixmap); +@@ -1125,7 +1125,7 @@ int main(int argc, char *argv[]) { + } } -#if defined(__OpenBSD__)