Date: Tue, 28 Oct 2003 22:45:33 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58629: Update port: x11-toolkits/scintilla to 1.56 Message-ID: <20031028224533.215b1132.tkato@prontomail.com> Resent-Message-ID: <200310281400.h9SE0NQA080746@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58629 >Category: ports >Synopsis: Update port: x11-toolkits/scintilla to 1.56 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Oct 28 06:00:23 PST 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.9-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.56 Remove file: files/patch-PlatGTK.cxx files/patch-ScintillaGTK.cxx >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-toolkits/scintilla/Makefile x11-toolkits/scintilla/Makefile --- /usr/ports/x11-toolkits/scintilla/Makefile Tue Oct 7 10:48:50 2003 +++ x11-toolkits/scintilla/Makefile Sun Oct 26 00:44:27 2003 @@ -6,8 +6,7 @@ # PORTNAME= scintilla -PORTVERSION= 1.55 -PORTREVISION= 1 +PORTVERSION= 1.56 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.scintilla.org/ @@ -32,13 +31,6 @@ USE_GNOME= gtk12 MAKE_ARGS= GTK1=yes .endif - -post-extract: -.for i in PlatGTK.cxx ScintillaGTK.cxx - @cd ${WRKSRC} \ - && ${MV} ${i} ${i}.pre_tr \ - && ${TR} -d '\r' < ${i}.pre_tr > ${i} -.endfor do-install: ${MKDIR} ${PREFIX}/include/scintilla diff -urN /usr/ports/x11-toolkits/scintilla/distinfo x11-toolkits/scintilla/distinfo --- /usr/ports/x11-toolkits/scintilla/distinfo Tue Sep 30 11:03:30 2003 +++ x11-toolkits/scintilla/distinfo Sun Oct 26 00:36:42 2003 @@ -1 +1 @@ -MD5 (scite155.tgz) = f5292ac35853207d648c39decc165d63 +MD5 (scite156.tgz) = 83a4d56bc06f168107127d3717399295 diff -urN /usr/ports/x11-toolkits/scintilla/files/patch-PlatGTK.cxx x11-toolkits/scintilla/files/patch-PlatGTK.cxx --- /usr/ports/x11-toolkits/scintilla/files/patch-PlatGTK.cxx Tue Sep 30 04:48:33 2003 +++ x11-toolkits/scintilla/files/patch-PlatGTK.cxx Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- PlatGTK.cxx.orig Sun Sep 28 12:41:04 2003 -+++ PlatGTK.cxx Sun Sep 28 12:42:27 2003 -@@ -1034,7 +1034,7 @@ - static char *UTF8FromIconv(iconv_t iconvh, const char *s, int len) { - if (iconvh != ((iconv_t)(-1))) { - char *utfForm = new char[len*3+1]; -- char *pin = const_cast<char *>(s); -+ const char *pin = s; - size_t inLeft = len; - char *pout = utfForm; - size_t outLeft = len*3+1; -@@ -1051,7 +1051,7 @@ - static size_t MultiByteLenFromIconv(iconv_t iconvh, const char *s, size_t len) { - for (size_t lenMB=1; (lenMB<4) && (lenMB <= len); lenMB++) { - char wcForm[2]; -- char *pin = const_cast<char *>(s); -+ const char *pin = s; - size_t inLeft = lenMB; - char *pout = wcForm; - size_t outLeft = 2; diff -urN /usr/ports/x11-toolkits/scintilla/files/patch-ScintillaGTK.cxx x11-toolkits/scintilla/files/patch-ScintillaGTK.cxx --- /usr/ports/x11-toolkits/scintilla/files/patch-ScintillaGTK.cxx Tue Sep 30 04:48:33 2003 +++ x11-toolkits/scintilla/files/patch-ScintillaGTK.cxx Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- ScintillaGTK.cxx.orig Sun Sep 28 12:41:04 2003 -+++ ScintillaGTK.cxx Sun Sep 28 12:43:32 2003 -@@ -965,7 +965,7 @@ - iconv_t iconvh = iconv_open(source, "UTF-8"); - if (iconvh != ((iconv_t)(-1))) { - char localeVal[4]="\0\0\0"; -- char *pin = utfVal; -+ const char *pin = utfVal; - size_t inLeft = strlen(utfVal); - char *pout = localeVal; - size_t outLeft = sizeof(localeVal); -@@ -1103,7 +1103,7 @@ - iconv_t iconvh = iconv_open(charSetDest, charSetSource); - if (iconvh != ((iconv_t)(-1))) { - destForm = new char[len*3+1]; -- char *pin = s; -+ const char *pin = s; - size_t inLeft = len; - char *pout = destForm; - size_t outLeft = len*3+1; >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031028224533.215b1132.tkato>