editors/emacs-devel: Update to 2023-08-20 snapshot

[yasu]

Summary

Change the way to modify lisp/loadup.el.

In this file there are codes that retrieve branch name and commit hash
from source tree. And they implicitly assume that git is installed in
build environment and source tree is retrieved from upstream git
repository by using it. But we use 'USE_GITHUB=yes' to get source tree
and git isn't installed in build environment. So we need to modify the
file so branch name and commit hash is properly assigned.

Previously we simply use REINPLACE_CMD and regular expression to
modify it. But recently the codes that need to be modified are changed
so they expand to multiple lines. And this makes it difficult to
achieve proper modification with single step.

So change the way to modify lisp/loadup.el so it is achieved with
following 2 steps.

1. Apply patch that makes following changes.
   • Assign branch name to 'master'
   • Assing commit hash to '%%GH_TAGNAME%%'
2. Replace each occurrence of '%%GH_TAGNAME%%' in the file with the value of ${GH_TAGNAME} by using REINPLACE_CMD

Changes: https://github.com/emacs-mirror/emacs/compare/18e7bc8...fd1479a

Test Plan

Build of both flavors succeeds with poudriere and 13.2-RELEASE amd64 jail.

[jrm]

Thanks for taking on another update and sorry I missed my turn. I'll get the next one on 2023-09-01.

editors/emacs-devel/files/patch-lisp_loadup.el

1–26 ↗

(On Diff #126261)

Rather than add a new patch, could we just update the ${REINPLACE_CMD} to

	@${REINPLACE_CMD} \
	  -e 's/(ignore-errors (emacs-repository-get-version))/"${GH_TAGNAME}"/' \
	  -e 's/(ignore-errors (emacs-repository-get-branch))/"master"/' \
	  ${WRKSRC}/lisp/loadup.el

[ashish]

Thank you!

editors/emacs-devel/files/patch-lisp_loadup.el

1–26 ↗

(On Diff #126261)

+1

OR even:

's/(emacs-repository-get-version)/"${GH_TAGNAME}"/g' -e 's/(emacs-repository-get-branch)/"master"/g' works too.

i.e. (ignore-errors "foo") => "foo"

[ashish]

Sorry, I just meant to comment, but ended up toggling status to require changes before committing, as I didn't realize I could just comment without touching the state of review.

[yasu]

Go backup to previous way to modify lisp/loadup.el and update regular expressions.

[jrm]

[ashish]

Looks good to me too.

Thank you!