Adapt for emacs26. version nb1 packaged, but runtime error for make-face

4 files changed, 40 insertions, 4 deletions

diff --git a/chat/riece/Makefile b/chat/riece/Makefile
index 308f42a042d..fde60159a08 100644
--- a/chat/riece/Makefile
+++ b/chat/riece/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2018/01/13 23:18:26 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2018/07/16 05:56:10 mef Exp $
 #
 
 DISTNAME=	riece-9.0.0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	chat japanese
 MASTER_SITES=	http://download.savannah.gnu.org/releases/riece/
 LICENSE=	gnu-gpl-v3
@@ -16,7 +16,7 @@ INSTALLATION_DIRS=	${EMACS_LISPPREFIX:C|^${PREFIX}/||}/riece \
 			${EMACS_INFOPREFIX:C|^${PREFIX}/||}
 
 EMACS_VERSIONS_ACCEPTED= \
-		emacs25 emacs25nox emacs21 emacs21nox \
+		emacs27 emacs26 emacs26nox emacs25 emacs25nox emacs21 emacs21nox \
 		xemacs215 xemacs215nox xemacs214 xemacs214nox
 EMACS_MODULES=	base
 
diff --git a/chat/riece/distinfo b/chat/riece/distinfo
index acc056efc43..28c286ece19 100644
--- a/chat/riece/distinfo
+++ b/chat/riece/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 01:20:23 agc Exp $
+$NetBSD: distinfo,v 1.14 2018/07/16 05:56:10 mef Exp $
 
 SHA1 (riece-9.0.0.tar.gz) = 62c295a17488a0dfc1f0751fd41fbecedc8bdb40
 RMD160 (riece-9.0.0.tar.gz) = 21b1737802c149983e6c34ef275fa42c787a4294
@@ -6,5 +6,7 @@ SHA512 (riece-9.0.0.tar.gz) = 3fbfa4a6d898a713248ce217939af208729eb441ab7ecea2d2
 Size (riece-9.0.0.tar.gz) = 438553 bytes
 SHA1 (patch-riece-ctlseq.el) = 37e1fe8f1337f3e5e2b4d7f64523c44d7925747a
 SHA1 (patch-riece-highlight.el) = 5876583ad9c02ec04a3c24de358b9d654f719ae5
+SHA1 (patch-riece-history.el) = 1207c0ac89de809ba981df8f14ba56744c2bb878
 SHA1 (patch-riece-shrink-buffer.el) = 7de3f8a0be34c4686254246c23840503c554f730
 SHA1 (patch-riece-twitter.el) = 551b76821421e4df3fe1af45e1ec3bd0aae9a59a
+SHA1 (patch-riece-unread.el) = 06e4ee36316eba8f6b2ea081abd422ef257058ce
diff --git a/chat/riece/patches/patch-riece-history.el b/chat/riece/patches/patch-riece-history.el
new file mode 100644
index 00000000000..00bbbd09e63
--- /dev/null
+++ b/chat/riece/patches/patch-riece-history.el
@@ -0,0 +1,17 @@
+$NetBSD: patch-riece-history.el,v 1.1 2018/07/16 05:56:10 mef Exp $
+
+make-face of recent emacs accepts only one argument
+
+--- lisp/riece-history.el.orig	2011-04-04 15:24:37.000000000 +0900
++++ lisp/riece-history.el	2018-07-16 09:36:39.094852673 +0900
+@@ -65,8 +65,8 @@
+ (defvar riece-channel-list-history-face 'riece-channel-list-history-face)
+ 
+ (unless (riece-facep 'riece-modeline-history-face)
+-  (make-face 'riece-modeline-history-face
+-	     "Face used for displaying history channels in modeline.")
++  (make-face 'riece-modeline-history-face)
++;	     "Face used for displaying history channels in modeline.")
+   (if (featurep 'xemacs)
+       (set-face-parent 'riece-modeline-history-face 'modeline))
+   (set-face-foreground 'riece-modeline-history-face
diff --git a/chat/riece/patches/patch-riece-unread.el b/chat/riece/patches/patch-riece-unread.el
new file mode 100644
index 00000000000..c28ce39c83e
--- /dev/null
+++ b/chat/riece/patches/patch-riece-unread.el
@@ -0,0 +1,17 @@
+$NetBSD: patch-riece-unread.el,v 1.1 2018/07/16 05:56:10 mef Exp $
+
+make-face of recent emacs accepts only one argument
+
+--- lisp/riece-unread.el.orig	2011-04-04 15:47:48.000000000 +0900
++++ lisp/riece-unread.el	2018-07-16 10:00:32.885104499 +0900
+@@ -60,8 +60,8 @@
+ (defvar riece-channel-list-unread-face 'riece-channel-list-unread-face)
+ 
+ (unless (riece-facep 'riece-modeline-unread-face)
+-  (make-face 'riece-modeline-unread-face
+-	     "Face used for displaying unread channels in modeline.")
++  (make-face 'riece-modeline-unread-face)
++;	     "Face used for displaying unread channels in modeline.")
+   (if (featurep 'xemacs)
+       (set-face-parent 'riece-modeline-unread-face 'modeline))
+   (set-face-foreground 'riece-modeline-unread-face