From nobody Tue Jul 19 13:34:43 2022 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 4LnKZC42tTz4XKfs; Tue, 19 Jul 2022 13:34:43 +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 4LnKZC3c5Yz3T8R; Tue, 19 Jul 2022 13:34:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658237683; 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=rKk92bdjvhYZISkb1OggwjH0KxhnRE5rzVacPZFMZWI=; b=Zo9BiiUoVR99IR2myBv5/bJ/KUfLjG/p0qNB59atTP3N6YPJmzoNOw5CtfT/xsHSMRSQeF 2s4I7fT93zG3/oo23lAFKjuU5mp5C2N81CnyqbBkY/V/HiBIxYFNvDsDNVPCd31wmlMORE 74oSXbMhlgjdei9iRJKBF3K8syowOzQv5NoJOYIhKLlfSNLXAkkvA5838nE2/1ElOye53G nTMQP4oa7WNpU/82UApVtJgyXFVYgGgNoEP2k9O8kYzb3wqD0aY+D/blUyuR9dFeeWwS3S Y1rJkszU86p33JROvRQvuXKOST74aP34htWVcHHq6aNDxqKF4m4kru7kOIYWng== 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 4LnKZC2XS9zLG9; Tue, 19 Jul 2022 13:34:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26JDYhZ5010501; Tue, 19 Jul 2022 13:34:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26JDYhAw010500; Tue, 19 Jul 2022 13:34:43 GMT (envelope-from git) Date: Tue, 19 Jul 2022 13:34:43 GMT Message-Id: <202207191334.26JDYhAw010500@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: c112b84fd807 - main - Revert "x11/fvwm3: Fix FvwmIconMan module segfault" 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c112b84fd8076a19f30f0705a3c139ef360b101e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658237683; 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=rKk92bdjvhYZISkb1OggwjH0KxhnRE5rzVacPZFMZWI=; b=fmBndYBrpW3H0q+wl9UsAFoHOb9zW6caWz9nqK50Yqf2cVqBwY52xpFUV4jDo2qajrF9c4 EhOlsEW910L9z4Sao3V1AcGIb+FUnCvCqfpHdVz4c3TB14yMPChVMKWk5CIn5Ll4f6j6I3 t42cx1ZbknIvIZ2+CJY4gQzrhqEUdsT5tLGe1+iQ6MLzlJp5jwGF/Kul9j0WMiHY9xoMsD PQMo5t0ZvFlIFtpZl2jywFUvc5DA+ZRPuHB07yEBCWcSDNmDiVKIRKxgFUfX7dAfbKEb46 E+kT1WAisbdeDk58dbrgTwZBbdYFyTP1yE4XTW2UvWd49g0wGQSoSiTyQTWcmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658237683; a=rsa-sha256; cv=none; b=UWD457H70p3i3SOkIcHn7yQB8E5QZhtuHn73g0fRlRdIm/tWp8PwomxKbvxeFPIInQ6QqH AuN9+6gTqMJ3pC3lCIJRzuucfrt7i06DwXuEl3dGRESSJoNiXPsoXYfdHjp/uM983yRo0z 2mcd9gKzqf1mZlZbN+lsGsF4Fs+gQniuX/DDVUcqcIuKxeULXolGcxR/oD8zpBmhCGhADc tLiiGSQje/aBrPZGfwPGSDFTZGwFd8zbBUmat/DBylYv3vV6om46xK1bpE/0nkLKlGxFem 9gVQ5enHhrADAPXUCrxk1UZ9y6dtf/nbsM1HypJoX6luCE9vhvY9NglH0oq8ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c112b84fd8076a19f30f0705a3c139ef360b101e commit c112b84fd8076a19f30f0705a3c139ef360b101e Author: Cy Schubert AuthorDate: 2022-07-19 13:31:06 +0000 Commit: Cy Schubert 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,