From nobody Thu Feb 08 09:45:14 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TVsXp4MYGz59Nd3; Thu, 8 Feb 2024 09:45:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TVsXp3v8wz4ckh; Thu, 8 Feb 2024 09:45:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707385514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wl1TYGtLvyOkezLvJjTQJ1PezBZKqwhejuS5x23sIzA=; b=cqJoUqlq54AbXxeTtzIyrXfD2K/OV78WRL3cQvEBgh1mCtin6qobqvB94DY2QjS7Q+ZB1c LhyGmCLs5t7ebk8IWq7a2nDxRGMOr1WlcCPt43bBI2tUE6cFzcFFa5DHWRRtNIS3JLGCmw yP4vMRcJpRJRGDYxky52apMGv8uXvy64w6khxVNKjX9lqu80YkZA55UWoIF7IXS69eIMKO Bn+MXAGLyqiWvcGcwQDbKrXa6MkyvWs+7+Bcd2CgV7gc/6jCsrIoe9BNz+chF9GpEbUwmm A4q7yTFibqhwySh+uI835TMNkR/nADwzlWHOJqmXoNa3tXFxbesGK1iRmCPONw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707385514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wl1TYGtLvyOkezLvJjTQJ1PezBZKqwhejuS5x23sIzA=; b=cbtPEHUx0aZ5f6+Dx50CWd53KdFwtNVXham5qV1a2/5AES1i8/39tQ0LQ1Eph0GZE1nBla syUCC14111eQZ5cBvRZNGRSfwK5zPPOFAfYsKw5iNW9qmW+Pgji8gKDOUBntpu3XXLC8ef YSt3IAnZ1U89HNQwREYbi5np7pLOMcJhX74cKnHLJtJC0NJZ4leeYUf14lvgoyaAkodFBH OaRiWCWu9cIQJivvNbzy4okcEhn7Vl/1/zlQCeA+Z92gBQBkDv7qDf+FLskxYPkhY+VUqJ dVmny8v3KRrFQyzh/urSaBOGCYPX091wAhsOKglrQSFiwJoPqoJk9a6KLBkXHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707385514; a=rsa-sha256; cv=none; b=x+eIuhegZEuYoq+00UGe4PDozAM5zZsYeCFumkejj5rZQXpq7SnQWHHYR1WxlHdlyg4oxV PpB+bPQnBZyIuongEwqVCMnEfL6NU13QL/VEbLVgaE44x0EPLGhJ4165Ec/XDkMWAS9Uag +V27NITUb3mPztqNISdIuV7uHr4P/1uzoazRHJ8BiD9kTFqHOSVuAqpEqkB9775GLYio8m gcGCNEPbroN/lB9NV1yP8ktuuNmsuWm2i177Sw00mwUrpSQqnQiagk7riVFCY4XpiqKgjp 1ITS52VtAvX0q5TTHUHnx6D9j2itzQaN5pma3OUlvyoTAUNKWdyirEGukxSLJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TVsXp2xfjzlSm; Thu, 8 Feb 2024 09:45:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4189jEOk033798; Thu, 8 Feb 2024 09:45:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4189jECD033795; Thu, 8 Feb 2024 09:45:14 GMT (envelope-from git) Date: Thu, 8 Feb 2024 09:45:14 GMT Message-Id: <202402080945.4189jECD033795@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 21960d765a68 - main - x11/wofi: switch to upstream fix after a0c82b3c9391 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21960d765a68d70ab37aae231b14504a27704cfa Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=21960d765a68d70ab37aae231b14504a27704cfa commit 21960d765a68d70ab37aae231b14504a27704cfa Author: Jan Beich AuthorDate: 2024-02-08 09:11:34 +0000 Commit: Jan Beich 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); - }