Hi,
On Sat, 03 Apr 2021 21:26:36 +0200
Jeremie Courreges-Anglas <[email protected]> wrote:
> Update to emacs-27.2, a bugfix only release, except maybe for an update
> of Org Mode. The fix for GTK+3 from yazuoka@ has been merged.
I tested -gtk3 flavor. It works fine.
The bug seem to be fixed on the version.
> Since emacs-27 doesn't play linking games any more, closs-platform
> tests are less relevant (but still welcome). And since release is
> approaching I'd prefer to get confirmations that it doesn't break your
> setup.
>
> oks welcome too.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/editors/emacs/Makefile,v
> retrieving revision 1.97
> diff -u -p -r1.97 Makefile
> --- Makefile 28 Feb 2021 10:47:09 -0000 1.97
> +++ Makefile 3 Apr 2021 17:00:32 -0000
> @@ -2,8 +2,7 @@
>
> COMMENT= GNU editor: extensible, customizable, self-documenting
>
> -VERSION= 27.1
> -REVISION= 0
> +VERSION= 27.2
> DISTNAME= emacs-${VERSION}
>
> CATEGORIES= editors
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/editors/emacs/distinfo,v
> retrieving revision 1.14
> diff -u -p -r1.14 distinfo
> --- distinfo 23 Aug 2020 09:55:00 -0000 1.14
> +++ distinfo 3 Apr 2021 17:00:32 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (emacs-27.1.tar.xz) = SkwSj5FfyTfWHt/Cc8mBBnEbVAyb481dLiubWy8XLkE=
> -SIZE (emacs-27.1.tar.xz) = 43752012
> +SHA256 (emacs-27.2.tar.xz) = tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk=
> +SIZE (emacs-27.2.tar.xz) = 44624480
> Index: patches/patch-src_gtkutil_c
> ===================================================================
> RCS file: patches/patch-src_gtkutil_c
> diff -N patches/patch-src_gtkutil_c
> --- patches/patch-src_gtkutil_c 28 Feb 2021 10:47:09 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,51 +0,0 @@
> -$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);
> - }
> -
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/editors/emacs/pkg/PLIST,v
> retrieving revision 1.25
> diff -u -p -r1.25 PLIST
> --- pkg/PLIST 23 Aug 2020 09:55:01 -0000 1.25
> +++ pkg/PLIST 3 Apr 2021 17:00:32 -0000
> @@ -1026,6 +1026,7 @@ share/emacs/${VERSION}/etc/tutorials/TUT
> share/emacs/${VERSION}/etc/tutorials/TUTORIAL.th
> share/emacs/${VERSION}/etc/tutorials/TUTORIAL.translators
> share/emacs/${VERSION}/etc/tutorials/TUTORIAL.zh
> +share/emacs/${VERSION}/etc/w32-feature.el
> share/emacs/${VERSION}/etc/yow.lines
> share/emacs/${VERSION}/lisp/
> share/emacs/${VERSION}/lisp/COPYING
> @@ -3346,6 +3347,8 @@ share/emacs/${VERSION}/lisp/org/org-plot
> share/emacs/${VERSION}/lisp/org/org-plot.elc
> share/emacs/${VERSION}/lisp/org/org-protocol.el.gz
> share/emacs/${VERSION}/lisp/org/org-protocol.elc
> +share/emacs/${VERSION}/lisp/org/org-refile.el.gz
> +share/emacs/${VERSION}/lisp/org/org-refile.elc
> share/emacs/${VERSION}/lisp/org/org-src.el.gz
> share/emacs/${VERSION}/lisp/org/org-src.elc
> share/emacs/${VERSION}/lisp/org/org-table.el.gz
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
>
