From bc1b5c11e5b7e0a63064900a3962b658ab117c60 Mon Sep 17 00:00:00 2001 From: rsadowski Date: Sat, 8 Oct 2022 05:59:51 +0000 Subject: [PATCH] Update i3-gaps to 4.21 --- x11/i3-gaps/Makefile | 7 +++---- x11/i3-gaps/distinfo | 4 ++-- x11/i3-gaps/patches/patch-i3-dmenu-desktop | 4 ++-- x11/i3-gaps/patches/patch-meson_build | 2 +- x11/i3-gaps/patches/patch-src_config_parser_c | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/x11/i3-gaps/Makefile b/x11/i3-gaps/Makefile index c80aa4d4f67..3b5c40b89e7 100644 --- a/x11/i3-gaps/Makefile +++ b/x11/i3-gaps/Makefile @@ -1,8 +1,7 @@ COMMENT = improved dynamic tiling window manager, fork with gaps -V = 4.20.1 +V = 4.21 DISTNAME = i3-gaps-${V} -REVISION = 0 CATEGORIES = x11 @@ -16,7 +15,7 @@ PERMIT_PACKAGE = Yes # 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 iconv m pango-1.0 pangocairo-1.0 -WANTLIB += pcre startup-notification-1 xcb xcb-cursor xcb-icccm +WANTLIB += pcre2-8 startup-notification-1 xcb xcb-cursor xcb-icccm WANTLIB += xcb-keysyms xcb-randr xcb-shape xcb-util xcb-xinerama WANTLIB += xcb-xkb xcb-xrm xkbcommon xkbcommon-x11 yajl @@ -34,7 +33,7 @@ MODULES = devel/meson LIB_DEPENDS = devel/libev \ devel/libyajl>=2.0.0 \ devel/pango \ - devel/pcre \ + devel/pcre2 \ devel/startup-notification \ x11/xkbcommon diff --git a/x11/i3-gaps/distinfo b/x11/i3-gaps/distinfo index c812842825e..66b2a9511d5 100644 --- a/x11/i3-gaps/distinfo +++ b/x11/i3-gaps/distinfo @@ -1,2 +1,2 @@ -SHA256 (gaps-i3-4.20.1.tar.xz) = /Y4ttm8dqCojtnFAQHj4/BAT67oarNQkXl0cLTMaOtg= -SIZE (gaps-i3-4.20.1.tar.xz) = 1288400 +SHA256 (gaps-i3-4.21.tar.xz) = CScEuSqnazFszsJPZnyAPcZP6L7TFneKnj1T0gY6VWc= +SIZE (gaps-i3-4.21.tar.xz) = 1298724 diff --git a/x11/i3-gaps/patches/patch-i3-dmenu-desktop b/x11/i3-gaps/patches/patch-i3-dmenu-desktop index 0ace7699461..0a0f3db428b 100644 --- a/x11/i3-gaps/patches/patch-i3-dmenu-desktop +++ b/x11/i3-gaps/patches/patch-i3-dmenu-desktop @@ -43,7 +43,7 @@ Index: i3-dmenu-desktop } else { # i3 executes applications by passing the argument to i3’s “exec” command # as-is to $SHELL -c. The i3 parser supports quoted strings: When a string -@@ -515,7 +515,7 @@ notifications. +@@ -516,7 +516,7 @@ notifications. The .desktop files are searched in $XDG_DATA_HOME/applications (by default $HOME/.local/share/applications) and in the "applications" subdirectory of each @@ -52,7 +52,7 @@ Index: i3-dmenu-desktop Files with the same name in $XDG_DATA_HOME/applications take precedence over files in $XDG_DATA_DIRS, so that you can overwrite parts of the system-wide -@@ -529,7 +529,7 @@ file respectively) by appending it to the name of the +@@ -530,7 +530,7 @@ file respectively) by appending it to the name of the want to launch "GNU Emacs 24" with the patch /tmp/foobar.txt, you would type "emacs", press TAB, type " /tmp/foobar.txt" and press ENTER. diff --git a/x11/i3-gaps/patches/patch-meson_build b/x11/i3-gaps/patches/patch-meson_build index dc1ddedfde2..e4be4737f87 100644 --- a/x11/i3-gaps/patches/patch-meson_build +++ b/x11/i3-gaps/patches/patch-meson_build @@ -1,7 +1,7 @@ Index: meson.build --- meson.build.orig +++ meson.build -@@ -607,7 +607,7 @@ install_headers( +@@ -608,7 +608,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_config_parser_c b/x11/i3-gaps/patches/patch-src_config_parser_c index 0a06be18f03..6cd7a0d5cb7 100644 --- a/x11/i3-gaps/patches/patch-src_config_parser_c +++ b/x11/i3-gaps/patches/patch-src_config_parser_c @@ -1,7 +1,7 @@ Index: src/config_parser.c --- src/config_parser.c.orig +++ src/config_parser.c -@@ -752,8 +752,8 @@ static char *migrate_config(char *input, off_t size) { +@@ -745,8 +745,8 @@ static char *migrate_config(char *input, off_t size) { */ void start_config_error_nagbar(const char *configpath, bool has_errors) { char *editaction, *pageraction;