Date: Thu, 8 Feb 2024 09:45:14 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 21960d765a68 - main - x11/wofi: switch to upstream fix after a0c82b3c9391 Message-ID: <202402080945.4189jECD033795@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=21960d765a68d70ab37aae231b14504a27704cfa commit 21960d765a68d70ab37aae231b14504a27704cfa Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-02-08 09:11:34 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-02-08 09:43:41 +0000 x11/wofi: switch to upstream fix after a0c82b3c9391 Restores exit code 1 (EXIT_FAILURE) on errors. --- x11/wofi/Makefile | 4 ++++ x11/wofi/distinfo | 2 ++ x11/wofi/files/patch-src_wofi.c | 26 -------------------------- 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/x11/wofi/Makefile b/x11/wofi/Makefile index b927b48e99cc..aa745c58f2a9 100644 --- a/x11/wofi/Makefile +++ b/x11/wofi/Makefile @@ -1,9 +1,13 @@ PORTNAME= wofi DISTVERSIONPREFIX= v DISTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= x11 wayland MASTER_SITES= https://hg.sr.ht/~scoopta/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ +PATCH_SITES= https://hg.sr.ht/~scoopta/${PORTNAME}/rev/ +PATCHFILES+= c9c57aa327ba.patch:-p1 # https://todo.sr.ht/~scoopta/wofi/211 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Launcher/menu program for wlroots-based compositors WWW= https://hg.sr.ht/~scoopta/wofi diff --git a/x11/wofi/distinfo b/x11/wofi/distinfo index a24ed01fc62e..1665f2e69629 100644 --- a/x11/wofi/distinfo +++ b/x11/wofi/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1707089181 SHA256 (wofi-v1.4.tar.gz) = 0c1190164ed80fbaae747d74a2a3c980e9f92d12f594c961596a7025822112d6 SIZE (wofi-v1.4.tar.gz) = 79100 +SHA256 (c9c57aa327ba.patch) = 9003c7a4a8367345c6927805484ba08a2f8d9e2f38ac74b5fec4fc3e320c6afc +SIZE (c9c57aa327ba.patch) = 7862 diff --git a/x11/wofi/files/patch-src_wofi.c b/x11/wofi/files/patch-src_wofi.c deleted file mode 100644 index 36db8292717e..000000000000 --- a/x11/wofi/files/patch-src_wofi.c +++ /dev/null @@ -1,26 +0,0 @@ -https://todo.sr.ht/~scoopta/wofi/211 - ---- src/wofi.c.orig 2024-02-04 23:26:21 UTC -+++ src/wofi.c -@@ -1299,13 +1299,10 @@ static void do_copy(void) { - } - } - --static void on_exit_set_custom_key_return_code(int status, void* data) { -- _UNUSED(data); -- if (status == EXIT_SUCCESS) { -+static void atexit_set_custom_key_return_code(void) { - fflush(stdout); - fflush(stderr); - _exit(custom_key_return_code); -- } - } - - static void do_custom_key(int custom_key_num) { -@@ -2064,5 +2061,5 @@ void wofi_init(struct map* _config) { - gtk_window_set_title(GTK_WINDOW(window), prompt); - gtk_widget_show_all(window); - -- on_exit(on_exit_set_custom_key_return_code, NULL); -+ atexit(atexit_set_custom_key_return_code); - }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402080945.4189jECD033795>