Attachment 218965 Details for Bug 249873 – recursive diff of the ports

[patch] recursive diff of the ports

yc.el.diff (text/plain), 2.12 KB, created by Takayuki Nakao on 2020-10-22 06:54:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takayuki Nakao

Created: 2020-10-22 06:54:33 UTC

Size: 2.12 KB

patch

obsolete

>diff -ruN yc.el.orig/Makefile yc.el/Makefile
>--- yc.el.orig/Makefile	2020-08-14 03:40:45.245650000 +0900
>+++ yc.el/Makefile	2020-10-22 15:45:42.409786000 +0900
>@@ -14,22 +14,22 @@
> MAINTAINER=	t@nakao.org
> COMMENT=	Yet another Canna client for Emacs
> 
>+USES=		emacs
>+EMACS_FLAVORS_EXCLUDE=	devel_full devel_nox # fail to build
>+
> EXTRACT_CMD=	${GZCAT}
> EXTRACT_BEFORE_ARGS=	#
> EXTRACT_AFTER_ARGS=	> yc.el
> NO_WRKSUBDIR=	yes
> 
>-USES=		emacs
>-EMACS_FLAVORS_EXCLUDE=	devel_full devel_nox # fail to build
>-
>-YC_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/yc
>-
> PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/yc/yc.el \
> 		${EMACS_VERSION_SITE_LISPDIR}/yc/yc.elc
> 
> OPTIONS_DEFINE=	ICANNA
> ICANNA_DESC=	Enable icanna support
> ICANNA_RUN_DEPENDS=	icanna:japanese/icanna
>+
>+YC_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/yc
> 
> do-build:
> 	@(cd ${WRKSRC} && \
>diff -ruN yc.el.orig/files/patch-yc.el yc.el/files/patch-yc.el
>--- yc.el.orig/files/patch-yc.el	2019-11-29 17:01:04.495847000 +0900
>+++ yc.el/files/patch-yc.el	2020-09-25 13:54:57.363871000 +0900
>@@ -1,6 +1,17 @@
>---- yc.el.orig	2018-06-04 13:46:33.083915000 +0900
>-+++ yc.el	2018-06-04 14:48:21.116298000 +0900
>-@@ -1736,6 +1736,7 @@
>+--- yc.el.orig	2020-09-25 04:51:12 UTC
>++++ yc.el
>+@@ -393,7 +393,9 @@ OBJ $B$rJV5Q$9$k!#(B"
>+ 		       (error nil)))))))
>+   (when (processp yc-server)
>+     (put 'yc-server 'init nil)
>+-    (process-kill-without-query yc-server)
>++    (if (boundp 'process-kill-without-query)
>++	(process-kill-without-query yc-server)
>++      (set-process-query-on-exit-flag yc-server nil))
>+     (when yc-debug
>+       (unwind-protect
>+ 	  (progn
>+@@ -1736,6 +1738,7 @@ OBJ $B$rJV5Q$9$k!#(B"
>  				   (error nil))))
>  	    (yc-eval-sexp (car expr)))))
>        (setq files (cdr files)))
>@@ -8,7 +19,7 @@
>      (if romkana-table
>  	(setq yc-rH-conv-dic (yc-search-file-first-in-path
>  			      romkana-table (list "." (getenv "HOME")
>-@@ -2071,7 +2072,7 @@
>+@@ -2071,7 +2074,7 @@ OBJ $B$rJV5Q$9$k!#(B"
>  ;; $BJ8@a$r;XDj$7$J$$>l9g!"8=:_$NJ8@a$,BP>]$H$J$k(B
>  ;; $BFI$_$r<hF@$7$?J8@a$O$=$NFI$_$r%-%c%C%7%e$9$k(B
>  ;; cut $B$,(B $BHs(Bnil $B$N>l9g!";XDjJ8@a0J9_$NFI$_$r:o=|$9$k(B

Flags:

t: maintainer-approval+

Actions: View | Diff

Attachments on bug 249873: 218272 | 218965