Date: Wed, 18 Feb 2015 17:56:01 +0900 From: Tomoaki AOKI <junchoon@dec.sakura.ne.jp> To: svn-ports-head@freebsd.org Cc: delphij@freebsd.org Subject: Re: svn commit: r379195 - head/archivers/unzip/files Message-ID: <20150218175601.b1778a3cbb5927f8f34e0ed4@dec.sakura.ne.jp>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --Multipart=_Wed__18_Feb_2015_17_56_01_+0900_PIiTHazzOolsaqg0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit This broke build for me. Stops by "File to patch:" prompt. Fix: Apply attached diff in archivers/unzip/files/ directory. (Generated by svnlite diff). Detail: Upper directory (unix/) is accidentally removed from top 2 lines of archivers/unzip/files/extra-iconv-patch-unix_unix.c by this commit. If any questions, please email me directly. (I've not subscribed to svn-ports-head ML.) > Author: delphij > Date: Tue Feb 17 23:21:35 2015 > New Revision: 379195 > URL: https://svnweb.freebsd.org/changeset/ports/379195 > QAT: https://qat.redports.org/buildarchive/r379195/ > > Log: > Fix build. The merge should have been tested against an ICONV build. > > Submitted by: jbeich > Pointy hat to: delphij > MFH: 2015Q1 > > Modified: > head/archivers/unzip/files/extra-iconv-patch-unix_unix.c > > Modified: head/archivers/unzip/files/extra-iconv-patch-unix_unix.c > ============================================================================== > --- head/archivers/unzip/files/extra-iconv-patch-unix_unix.c Tue > Feb 17 22:04:26 2015 (r379194) +++ > head/archivers/unzip/files/extra-iconv-patch-unix_unix.c Tue Feb > 17 23:21:35 2015 (r379195) @@ -1,5 +1,5 @@ > ---- unix/unix.c.orig 2009-01-23 23:31:26 UTC > -+++ unix/unix.c > +--- unix.c.orig 2015-02-17 15:18:36.176142072 -0800 > ++++ unix.c 2015-02-17 15:18:56.289341100 -0800 > @@ -30,6 +30,9 @@ > #define UNZIP_INTERNAL > #include "unzip.h" > @@ -10,7 +10,7 @@ > #ifdef SCO_XENIX > # define SYSNDIR > #else /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */ > -@@ -1874,3 +1877,90 @@ static void qlfix(__G__ ef_ptr, ef_len) > +@@ -1874,3 +1877,102 @@ > } > } > #endif /* QLZIP */ -- Tomoaki AOKI junchoon@dec.sakura.ne.jp --Multipart=_Wed__18_Feb_2015_17_56_01_+0900_PIiTHazzOolsaqg0 Content-Type: text/x-diff; name="extra-iconv-patch-unix_unix.c.diff" Content-Disposition: attachment; filename="extra-iconv-patch-unix_unix.c.diff" Content-Transfer-Encoding: 7bit Index: extra-iconv-patch-unix_unix.c =================================================================== --- extra-iconv-patch-unix_unix.c (revision 379198) +++ extra-iconv-patch-unix_unix.c (working copy) @@ -1,5 +1,5 @@ ---- unix.c.orig 2015-02-17 15:18:36.176142072 -0800 -+++ unix.c 2015-02-17 15:18:56.289341100 -0800 +--- unix/unix.c.orig 2015-02-17 15:18:36.176142072 -0800 ++++ unix/unix.c 2015-02-17 15:18:56.289341100 -0800 @@ -30,6 +30,9 @@ #define UNZIP_INTERNAL #include "unzip.h" --Multipart=_Wed__18_Feb_2015_17_56_01_+0900_PIiTHazzOolsaqg0--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150218175601.b1778a3cbb5927f8f34e0ed4>