On Mon, 02 Dec 2013 13:32:48 +0100
[email protected] (Jérémie Courrèges-Anglas) wrote:
> Stuart Henderson <[email protected]> writes:
>> On 2013/11/30 11:11, YASUOKA Masahiko wrote:
>>> I found and fixed 2 problems of emacs-anthy-9100h used with emacs
>>> 24.3.
>>>
>>> - Add patches/patch-src-util_anthy_el. emacs-anthy-9100h doesn't work
>>> with emacs 24.3 since emacs 24.3 doesn't have `last-command-char'
>>> any more. The upstream hasn't released a fixed version yet.
>>>
>>> - emacs 24.3 doesn't create .elc for leim-list.el. Remove
>>> leim-list.elc from PLIST.
>
> I wanted to suggest using @comment so that someone isn't tempted to
> re-add it when running ''make plist'' when using emacs 24, but when
> using emacs21 the @comment'ed entry gets duplicated...
add a comment
> While here you can merge PFRAG.shared-main inside PLIST-main if you
> want.
merged
>> I don't notice any change in behaviour with emacs21, so ok with me.
>
> ok with me too. (last-command-char and last-command-event are bound to
> the same internal variable.)
thanks,
update the diff.
ok?
Index: Makefile
===================================================================
RCS file: /disk/cvs/openbsd/ports/inputmethods/anthy/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 10 Nov 2013 11:39:33 -0000 1.16
+++ Makefile 3 Dec 2013 06:35:14 -0000
@@ -7,6 +7,7 @@ V = 9100h
DISTNAME = anthy-$V
PKGNAME-main = anthy-$V
PKGNAME-emacs = emacs-anthy-$V
+REVISION-emacs = 0
SHARED_LIBS += anthydic 1.0 # .1.0
SHARED_LIBS += anthy 1.0 # .1.0
Index: patches/patch-src-util_anthy_el
===================================================================
RCS file: patches/patch-src-util_anthy_el
diff -N patches/patch-src-util_anthy_el
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src-util_anthy_el 3 Dec 2013 06:35:14 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src-util/anthy.el.orig Sat Nov 30 10:40:43 2013
++++ src-util/anthy.el Sat Nov 30 10:40:55 2013
+@@ -892,7 +892,7 @@
+ ((event-matches-key-specifier-p event 'backspace) 8)
+ (t
+ (char-to-int (event-to-character event)))))
+- last-command-char))
++ last-command-event))
+
+ ;;
+ ;;
Index: pkg/PFRAG.shared-main
===================================================================
RCS file: pkg/PFRAG.shared-main
diff -N pkg/PFRAG.shared-main
--- pkg/PFRAG.shared-main 21 Nov 2006 00:12:40 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/21 00:12:40 espie Exp $
-@lib lib/libanthy.so.${LIBanthy_VERSION}
-@lib lib/libanthydic.so.${LIBanthydic_VERSION}
-@lib lib/libanthyinput.so.${LIBanthyinput_VERSION}
Index: pkg/PLIST-emacs
===================================================================
RCS file: /disk/cvs/openbsd/ports/inputmethods/anthy/pkg/PLIST-emacs,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-emacs
--- pkg/PLIST-emacs 18 Oct 2006 23:13:34 -0000 1.1.1.1
+++ pkg/PLIST-emacs 3 Dec 2013 06:35:14 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-emacs,v 1.1.1.1 2006/10/18 23:13:34 espie Exp $
+@comment $OpenBSD: espie $
share/emacs/
share/emacs/site-lisp/
share/emacs/site-lisp/anthy/
@@ -15,4 +15,5 @@ share/emacs/site-lisp/anthy/anthy-kyuri.
share/emacs/site-lisp/anthy/anthy.el
share/emacs/site-lisp/anthy/anthy.elc
share/emacs/site-lisp/anthy/leim-list.el
-share/emacs/site-lisp/anthy/leim-list.elc
+@comment Leave leim-list.elc as a comment. It's not created by emacs 24.
+@comment share/emacs/site-lisp/anthy/leim-list.elc
Index: pkg/PLIST-main
===================================================================
RCS file: /disk/cvs/openbsd/ports/inputmethods/anthy/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main 17 Aug 2010 20:27:04 -0000 1.3
+++ pkg/PLIST-main 3 Dec 2013 06:35:14 -0000
@@ -1,6 +1,5 @@
-@comment $OpenBSD: PLIST-main,v 1.3 2010/08/17 20:27:04 fgsch Exp $
+@comment $OpenBSD: fgsch $
@pkgpath inputmethods/anthy
-%%SHARED%%
@bin bin/anthy-agent
@bin bin/anthy-dic-tool
@bin bin/anthy-morphological-analyzer
@@ -10,10 +9,13 @@ include/anthy/dicutil.h
include/anthy/input.h
lib/libanthy.a
lib/libanthy.la
+@lib lib/libanthy.so.${LIBanthy_VERSION}
lib/libanthydic.a
lib/libanthydic.la
+@lib lib/libanthydic.so.${LIBanthydic_VERSION}
lib/libanthyinput.a
lib/libanthyinput.la
+@lib lib/libanthyinput.so.${LIBanthyinput_VERSION}
lib/pkgconfig/
lib/pkgconfig/anthy.pc
share/anthy/
