Attachment 204325 Details for Bug 237839 – Patch file generated with svn diff

[patch] Patch file generated with svn diff

patch.diff (text/plain), 5.30 KB, created by Samy Mahmoudi on 2019-05-11 17:01:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Samy Mahmoudi

Created: 2019-05-11 17:01:26 UTC

Size: 5.30 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(rÃ©vision 501255)
>+++ Makefile	(copie de travail)
>@@ -1,9 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=		sc-im
>-PORTVERSION=		0.7.0
>-DISTVERSIONPREFIX=	v
>-PORTREVISION=		1
>+DISTVERSIONPREFIX=	g
>+DISTVERSION=		20190222
> CATEGORIES=		math
> 
> MAINTAINER=	bapt@FreeBSD.org
>@@ -12,12 +11,13 @@
> LICENSE=	BSD4CLAUSE
> 
> LIB_DEPENDS=	libxlsreader.so:math/libxls \
>-		libzip.so:archivers/libzip \
>-		libxlsxwriter.so:math/libxlsxwriter
>+		libxlsxwriter.so:math/libxlsxwriter \
>+		libzip.so:archivers/libzip
> 
>-USES=		gmake pkgconfig lua:51 ncurses
>+USES=		gmake gnome lua:51 ncurses pkgconfig
> USE_GITHUB=	yes
> GH_ACCOUNT=	andmarti1424
>+GH_TAGNAME=	9beb5c0
> USE_GNOME=	libxml2
> 
> WRKSRC_SUBDIR=	src
>@@ -27,6 +27,6 @@
> MAKE_ARGS+=	CC="${CC}" prefix="${PREFIX}" MANDIR="${MANPREFIX}/man/man1"
> 
> post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/scim
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sc-im
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(rÃ©vision 501255)
>+++ distinfo	(copie de travail)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1513334880
>-SHA256 (andmarti1424-sc-im-v0.7.0_GH0.tar.gz) = 87225918cb6f52bbc068ee6b12eaf176c7c55ba9739b29ca08cb9b6699141cad
>-SIZE (andmarti1424-sc-im-v0.7.0_GH0.tar.gz) = 1109887
>+TIMESTAMP = 1557592626
>+SHA256 (andmarti1424-sc-im-g20190222-9beb5c0_GH0.tar.gz) = 755b201bebdb59a4e6d516ad094b886a34efc27d7cd84f88c6011fa05622bc05
>+SIZE (andmarti1424-sc-im-g20190222-9beb5c0_GH0.tar.gz) = 1114358
>Index: files/patch-cmds__command.c
>===================================================================
>--- files/patch-cmds__command.c	(rÃ©vision 501255)
>+++ files/patch-cmds__command.c	(copie de travail)
>@@ -1,6 +1,6 @@
>---- cmds_command.c.orig	2018-08-03 06:04:39 UTC
>+--- cmds_command.c.orig	2019-02-22 18:41:46 UTC
> +++ cmds_command.c
>-@@ -826,7 +826,7 @@ void do_commandmode(struct block * sb) {
>+@@ -853,7 +853,7 @@ void do_commandmode(struct block * sb) {
>              exec_cmd(line);
>  
>          } else if ( inputline[0] == L'w' ) {
>Index: files/patch-doc
>===================================================================
>--- files/patch-doc	(rÃ©vision 501255)
>+++ files/patch-doc	(copie de travail)
>@@ -1,6 +1,6 @@
>---- doc.orig	2018-08-03 06:09:42 UTC
>+--- doc.orig	2019-02-22 18:41:46 UTC
> +++ doc
>-@@ -328,6 +328,8 @@ Commands for handling cell content:
>+@@ -330,6 +330,8 @@ Commands for handling cell content:
>       :w {file}   Save the current spreadsheet as {file}.
>       :w! {file}  Save the current spreadsheet as {file}, forcing an overwrite
>                   if {file} already exists.
>Index: files/patch-file.c
>===================================================================
>--- files/patch-file.c	(rÃ©vision 501255)
>+++ files/patch-file.c	(copie de travail)
>@@ -1,16 +1,46 @@
>---- file.c.orig	2017-12-13 17:48:59 UTC
>+--- file.c.orig	2019-05-11 16:23:57 UTC
> +++ file.c
>-@@ -202,7 +202,12 @@ int savefile() {
>-     del_range_chars(name, 0, 1 + force_rewrite);
>+@@ -189,21 +189,23 @@ int modcheck() {
>+ 
>+ int savefile() {
>+     int force_rewrite = 0;
>++    int shall_quit = 0;
>+     char name[BUFFERSIZE];
>+     #ifndef NO_WORDEXP
>+     size_t len;
>+     wordexp_t p;
>+     #endif
>+ 
>+-    if (! curfile[0] && wcslen(inputline) < 3) { // casos ":w" ":w!" ":x" ":x!"
>++    if (! curfile[0] && wcslen(inputline) < 3) { // casos ":w" ":w!" ":wq" ":x" ":x!"
>+         sc_error("There is no filename");
>+         return -1;
>+     }
>+ 
>+     if (inputline[1] == L'!') force_rewrite = 1;
>++    if (inputline[1] == L'q') shall_quit = 1;
>+ 
>+     wcstombs(name, inputline, BUFFERSIZE);
>+-    del_range_chars(name, 0, 1 + force_rewrite);
>++    del_range_chars(name, 0, 1 + force_rewrite + shall_quit);
>+ 
>+     #ifndef NO_WORDEXP
>      wordexp(name, &p, 0);
>+@@ -221,7 +223,7 @@ int savefile() {
>+     #endif
>  
>--    if (! force_rewrite && p.we_wordv[0] && file_exists(p.we_wordv[0])) {
>-+    if (wcslen(inputline) > 2 && (!p.we_wordv || !p.we_wordv[0])) {
>-+       sc_error("Trailing space(s)");
>-+       return -1;
>-+    }
>-+
>-+    if (! force_rewrite && p.we_wordv && p.we_wordv[0] && file_exists(p.we_wordv[0])) {
>-         sc_error("File already exists. Use \"!\" to force rewrite.");
>-         wordfree(&p);
>+     if (! force_rewrite && file_exists(name)) {
>+-        sc_error("File already exists. Use \"!\" to force rewrite.");
>++        sc_error("File already exists. Use \"w!\" to force rewrite.");
>          return -1;
>+     }
>+ 
>+@@ -235,7 +237,7 @@ int savefile() {
>+     // if it exists and no '!' is set, return.
>+     if (!strlen(curfile) && backup_exists(name)) {
>+         if (!force_rewrite) {
>+-            sc_error("Backup file of %s exists. Use \"!\" to force the write process.", name);
>++            sc_error("Backup file of %s exists. Use \"w!\" to force the write process.", name);
>+             return -1;
>+         } else remove_backup(name);
>+     }
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(rÃ©vision 501255)
>+++ pkg-plist	(copie de travail)
>@@ -1,7 +1,7 @@
>-bin/scim
>-man/man1/scim.1.gz
>-share/scim/plot_bar
>-share/scim/plot_line
>-share/scim/plot_pie
>-share/scim/plot_scatter
>-share/scim/scim_help
>+bin/sc-im
>+man/man1/sc-im.1.gz
>+share/sc-im/plot_bar
>+share/sc-im/plot_line
>+share/sc-im/plot_pie
>+share/sc-im/plot_scatter
>+share/sc-im/sc-im_help

Actions: View | Diff

Attachments on bug 237839: 204325 | 204373