pkg/48911: (chat/riece) with Emacs24-24.4.50 needs patch

[makoto%ki.nu@localhost]

>Number:         48911
>Category:       pkg
>Synopsis:       (chat/riece) with Emacs24-24.4.50 needs patch
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Sun Jun 15 13:25:00 +0000 2014
>Originator:     Makoto Fujiwara
>Release:        NetBSD 6.1.4
>Organization:
KINU Corporation
>Environment:
        
        
NetBSD t-105 6.1.4 NetBSD 6.1.4 (GENERIC) amd64 x86_64
>Description:
        riece-9.0.0 needs patch with Emacs24-24.4.50
        but attached patch is NOT confirmed on Emacs-24.4 or former
>How-To-Repeat:
        Have wip/emacs-current installed, and
        (cd /usr/pkgsrc/chat/riece; make package)
>Fix:
Index: chat/riece/Makefile
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/chat/riece/Makefile,v
retrieving revision 1.24
diff -u -u -p -r1.24 Makefile
--- chat/riece/Makefile 8 Apr 2013 07:37:46 -0000       1.24
+++ chat/riece/Makefile 15 Jun 2014 13:14:20 -0000
@@ -3,6 +3,7 @@
 
 DISTNAME=      riece-9.0.0
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    chat japanese
 MASTER_SITES=  http://download.savannah.gnu.org/releases/riece/
 LICENSE=       gnu-gpl-v3
Index: chat/riece/distinfo
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/chat/riece/distinfo,v
retrieving revision 1.11
diff -u -u -p -r1.11 distinfo
--- chat/riece/distinfo 8 Apr 2013 07:13:07 -0000       1.11
+++ chat/riece/distinfo 15 Jun 2014 13:14:20 -0000
@@ -3,3 +3,7 @@ $NetBSD: distinfo,v 1.11 2013/04/08 07:1
 SHA1 (riece-9.0.0.tar.gz) = 62c295a17488a0dfc1f0751fd41fbecedc8bdb40
 RMD160 (riece-9.0.0.tar.gz) = 21b1737802c149983e6c34ef275fa42c787a4294
 Size (riece-9.0.0.tar.gz) = 438553 bytes
+SHA1 (patch-riece-ctlseq.el) = 37e1fe8f1337f3e5e2b4d7f64523c44d7925747a
+SHA1 (patch-riece-highlight.el) = 5876583ad9c02ec04a3c24de358b9d654f719ae5
+SHA1 (patch-riece-shrink-buffer.el) = 7de3f8a0be34c4686254246c23840503c554f730
+SHA1 (patch-riece-twitter.el) = 551b76821421e4df3fe1af45e1ec3bd0aae9a59a
Index: chat/riece/patches/patch-riece-ctlseq.el
===================================================================
RCS file: chat/riece/patches/patch-riece-ctlseq.el
diff -N chat/riece/patches/patch-riece-ctlseq.el
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ chat/riece/patches/patch-riece-ctlseq.el    15 Jun 2014 13:14:20 -0000
@@ -0,0 +1,17 @@
+$NetBSD$
+
+In riece-ctlseq-make-face:
+riece-ctlseq.el:104:27:Warning: `set-face-underline-p' is an obsolete function
+    (as of 24.3); use `set-face-underline' instead.
+
+--- lisp/riece-ctlseq.el~      2011-04-04 15:24:37.000000000 +0900
++++ lisp/riece-ctlseq.el       2014-06-15 21:57:58.000000000 +0900
+@@ -102,7 +102,7 @@ To set up colors compatible with X-Chat 
+     (if (plist-get attrs 'bold)
+       (make-face-bold face))
+     (if (plist-get attrs 'underline)
+-      (set-face-underline-p face t))
++      (set-face-underline face t))
+     (if (setq foreground (plist-get attrs 'foreground))
+       (set-face-foreground face foreground))
+     (if (setq background (plist-get attrs 'background))
Index: chat/riece/patches/patch-riece-ctlseq.el~
===================================================================
RCS file: chat/riece/patches/patch-riece-ctlseq.el~
diff -N chat/riece/patches/patch-riece-ctlseq.el~
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ chat/riece/patches/patch-riece-ctlseq.el~   15 Jun 2014 13:14:20 -0000
@@ -0,0 +1,11 @@
+--- lisp/riece-ctlseq.el~      2011-04-04 15:24:37.000000000 +0900
++++ lisp/riece-ctlseq.el       2014-06-15 21:57:58.000000000 +0900
+@@ -102,7 +102,7 @@ To set up colors compatible with X-Chat 
+     (if (plist-get attrs 'bold)
+       (make-face-bold face))
+     (if (plist-get attrs 'underline)
+-      (set-face-underline-p face t))
++      (set-face-underline face t))
+     (if (setq foreground (plist-get attrs 'foreground))
+       (set-face-foreground face foreground))
+     (if (setq background (plist-get attrs 'background))
Index: chat/riece/patches/patch-riece-highlight.el
===================================================================
RCS file: chat/riece/patches/patch-riece-highlight.el
diff -N chat/riece/patches/patch-riece-highlight.el
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ chat/riece/patches/patch-riece-highlight.el 15 Jun 2014 13:14:20 -0000
@@ -0,0 +1,18 @@
+$NetBSD$
+
+riece-highlight.el:197:4:Warning: make-face called with 2 arguments, but
+    accepts only 1
+
+--- lisp/riece-highlight.el~   2011-04-04 15:43:24.000000000 +0900
++++ lisp/riece-highlight.el    2014-06-15 21:59:23.000000000 +0900
+@@ -194,8 +194,8 @@
+   :group 'riece-highlight)
+ 
+ (unless (riece-facep 'riece-modeline-current-face)
+-  (make-face 'riece-modeline-current-face
+-           "Face used for displaying the current channel in modeline.")
++  (make-face 'riece-modeline-current-face)
++;;         "Face used for displaying the current channel in modeline.")
+   (if (featurep 'xemacs)
+       (set-face-parent 'riece-modeline-current-face 'modeline))
+   (set-face-foreground 'riece-modeline-current-face
Index: chat/riece/patches/patch-riece-highlight.el~
===================================================================
RCS file: chat/riece/patches/patch-riece-highlight.el~
diff -N chat/riece/patches/patch-riece-highlight.el~
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ chat/riece/patches/patch-riece-highlight.el~        15 Jun 2014 13:14:20 
-0000
@@ -0,0 +1,13 @@
+--- lisp/riece-highlight.el~   2011-04-04 15:43:24.000000000 +0900
++++ lisp/riece-highlight.el    2014-06-15 21:59:23.000000000 +0900
+@@ -194,8 +194,8 @@
+   :group 'riece-highlight)
+ 
+ (unless (riece-facep 'riece-modeline-current-face)
+-  (make-face 'riece-modeline-current-face
+-           "Face used for displaying the current channel in modeline.")
++  (make-face 'riece-modeline-current-face)
++;;         "Face used for displaying the current channel in modeline.")
+   (if (featurep 'xemacs)
+       (set-face-parent 'riece-modeline-current-face 'modeline))
+   (set-face-foreground 'riece-modeline-current-face
Index: chat/riece/patches/patch-riece-shrink-buffer.el
===================================================================
RCS file: chat/riece/patches/patch-riece-shrink-buffer.el
diff -N chat/riece/patches/patch-riece-shrink-buffer.el
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ chat/riece/patches/patch-riece-shrink-buffer.el     15 Jun 2014 13:14:20 
-0000
@@ -0,0 +1,19 @@
+$NetBSD$
+
+riece-shrink-buffer.el:70:29:Warning: Use `with-current-buffer' rather than
+    save-excursion+set-buffer
+
+--- lisp/riece-shrink-buffer.el~       2011-04-04 15:46:44.000000000 +0900
++++ lisp/riece-shrink-buffer.el        2014-06-15 22:01:10.000000000 +0900
+@@ -68,8 +68,9 @@
+       (setq buffers (cdr buffers)))))
+ 
+ (defun riece-shrink-buffer (buffer)
+-  (save-excursion
+-    (set-buffer buffer)
++;  (save-excursion
++;    (set-buffer buffer)
++  (with-current-buffer
+     (goto-char (point-min))
+     (while (> (buffer-size) riece-max-buffer-size)
+       (let* ((inhibit-read-only t)
Index: chat/riece/patches/patch-riece-shrink-buffer.el~
===================================================================
RCS file: chat/riece/patches/patch-riece-shrink-buffer.el~
diff -N chat/riece/patches/patch-riece-shrink-buffer.el~
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ chat/riece/patches/patch-riece-shrink-buffer.el~    15 Jun 2014 13:14:20 
-0000
@@ -0,0 +1,14 @@
+--- lisp/riece-shrink-buffer.el~       2011-04-04 15:46:44.000000000 +0900
++++ lisp/riece-shrink-buffer.el        2014-06-15 22:01:10.000000000 +0900
+@@ -68,8 +68,9 @@
+       (setq buffers (cdr buffers)))))
+ 
+ (defun riece-shrink-buffer (buffer)
+-  (save-excursion
+-    (set-buffer buffer)
++;  (save-excursion
++;    (set-buffer buffer)
++  (with-current-buffer
+     (goto-char (point-min))
+     (while (> (buffer-size) riece-max-buffer-size)
+       (let* ((inhibit-read-only t)
Index: chat/riece/patches/patch-riece-twitter.el
===================================================================
RCS file: chat/riece/patches/patch-riece-twitter.el
diff -N chat/riece/patches/patch-riece-twitter.el
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ chat/riece/patches/patch-riece-twitter.el   15 Jun 2014 13:14:20 -0000
@@ -0,0 +1,16 @@
+$NetBSD$
+
+riece-twitter.el:79:25:Warning: `interactive-p' is an obsolete function (as of
+    23.2); use `called-interactively-p' instead.
+
+--- lisp/riece-twitter.el~     2011-04-04 15:47:41.000000000 +0900
++++ lisp/riece-twitter.el      2014-06-15 22:02:07.000000000 +0900
+@@ -77,7 +77,7 @@
+        (process
+         (apply #'start-process
+                "curl" nil "curl"
+-               (if (interactive-p)
++               (if (called-interactively-p)
+                    args
+                  (append args
+                          (list "-H" "X-Twitter-Client: Riece"
Index: chat/riece/patches/patch-riece-twitter.el~
===================================================================
RCS file: chat/riece/patches/patch-riece-twitter.el~
diff -N chat/riece/patches/patch-riece-twitter.el~
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ chat/riece/patches/patch-riece-twitter.el~  15 Jun 2014 13:14:20 -0000
@@ -0,0 +1,11 @@
+--- lisp/riece-twitter.el~     2011-04-04 15:47:41.000000000 +0900
++++ lisp/riece-twitter.el      2014-06-15 22:02:07.000000000 +0900
+@@ -77,7 +77,7 @@
+        (process
+         (apply #'start-process
+                "curl" nil "curl"
+-               (if (interactive-p)
++               (if (called-interactively-p)
+                    args
+                  (append args
+                          (list "-H" "X-Twitter-Client: Riece"

>Unformatted:
 riece-9.0.0 needs patch with Emacs24-24.4.50