git: c112b84fd807 - main - Revert "x11/fvwm3: Fix FvwmIconMan module segfault"
Date: Tue, 19 Jul 2022 13:34:43 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c112b84fd8076a19f30f0705a3c139ef360b101e
commit c112b84fd8076a19f30f0705a3c139ef360b101e
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2022-07-19 13:31:06 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2022-07-19 13:34:06 +0000
Revert "x11/fvwm3: Fix FvwmIconMan module segfault"
The maintainer misunderstood the meaning of the maintainer-feedback
flag in bugzilla.
PR: 265291
This reverts commit 1d7c23d087f79fa348a421cc4129e613f7086402.
---
x11-wm/fvwm3/Makefile | 2 +-
x11-wm/fvwm3/files/patch-modules_FvwmIconMan_x.c | 10 ----------
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/x11-wm/fvwm3/Makefile b/x11-wm/fvwm3/Makefile
index b2a4d67fa8a4..16e2670011db 100644
--- a/x11-wm/fvwm3/Makefile
+++ b/x11-wm/fvwm3/Makefile
@@ -2,7 +2,7 @@
PORTNAME= fvwm3
PORTVERSION= 1.0.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-wm
MASTER_SITES= https://github.com/fvwmorg/fvwm3/releases/download/${PORTVERSION}/ \
http://fvwm.sourceforge.net/generated/icon_download/:icons
diff --git a/x11-wm/fvwm3/files/patch-modules_FvwmIconMan_x.c b/x11-wm/fvwm3/files/patch-modules_FvwmIconMan_x.c
deleted file mode 100644
index a525fb032feb..000000000000
--- a/x11-wm/fvwm3/files/patch-modules_FvwmIconMan_x.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/FvwmIconMan/x.c.orig 2022-07-18 23:18:50 UTC
-+++ modules/FvwmIconMan/x.c
-@@ -742,6 +742,7 @@ void X_init_manager (int man_id)
- char *scr;
- fscreen_scr_arg arg;
- arg.mouse_ev = NULL;
-+ arg.name = NULL;
-
- geometry_mask = FScreenParseGeometryWithScreen(
- man->geometry_str, &man->geometry.x, &man->geometry.y,