From nobody Wed Mar 27 06:55:38 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V4HVy2lMYz5Gb1g; Wed, 27 Mar 2024 06:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V4HVy1wBWz42Z2; Wed, 27 Mar 2024 06:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711522538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C6UMB9zozu2nACQFcFJThddVOSDt1mnQ45Coli7CPpk=; b=wmDnUPOXD6ZBfgVle8WE0w6XlDHimf4hma1KfgcdaVNdICvQSOrAzPoI+A3tHBaHUYWjRX 1PLqy9VkQmKXUELa/KT38c6yIGbIerRcyfSoCdiUnMEQi6Rjk8pdn1r1p+TCjBAQ6YK02A w/HnGqzY2uw6HBGi0MX6JEY6s8FggjrV+68GeDLRQqRK4XA4L5htSzwb0roJTtrY5/e2Um qjg4rZ5Wy+iu54PXU5y/UzBNQ2WtS9A7W8NYz40pHg4l8niZ8dflIL14YPofffFpJJPDeC aGnrddOLcLfZQi7l4nXPl682JFKsYGAHHt237AnzBdgYABgK/+NrW/0ucfHLkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711522538; a=rsa-sha256; cv=none; b=IiX89GoNHg/NhoG8FxmnS/x+OwqsgE8QlzI1i1Kr191oAQNh9CnchGIMSzs0iSx2RyL9lV qLYRyI/NC6LHrxXks8AW28tgY8c26K9fkXQ5UoP6Re0ZW67pD4cB2SZc+5NsrcrFPtaLGu ViceAkp7plbOncJevDMtzPTrnOkD8ExtZufnIeuQj0jpDBZWWUmmPo3kUgk1EQuL4MMAmn RbGL/Xmvu6j9jjzh7vqeWtGQp7A/qmDvj+OAV/W5aaJZqm7maaV0vdj65doGNSSxoOPZ0p katSlbHWLa8nPYmPRE6E0g/VrVbhKOhPjT9zt5bxaQNEJRFBxzEDC2xAFyt4sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711522538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C6UMB9zozu2nACQFcFJThddVOSDt1mnQ45Coli7CPpk=; b=S6zAO9hiz9/6rHbXrCKpca8dXl5JXq5bs/k/acKhKO1RNr5K25gfEJw/PAU3ts3mBMFwrH h+kZDeeXQdDydsM6ykc3oXFVBEEy5QQYMXCx1dJZaszf8tF3oOBILod5O+wgHCTsGwYqA/ sB+TL28Ta9IpvyBAu9P1AAb2GMm0J1lUC+NrtGMX5Of8p7ACSymzmN5Htb4J0mNx9ZuoDv +q8YzpMXXSUzHHR2qHKBOUN7e4RHr/dry4B+UCTQIarPzZ0cNqPAGs0nS9IqfSVcbL6pu4 vfrZDD2xNSedMiO3lk2uIj+Cd7zoQQSiB90H9uOqnWh6UQlBIVd1IzsUNpm60Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V4HVy1CdvzZFN; Wed, 27 Mar 2024 06:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42R6tcel041860; Wed, 27 Mar 2024 06:55:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42R6tcOe041857; Wed, 27 Mar 2024 06:55:38 GMT (envelope-from git) Date: Wed, 27 Mar 2024 06:55:38 GMT Message-Id: <202403270655.42R6tcOe041857@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: f8785263c268 - main - editors/tamago: Fix build of devel_full and devel_nox flavors List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8785263c268c1e02f2f04ea24379c9c5c643027 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=f8785263c268c1e02f2f04ea24379c9c5c643027 commit f8785263c268c1e02f2f04ea24379c9c5c643027 Author: Yasuhiro Kimura AuthorDate: 2024-03-09 00:43:10 +0000 Commit: Yasuhiro Kimura 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 +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 +