Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 27 Mar 2024 06:55:38 GMT
From:      Yasuhiro Kimura <yasu@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: f8785263c268 - main - editors/tamago: Fix build of devel_full and devel_nox flavors
Message-ID:  <202403270655.42R6tcOe041857@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f8785263c268c1e02f2f04ea24379c9c5c643027

commit f8785263c268c1e02f2f04ea24379c9c5c643027
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2024-03-09 00:43:10 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2024-03-27 06:55:15 +0000

    editors/tamago: Fix build of devel_full and devel_nox flavors
    
    After editors/emacs-devel is updated to 30.0.50.20240301,3, build of
    devel_full and devel_nox flavors fails as following.
    
    ----------------------------------------------------------------------
    if test "/usr/local/bin/emacs-30.0.50" != "no"; then  am__dir=. am__subdir_includes='';  case canna.elc in */*)  am__dir=`echo 'canna.elc' | sed 's,/[^/]*$,,'`;  am__subdir_includes="-L $am__dir -L ./$am__dir";  esac;  test -d "$am__dir" || /bin/mkdir -p "$am__dir" || exit 1;  /usr/local/bin/emacs-30.0.50 --batch  -q -no-site-file -no-init-file  --eval="(setq load-path (append (list (expand-file-name \"..\")) load-path))"  --eval="(load \"docomp.el\")"   $am__subdir_includes -L . -L .  --eval "(defun byte-compile-dest-file (f) \"/tmp/canna.elc\")"  --eval "(unless (byte-compile-file \"canna.el\") (kill-emacs 1))";  if [ -f "/tmp/canna.elc" ]; then  cp /tmp/canna.elc canna.elc && rm -f /tmp/canna.elc;  fi;  else :; fi
    Loading /usr0/freebsd/ports/work/usr/ports/editors/tamago/work-devel_nox/tamago-4.0.6.0.20041122.19.15/docomp.el (source)...
    Package cl is deprecated
    
    In toplevel form:
    canna.el:1:1: Warning: file has no `lexical-binding' directive on its first line
    canna.el:33:11: Error: Wrong type argument: obarrayp, [nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil]
    *** Error code 1
    ----------------------------------------------------------------------
    
    So add patch to fix it.
    
    PR:             277496
    Approved by:    maintainer timeout
---
 editors/tamago/files/patch-its.el | 55 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/editors/tamago/files/patch-its.el b/editors/tamago/files/patch-its.el
new file mode 100644
index 000000000000..ec218c8da9f2
--- /dev/null
+++ b/editors/tamago/files/patch-its.el
@@ -0,0 +1,55 @@
+From cb3938b8783f068660a63d95ca8afb4da09f2259 Mon Sep 17 00:00:00 2001
+From: Yasuhiro Kimura <yasu@utahime.org>
+Date: Sat, 9 Mar 2024 09:34:15 +0900
+Subject: [PATCH] Fix build and runtime error with recent master branch of
+ Emacs git repository
+
+---
+ its.el | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git its.el its.el
+index a785694..8f4de21 100644
+--- its.el
++++ its.el
+@@ -695,7 +695,7 @@ This variable override `its-delete-by-keystroke'."
+ 
+ (defun its-map-compaction (map)
+   (if its-compaction-enable
+-      (let ((its-compaction-hash-table (make-vector 1000 nil))
++      (let ((its-compaction-hash-table (obarray-make 1000))
+ 	    (its-compaction-integer-table (make-vector 138 nil))
+ 	    (its-compaction-counter-1 1)
+ 	    (its-compaction-counter-2 0)
+@@ -1357,8 +1357,8 @@ Return last state."
+   (interactive)
+   (its-convert (lambda (str lang) (japanese-katakana str))))
+ 
+-(defconst its-full-half-table (make-vector 100 nil))
+-(defconst its-half-full-table (make-vector 100 nil))
++(defconst its-full-half-table (obarray-make 100))
++(defconst its-half-full-table (obarray-make 100))
+ 
+ (let ((table '((Japanese
+ 		(?$B!!(B . ?\ ) (?$B!$(B . ?,)  (?$B!%(B . ?.)  (?$B!"(B . ?,)  (?$B!#(B . ?.)
+@@ -1468,7 +1468,6 @@ Return last state."
+ 		(?$(C#p(B . ?p)  (?$(C#q(B . ?q)  (?$(C#r(B . ?r)  (?$(C#s(B . ?s)  (?$(C#t(B . ?t)
+ 		(?$(C#u(B . ?u)  (?$(C#v(B . ?v)  (?$(C#w(B . ?w)  (?$(C#x(B . ?x)  (?$(C#y(B . ?y)
+ 		(?$(C#z(B . ?z))))
+-      (hash (make-vector 100 nil))
+       lang pair)
+   (while table
+     (setq lang (caar table)
+@@ -1480,8 +1479,7 @@ Return last state."
+       (set (intern (concat (symbol-name lang) (char-to-string (cdar pair)))
+ 		   its-half-full-table)
+ 	   (caar pair))
+-      (setq pair (cdr pair)))
+-    hash))
++      (setq pair (cdr pair)))))
+ 
+ ;;; its-half-width : half-width-region for input-buffer
+ (defun its-half-width ()
+-- 
+2.44.0
+



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403270655.42R6tcOe041857>