[pkgsrc/trunk]: pkgsrc/inputmethod/skk skk: Support emacs28

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4e155457804c
branches:  trunk
changeset: 381325:4e155457804c
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Mon Jul 04 14:40:40 2022 +0000

description:
skk: Support emacs28

diffstat:

 inputmethod/skk/Makefile             |   7 ++--
 inputmethod/skk/distinfo             |   3 +-
 inputmethod/skk/patches/patch-ccc.el |  51 ++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 4 deletions(-)

diffs (91 lines):

diff -r cc264d09f69f -r 4e155457804c inputmethod/skk/Makefile
--- a/inputmethod/skk/Makefile  Mon Jul 04 14:36:13 2022 +0000
+++ b/inputmethod/skk/Makefile  Mon Jul 04 14:40:40 2022 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2022/05/14 22:25:37 dholland Exp $
+# $NetBSD: Makefile,v 1.42 2022/07/04 14:40:40 ryoon Exp $
 
 DISTNAME=      ddskk-ddskk-17.1_Neppu
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}skk-17.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    japanese inputmethod
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=skk-dev/}
 GITHUB_PROJECT=        ddskk
@@ -18,7 +18,8 @@
 EMACS_MODULES+=                base leim
 EMACS_BUILDLINK=       YES
 
-EMACS_VERSIONS_ACCEPTED=       emacs27 emacs27nox
+EMACS_VERSIONS_ACCEPTED=       emacs28 emacs28nox
+EMACS_VERSIONS_ACCEPTED+=      emacs27 emacs27nox
 EMACS_VERSIONS_ACCEPTED+=      emacs26 emacs26nox
 EMACS_VERSIONS_ACCEPTED+=      emacs25 emacs25nox
 
diff -r cc264d09f69f -r 4e155457804c inputmethod/skk/distinfo
--- a/inputmethod/skk/distinfo  Mon Jul 04 14:36:13 2022 +0000
+++ b/inputmethod/skk/distinfo  Mon Jul 04 14:40:40 2022 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 10:49:42 nia Exp $
+$NetBSD: distinfo,v 1.17 2022/07/04 14:40:40 ryoon Exp $
 
 BLAKE2s (ddskk-ddskk-17.1_Neppu.tar.gz) = e7f2031406f7b9131d7d5b4a4a419a43b03745ee67ed66bf1f47dcc40d66ef0e
 SHA512 (ddskk-ddskk-17.1_Neppu.tar.gz) = e0b924111a6289acd29ee5a5d94ea70730fe8f4e1dd5ed279520263efab0c69a6940e5b1b6182e45ed30c0b1ddca9e44ff75b7b3fdab5c8a3e1b2b9f82cc20fa
 Size (ddskk-ddskk-17.1_Neppu.tar.gz) = 952635 bytes
 SHA1 (patch-Makefile) = a04d6c460fae99d247a9b237192619477c1aed02
+SHA1 (patch-ccc.el) = 42677c3dd2d4d48536da569ee3b57ef7f53d66b8
diff -r cc264d09f69f -r 4e155457804c inputmethod/skk/patches/patch-ccc.el
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/skk/patches/patch-ccc.el      Mon Jul 04 14:40:40 2022 +0000
@@ -0,0 +1,51 @@
+$NetBSD: patch-ccc.el,v 1.1 2022/07/04 14:40:40 ryoon Exp $
+
+Support editors/emacs28 from upstream.
+
+--- ccc.el.orig        2022-06-29 16:13:31.750892894 +0000
++++ ccc.el
+@@ -3,10 +3,11 @@
+ ;; Copyright (C) 2000 Masatake YAMATO <masata-y%is.aist-nara.ac.jp@localhost>
+ ;; Copyright (C) 2001, 2002, 2004, 2005,
+ ;;   2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+-;;   2015, SKK Development Team <skk%ring.gr.jp@localhost>
++;;   2015, SKK Development Team
+ 
+ ;; Author: Masatake YAMATO <masata-y%is.aist-nara.ac.jp@localhost>
+-;; Maintainer: SKK Development Team <skk%ring.gr.jp@localhost>
++;; Maintainer: SKK Development Team
++;; URL: https://github.com/skk-dev/ddskk
+ ;; URL: https://github.com/skk-dev/ddskk/blob/master/READMEs/README.ccc.org
+ ;; Keywords: cursor
+ 
+@@ -34,6 +35,8 @@
+ 
+ ;;; Code:
+ 
++(require 'faces)                        ; read-color, color-values
++
+ (eval-when-compile
+   (require 'advice))
+ 
+@@ -111,10 +114,19 @@
+ 
+ ;; Functions.
+ (defsubst ccc-read-color (prompt)
+-  (list (facemenu-read-color prompt)))
++  (list (read-color prompt)))
+ 
+ (defsubst ccc-color-equal (a b)
+-  (facemenu-color-equal a b))
++  "Return t if colors A and B are the same color.
++A and B should be strings naming colors.
++This function queries the display system to find out what the color
++names mean.  It returns nil if the colors differ or if it can't
++determine the correct answer.
++
++This function is the same as `facemenu-color-equal'"
++  (cond
++   ((equal a b) t)
++   ((equal (color-values a) (color-values b)))))
+ 
+ (defun ccc-setup-new-frame (frame)
+   (ccc-set-frame-cursor-color frame (or (ccc-default-cursor-color)