cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a patch from upsgream which avoids crashes in Mew due to corrupted

Browse Source 
tool-bar label.

ok jca
This commit is contained in:
yasuoka 2021-02-28 10:47:09 +00:00
parent 879f5dd591
commit 5606d0a45b
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editors/emacs/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.96 2020/08/23 09:55:00 jca Exp $
# $OpenBSD: Makefile,v 1.97 2021/02/28 10:47:09 yasuoka Exp $
COMMENT= GNU editor: extensible, customizable, self-documenting
VERSION= 27.1
REVISION= 0
DISTNAME= emacs-${VERSION}
CATEGORIES= editors

51
editors/emacs/patches/patch-src_gtkutil_c Normal file
View File

@ -0,0 +1,51 @@
$OpenBSD: patch-src_gtkutil_c,v 1.1 2021/02/28 10:47:09 yasuoka Exp $
Avoid crashes in Mew due to corrupted tool-bar label
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=46791
Index: src/gtkutil.c
--- src/gtkutil.c.orig
+++ src/gtkutil.c
@@ -5019,11 +5019,10 @@ update_frame_tool_bar (struct frame *f)
GtkWidget *wbutton = NULL;
Lisp_Object specified_file;
bool vert_only = ! NILP (PROP (TOOL_BAR_ITEM_VERT_ONLY));
- const char *label
- = (EQ (style, Qimage) || (vert_only && horiz)) ? NULL
- : STRINGP (PROP (TOOL_BAR_ITEM_LABEL))
- ? SSDATA (PROP (TOOL_BAR_ITEM_LABEL))
- : "";
+ Lisp_Object label
+ = (EQ (style, Qimage) || (vert_only && horiz))
+ ? Qnil
+ : PROP (TOOL_BAR_ITEM_LABEL);
ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), j);
@@ -5136,8 +5135,11 @@ update_frame_tool_bar (struct frame *f)
/* If there is an existing widget, check if it's stale; if so,
remove it and make a new tool item from scratch. */
- if (ti && xg_tool_item_stale_p (wbutton, stock_name, icon_name,
- img, label, horiz))
+ if (ti && xg_tool_item_stale_p (wbutton, stock_name, icon_name, img,
+ NILP (label)
+ ? NULL
+ : STRINGP (label) ? SSDATA (label) : "",
+ horiz))
{
gtk_container_remove (GTK_CONTAINER (wtoolbar),
GTK_WIDGET (ti));
@@ -5194,7 +5196,11 @@ update_frame_tool_bar (struct frame *f)
#else
if (w) gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin);
#endif
- ti = xg_make_tool_item (f, w, &wbutton, label, i, horiz, text_image);
+ ti = xg_make_tool_item (f, w, &wbutton,
+ NILP (label)
+ ? NULL
+ : STRINGP (label) ? SSDATA (label) : "",
+ i, horiz, text_image);
gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, j);
}