Re: emacs-30.0.92 pretest

On Mon, 4 Nov 2024 12:48:39 +0100
Jeremie Courreges-Anglas <jca@wxcvbn.org> wrote:

>
> While I don't expect huge changes in emacs 30, here's a diff for you
> folks to test. The .txt and .jpg in the info/ dir look off, I suspect
> they won't end up in the final emacs-30 release build.
>
> kill-this-buffer isn't usable directly from keyboard bindings, I had
> to switch to kill-current-buffer instead in my local config.
>
> Feedback welcome.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/editors/emacs/Makefile,v
> diff -u -p -r1.121 Makefile
> --- Makefile 29 Oct 2024 09:46:25 -0000 1.121
> +++ Makefile 4 Nov 2024 11:32:07 -0000
> @@ -1,10 +1,7 @@
> COMMENT= GNU editor: extensible, customizable,
> self-documenting
> -# XXX 29.4 was released with a .texi file newer than emacs.info
> -# Zap post-extract when updating
> -VERSION= 29.4
> +VERSION= 30.0.92
> DISTNAME= emacs-${VERSION}
> -REVISION= 1
>
> CATEGORIES= editors
>
> @@ -15,10 +12,10 @@ MAINTAINER= Jeremie
> Courreges-Anglas <j # GPLv3+
> PERMIT_PACKAGE= Yes
>
> -WANTLIB += c curses execinfo gmp gnutls jansson m pthread sqlite3
> +WANTLIB += c curses execinfo gmp gnutls m pthread sqlite3
> WANTLIB += tree-sitter xml2 z
>
> -SITES= ${SITE_GNU:=emacs/}
> +SITES= https://alpha.gnu.org/gnu/emacs/pretest/
> EXTRACT_SUFX= .tar.xz
>
> DEBUG_PACKAGES = ${BUILD_PACKAGES}
> @@ -45,7 +42,6 @@ SUBST_VARS= GCCARCH VERSION
>
> USE_GMAKE= Yes
> LIB_DEPENDS= databases/sqlite3 \
> - devel/jansson \
> devel/gmp \
> security/gnutls \
> textproc/libxml \
> @@ -82,7 +78,7 @@ WANTLIB += ICE SM X11 X11-xcb Xaw3d Xcom
> WANTLIB += Xinerama Xmu Xpm Xrandr Xrender Xt cairo dbus-1 fontconfig
> WANTLIB += freetype gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0
> WANTLIB += harfbuzz intl jpeg lcms2 m17n-core m17n-flt otf png
> -WANTLIB += rsvg-2 tiff webpdecoder webpdemux xcb xcb-shape xcb-util
> +WANTLIB += rsvg-2 tiff webpdecoder webpdemux xcb xcb-shape
> . elif ${FLAVOR} == "gtk2"
> CONFIGURE_ARGS+= --with-x-toolkit=gtk2
> LIB_DEPENDS+= x11/gtk+2
> @@ -92,7 +88,7 @@ WANTLIB += dbus-1 fontconfig freetype gd
> WANTLIB += gif gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 harfbuzz
> WANTLIB += intl jpeg lcms2 m17n-core m17n-flt otf pango-1.0
> pangocairo-1.0 WANTLIB += pangoft2-1.0 png rsvg-2 tiff webpdecoder
> webpdemux -WANTLIB += xcb xcb-shape xcb-util
> +WANTLIB += xcb xcb-shape
> . elif ${FLAVOR} == "gtk3"
> CONFIGURE_ARGS+= --with-x-toolkit=gtk3
> LIB_DEPENDS+= x11/gtk+3
> @@ -101,14 +97,16 @@ WANTLIB += Xpm Xrandr Xrender atk-1.0 ca
> WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gif gio-2.0
> WANTLIB += glib-2.0 gobject-2.0 gtk-3 harfbuzz intl jpeg lcms2
> WANTLIB += m17n-core m17n-flt otf pango-1.0 pangocairo-1.0 png
> -WANTLIB += rsvg-2 tiff webpdecoder webpdemux xcb xcb-shape xcb-util
> +WANTLIB += rsvg-2 tiff webpdecoder webpdemux xcb xcb-shape
> . else
> ERRORS+= "Fatal: Conflicting flavor: ${FLAVOR}"
> . endif
> .endif
>
> post-extract:
> - touch ${WRKSRC}/info/emacs.info
> + # XXX workaround to avoid needlessly rebuild elisp.info
> + cp ${WRKSRC}/doc/lispref/elisp_type_hierarchy.*
> ${WRKBUILD}/info
> + touch ${WRKBUILD}/info/elisp.info
>
> post-install:
> chmod -t ${PREFIX}/bin/emacs-${VERSION}
> Index: distinfo
> ===================================================================
> RCS file: /home/cvs/ports/editors/emacs/distinfo,v
> diff -u -p -r1.21 distinfo
> --- distinfo 23 Jun 2024 12:55:50 -0000 1.21
> +++ distinfo 4 Nov 2024 11:21:25 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (emacs-29.4.tar.xz) =
> uol5RvlMNmAKfnuzUB0nqkES15G/4URcYe0oVQ2sojU= -SIZE
> (emacs-29.4.tar.xz) = 52210344 +SHA256 (emacs-30.0.92.tar.xz) =
> 2JKHvVqDgbtg4UqrlSAjdyYdQ6YNFdwKYdDWYrxWJr4= +SIZE
> (emacs-30.0.92.tar.xz) = 54813380 Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: /home/cvs/ports/editors/emacs/patches/patch-Makefile_in,v
> diff -u -p -r1.9 patch-Makefile_in
> --- patches/patch-Makefile_in 2 Aug 2023 11:12:25 -0000
> 1.9 +++ patches/patch-Makefile_in 4 Nov 2024 11:24:15 -0000
> @@ -3,7 +3,7 @@
> Index: Makefile.in
> --- Makefile.in.orig
> +++ Makefile.in
> -@@ -792,7 +792,7 @@ install-info: info
> +@@ -806,7 +806,7 @@ install-info: info
> for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9]
> 2>/dev/null`; do \ (cd "$${thisdir}"; \
> ${INSTALL_DATA} ${srcdir}/info/$$f
> "$(DESTDIR)${infodir}/$$f"); \ @@ -12,7 +12,7 @@ Index: Makefile.in
> rm -f "$(DESTDIR)${infodir}/$$f.gz"; \
> ${GZIP_PROG} -9n "$(DESTDIR)${infodir}/$$f"; \
> done; \
> -@@ -816,7 +816,7 @@ install-man:
> +@@ -831,7 +831,7 @@ install-man:
> dest=`echo "$${page}" | sed -e 's/\.1$$//' -e
> '$(TRANSFORM)'`.1; \ (cd "$${thisdir}"; \
> ${INSTALL_DATA} ${mansrcdir}/$${page}
> "$(DESTDIR)${man1dir}/$${dest}"); \ Index: patches/patch-lisp_files_el
> ===================================================================
> RCS file: /home/cvs/ports/editors/emacs/patches/patch-lisp_files_el,v
> diff -u -p -r1.10 patch-lisp_files_el
> --- patches/patch-lisp_files_el 24 Mar 2024 16:36:34
> -0000 1.10 +++ patches/patch-lisp_files_el 4 Nov 2024
> 11:24:15 -0000 @@ -3,7 +3,7 @@
> Index: lisp/files.el
> --- lisp/files.el.orig
> +++ lisp/files.el
> -@@ -3000,6 +3000,7 @@
> ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB +@@ -3091,6
> +3091,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB
> ("\\.\\(as\\|mi\\|sm\\)2\\'" . snmpv2-mode)
> ("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode)
> ("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MS-DOS Index:
> patches/patch-lisp_vc_vc_el
> ===================================================================
> RCS file: /home/cvs/ports/editors/emacs/patches/patch-lisp_vc_vc_el,v
> diff -u -p -r1.10 patch-lisp_vc_vc_el ---
> patches/patch-lisp_vc_vc_el 24 Mar 2024 16:36:34 -0000
> 1.10 +++ patches/patch-lisp_vc_vc_el 4 Nov 2024 11:24:15 -0000
> @@ -3,7 +3,7 @@ Drop messages that slow down VC with big Index:
> lisp/vc/vc.el --- lisp/vc/vc.el.orig
> +++ lisp/vc/vc.el
> -@@ -3721,13 +3721,11 @@ It returns the last revision that changed
> LINE number +@@ -3849,13 +3849,11 @@ It returns the last revision
> that changed LINE number (defun vc-file-tree-walk (dirname func &rest
> args) "Walk recursively through DIRNAME.
> Invoke FUNC f ARGS on each VC-managed file f underneath it."
> Index: patches/patch-src_emacs_c
> ===================================================================
> RCS file: /home/cvs/ports/editors/emacs/patches/patch-src_emacs_c,v
> diff -u -p -r1.6 patch-src_emacs_c
> --- patches/patch-src_emacs_c 20 Jan 2024 22:43:39
> -0000 1.6 +++ patches/patch-src_emacs_c 4 Nov 2024
> 11:21:25 -0000 @@ -1,37 +0,0 @@
> -Don't use printf %n.
> -
> -Index: src/emacs.c
> ---- src/emacs.c.orig
> -+++ src/emacs.c
> -@@ -2950,25 +2950,17 @@ shut_down_emacs (int sig, Lisp_Object stuff)
> - reset_all_sys_modes ();
> - if (sig && sig != SIGTERM)
> - {
> -- static char const fmt[] = "Fatal error %d: %n%s\n";
> -+ static char const fmt[] = "Fatal error %d: ";
> - #ifdef HAVE_HAIKU
> - if (haiku_debug_on_fatal_error)
> - debugger ("Fatal error in Emacs");
> -