kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

editors/emacs: Add upstream patch for check-declare-directory

Browse source 
Add following upstream patch for check-declare-directory.

----------------------------------------------------------------------
commit ed1a24b4b2e39498e4c4448365e1d5f0149e5fc6
Author:     Lars Ingebrigtsen <larsi@gnus.org>
AuthorDate: Wed May 11 14:18:27 2022 +0200
Commit:     Lars Ingebrigtsen <larsi@gnus.org>
CommitDate: Wed May 11 14:18:27 2022 +0200

    Don't signal errors in check-declare-directory

    * lisp/emacs-lisp/check-declare.el (check-declare-directory): Don't
    bug out if we don't find any files with declare-function:(bug#55354)
    because this is a predicate function, and that's inconvenient.
----------------------------------------------------------------------

This fixes build error with upcoming update of devel/git-modes to
1.4.1 as following.

----------------------------------------------------------------------
=======================<phase: build          >============================
===>  Building for git-modes-1.4.1,1
gmake[1]: Entering directory '/wrkdirs/usr/ports/devel/git-modes/work-full/git-modes-1.4.1'
Compiling git-modes.el
Compiling gitattributes-mode.el
Compiling gitconfig-mode.el
Compiling gitignore-mode.el
 Creating git-modes-autoloads.el
 Checking function declarations
Debugger entered--Lisp error: (error "find exited with status 1")
  signal(error ("find exited with status 1"))
  error("%s exited with status %s" "find" 1)
  process-lines-handling-status("find" nil "." "-name" "*.el" "-exec" "grep" "-l" "^[ \11]*(declare-function" "{}" "+")
  apply(process-lines-handling-status "find" nil ("." "-name" "*.el" "-exec" "grep" "-l" "^[ \11]*(declare-function" "{}" "+"))
  process-lines("find" "." "-name" "*.el" "-exec" "grep" "-l" "^[ \11]*(declare-function" "{}" "+")
  check-declare-directory("~/git-modes-1.4.1/")
  eval((check-declare-directory default-directory) t)
  command-line-1(("-L" "/usr/local/share/emacs/28.2/site-lisp/compat" "-L" "." "--eval" "(check-declare-directory default-directory)"))
  command-line()
  normal-top-level()

gmake[1]: *** [Makefile:37: check-declare] Error 255
gmake[1]: Leaving directory '/wrkdirs/usr/ports/devel/git-modes/work-full/git-modes-1.4.1'
*** Error code 1

Stop.
make: stopped in /usr/ports/devel/git-modes
----------------------------------------------------------------------

Reviewed by:	jrm
Differential Revision:	https://reviews.freebsd.org/D40079
This commit is contained in:
Yasuhiro Kimura 2023-05-12 15:53:17 +09:00
parent 45f3e5987d
commit 0ebb2e46f5
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editors/emacs/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= emacs
DISTVERSION= 28.2
PORTREVISION= 5
PORTREVISION= 6
PORTEPOCH= 3
CATEGORIES= editors
MASTER_SITES= GNU
@ -9,7 +9,8 @@ PATCH_SITES= https://github.com/emacs-mirror/emacs/commit/:github
PATCHFILES= d48bb4874bc6cd3e69c7a15fc3c91cc141025c51.patch:-p1:github \
01a4035c869b91c153af9a9132c87adb7669ea1c.patch:-p1:github \
9a3b08061feea14d6f37685ca1ab8801758bfd1c.patch:-p1:github \
1b4dc4691c1f87fc970fbe568b43869a15ad0d4c.patch:-p1:github
1b4dc4691c1f87fc970fbe568b43869a15ad0d4c.patch:-p1:github \
ed1a24b4b2e39498e4c4448365e1d5f0149e5fc6.patch:-p1:github
.if ${FLAVOR:U} == canna
PATCH_SITES+= https://www.gentei.org/~yuuji/software/emacs28canna/:canna

4
editors/emacs/distinfo
View file

@ -1,4 +1,4 @@
TIMESTAMP = 1677506792
TIMESTAMP = 1683873995
SHA256 (emacs-28.2.tar.xz) = ee21182233ef3232dc97b486af2d86e14042dbb65bbc535df562c3a858232488
SIZE (emacs-28.2.tar.xz) = 47722600
SHA256 (d48bb4874bc6cd3e69c7a15fc3c91cc141025c51.patch) = 6331f8676afa68a0f96b1461c1d75bbfb4f2d99177935f362ced0fef8b72e52d
@ -9,5 +9,7 @@ SHA256 (9a3b08061feea14d6f37685ca1ab8801758bfd1c.patch) = 37fba7d6e2ee9ed90b3203
SIZE (9a3b08061feea14d6f37685ca1ab8801758bfd1c.patch) = 1007
SHA256 (1b4dc4691c1f87fc970fbe568b43869a15ad0d4c.patch) = 9747b316708f07db7b2aecd874e0732169e0f2b3d7e43964b59fbed5207220da
SIZE (1b4dc4691c1f87fc970fbe568b43869a15ad0d4c.patch) = 987
SHA256 (ed1a24b4b2e39498e4c4448365e1d5f0149e5fc6.patch) = 0c0659fa405e4cab469754db86556f7374f00a126071e802f6dc883b9586b465
SIZE (ed1a24b4b2e39498e4c4448365e1d5f0149e5fc6.patch) = 1430
SHA256 (emacs28.1-canna-20220406b.diff.gz) = a57b7ca032229ce4d1eb2b2e59458db40e9ffc371a15e833699f3ce7caf05684
SIZE (emacs28.1-canna-20220406b.diff.gz) = 30564