From nobody Fri Jul 28 10:44:39 2023 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 4RC45M54Jcz4pxxB; Fri, 28 Jul 2023 10:44:39 +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 4RC45M4LmQz3CZt; Fri, 28 Jul 2023 10:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690541079; 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=di4GMqay+JdxFAxQhs/46m0OZGb8IbNL/eRw2q7X5W8=; b=QcewVEj6wzNaaAAvnVxhyQ0DNbADWGUDPR63qbGV/2tjAioCz1LcD51pRF8S0Z4/OT8Uw1 peWkDnedjQRFWPHYnGasE5Bcux0mLyXLVaFqETbX+6d0LiQtHzaAuPIkd3eKB39SFGPLQv ErgjpU/VG+nZfJ3xbx0PEu8ZGUSn3aSXHgXxHO8HibL79Mcl8MJqVJiOdjhyc24DtFc1x1 ZyxYlOYyLeNu8k2CR/bQ2H8e1G/rw0OweHcAZDDhW+wRplEQMQz41IcvCFpOQyw+X16bGf b6EhIP0qV567M7/dIxLh26nNPkQmt+06Mbh0hlE8STkdjYDUg2rf6KXhyYIrcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690541079; 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=di4GMqay+JdxFAxQhs/46m0OZGb8IbNL/eRw2q7X5W8=; b=mglcSYifwO4tO9qw9FL9G4ZLhQqMuvS/VlDA+Y00bf7xXg6w+AvWk/TfzMeVpvzJuWgTZX uQSz3vnmrAo6WOT+w3ALr+YRQq6ggJGuZ6YlyTyTj9jKhB86pgegri4Fvpw1D6kOrtYExk CacgLXlP+jgntL1o2fvM/yT0V9JANTZ1DgC22BJKhnX/H08RAuNWkx2sWPSaZ0KiU/cg1l Z+Sr2bSt6WBVs/f9UlWHuj/TyKOmnSmvT/BypeZmK/8/lgj694XSBNaCF1e3iLPGqcUbeY IUQXJE5rujQewbq6EGImMdaiGweLdCtZXqq2/UUSV0LvXlZGPuFpiSb+WxU+Zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690541079; a=rsa-sha256; cv=none; b=gq5MSX4SNahe9ZFZNW6RK8jkkzOSouoAIH0PGP4zImXAsnJSFKbjmZ/QYa0XpBCxJiZD8A oT5aA6G3dhGORukp6DOKxat1M63TBseqiUSxbLurXq5ZA/EU9riq3xOWgv+F9SBaj8poyJ 0+J9b85+ehdxyIBVSH0INqihQ5nQTqCAEYIy0MJQ/hCcgQmmEwwuhWnwfIchd/PlCpxvkp fa1HIaUcV6XeaFzgGyKddH+fKUQMj7bAlRSc2vA6l1Ke9Bch3kYX+ISn4ZjGQe2ld7+BY6 Ziz8qwgs6DZL6tQplYlWYJUbnyj0ftd8s3Ru7vEyuv1AHXdrcLZ56fgRWnTeew== 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 4RC45M2vxhznxG; Fri, 28 Jul 2023 10:44:39 +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 36SAid09028523; Fri, 28 Jul 2023 10:44:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36SAidim028522; Fri, 28 Jul 2023 10:44:39 GMT (envelope-from git) Date: Fri, 28 Jul 2023 10:44:39 GMT Message-Id: <202307281044.36SAidim028522@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 3e35051e913e - main - x11-wm/fvwm3: Fix "garbage" trailing window titles 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: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e35051e913e46e0132df070d5a718d443bfd0b8 Auto-Submitted: auto-generated The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e35051e913e46e0132df070d5a718d443bfd0b8 commit 3e35051e913e46e0132df070d5a718d443bfd0b8 Author: Felix Palmen AuthorDate: 2023-07-28 10:28:10 +0000 Commit: Felix Palmen CommitDate: 2023-07-28 10:43:53 +0000 x11-wm/fvwm3: Fix "garbage" trailing window titles Upstream issue: https://github.com/fvwmorg/fvwm3/issues/873 Add a local patch reverting the problematic commit for now. --- x11-wm/fvwm3/Makefile | 1 + x11-wm/fvwm3/files/patch-fvwm_ewmh__names.c | 132 ++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) diff --git a/x11-wm/fvwm3/Makefile b/x11-wm/fvwm3/Makefile index 34a1922f6977..accd089a2535 100644 --- a/x11-wm/fvwm3/Makefile +++ b/x11-wm/fvwm3/Makefile @@ -1,5 +1,6 @@ PORTNAME= fvwm3 DISTVERSION= 1.0.7 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= https://github.com/fvwmorg/fvwm3/releases/download/${DISTVERSION}/ \ http://fvwm.sourceforge.net/generated/icon_download/:icons diff --git a/x11-wm/fvwm3/files/patch-fvwm_ewmh__names.c b/x11-wm/fvwm3/files/patch-fvwm_ewmh__names.c new file mode 100644 index 000000000000..8d80396b058e --- /dev/null +++ b/x11-wm/fvwm3/files/patch-fvwm_ewmh__names.c @@ -0,0 +1,132 @@ +Revert b7ae07c34bb9172b8aba964023c2febc178f7f97, see +https://github.com/fvwmorg/fvwm3/issues/873 + +--- fvwm/ewmh_names.c.orig 2023-07-06 21:03:44 UTC ++++ fvwm/ewmh_names.c +@@ -125,14 +125,15 @@ int EWMH_WMIconName( + { + int size = 0; + char *val; +- char *text; ++ char *tmp_str; ++ FlocaleCharset *fc = NULL; + + if (!FiconvSupport) + { + return 0; + } + +- text = val = ewmh_AtomGetByName( ++ val = ewmh_AtomGetByName( + FW_W(fw), "_NET_WM_ICON_NAME", + EWMH_ATOM_LIST_PROPERTY_NOTIFY, &size); + +@@ -141,25 +142,28 @@ int EWMH_WMIconName( + SET_HAS_EWMH_WM_ICON_NAME(fw,0); + return 0; + } +- if (IS_ICON_FONT_LOADED(fw) && fw->icon_font != NULL && fw->icon_font->fftf.fftfont[0] == NULL) ++ if (IS_ICON_FONT_LOADED(fw) && fw->icon_font != NULL) + { +- text = FiconvUtf8ToCharset(dpy, fw->icon_font->str_fc, val, size); +- free(val); ++ fc = fw->icon_font->str_fc; + } +- if (text == NULL) ++ ++ tmp_str = (char *)FiconvUtf8ToCharset( ++ dpy, fc, (const char *) val, size); ++ free(val); ++ if (tmp_str == NULL) + { + SET_HAS_EWMH_WM_ICON_NAME(fw, 0); + return 0; + } +- if (strlen(text) > MAX_ICON_NAME_LEN) ++ if (strlen(tmp_str) > MAX_ICON_NAME_LEN) + { +- text[MAX_ICON_NAME_LEN] = 0; ++ tmp_str[MAX_ICON_NAME_LEN] = 0; + } + SET_HAS_EWMH_WM_ICON_NAME(fw, 1); +- if (fw->icon_name.name && strcmp(text, fw->icon_name.name) == 0) ++ if (fw->icon_name.name && strcmp(tmp_str, fw->icon_name.name) == 0) + { + /* migo: some apps update their names every second */ +- free(text); ++ free(tmp_str); + return 0; + } + +@@ -169,7 +173,7 @@ int EWMH_WMIconName( + free_window_names(fw, False, True); + } + +- fw->icon_name.name = text; ++ fw->icon_name.name = tmp_str; + + SET_WAS_ICON_NAME_PROVIDED(fw, 1); + +@@ -189,13 +193,14 @@ int EWMH_WMName( + { + int size = 0; + char *val; +- char *text; ++ char *tmp_str; ++ FlocaleCharset *fc = NULL; + int what_changed; + + if (!FiconvSupport) + return 0; + +- text = val = ewmh_AtomGetByName( ++ val = ewmh_AtomGetByName( + FW_W(fw), "_NET_WM_NAME", + EWMH_ATOM_LIST_PROPERTY_NOTIFY, &size); + +@@ -204,25 +209,28 @@ int EWMH_WMName( + SET_HAS_EWMH_WM_NAME(fw,0); + return 0; + } +- if (IS_WINDOW_FONT_LOADED(fw) && fw->title_font != NULL && fw->title_font->fftf.fftfont[0] == NULL) ++ if (IS_WINDOW_FONT_LOADED(fw) && fw->title_font != NULL) + { +- text = FiconvUtf8ToCharset(dpy, fw->title_font->str_fc, val, size); +- free(val); ++ fc = fw->title_font->str_fc; + } +- if (text == NULL) ++ ++ tmp_str = (char *)FiconvUtf8ToCharset( ++ dpy, fc, (const char *) val, size); ++ free(val); ++ if (tmp_str == NULL) + { + SET_HAS_EWMH_WM_NAME(fw,0); + return 0; + } +- if (strlen(text) > MAX_WINDOW_NAME_LEN) ++ if (strlen(tmp_str) > MAX_WINDOW_NAME_LEN) + { +- text[MAX_WINDOW_NAME_LEN] = 0; ++ tmp_str[MAX_WINDOW_NAME_LEN] = 0; + } + SET_HAS_EWMH_WM_NAME(fw, 1); +- if (fw->name.name && strcmp(text, fw->name.name) == 0) ++ if (fw->name.name && strcmp(tmp_str, fw->name.name) == 0) + { + /* migo: some apps update their names every second */ +- free(text); ++ free(tmp_str); + return 0; + } + +@@ -232,7 +240,7 @@ int EWMH_WMName( + free_window_names(fw, True, False); + } + +- fw->name.name = text; ++ fw->name.name = tmp_str; + + if (ev == NULL) + {