Attachment 249043 Details for Bug 277496 – Patch file

[patch] Patch file

editors_tamago.patch (text/plain), 4.66 KB, created by Yasuhiro Kimura on 2024-03-09 02:44:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2024-03-09 02:44:57 UTC

Size: 4.66 KB

patch

obsolete

>From 6e7d89199835a4c3c375519fee74bbe6b78471f4 Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Sat, 9 Mar 2024 09:43:10 +0900
>Subject: [PATCH] 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
>---
> editors/tamago/Makefile           |  2 +-
> editors/tamago/files/patch-its.el | 55 +++++++++++++++++++++++++++++++
> 2 files changed, 56 insertions(+), 1 deletion(-)
> create mode 100644 editors/tamago/files/patch-its.el
>
>diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
>index 541de024937c..c8d2d25f175b 100644
>--- a/editors/tamago/Makefile
>+++ b/editors/tamago/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	tamago
> PORTVERSION=	4.0.6.0.20041122.19.15
>-PORTREVISION=	6
>+PORTREVISION=	7
> DISTVERSIONPREFIX=	v
> CATEGORIES=	editors elisp
> PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
>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
>+
>-- 
>2.44.0
>

Flags:

yasu: maintainer-approval? (hrs)

Actions: View | Diff

Attachments on bug 277496: 249043