ports/57362: Update port: x11-toolkits/scintilla to 1.55
KATO Tsuguru
tkato at prontomail.com
Mon Sep 29 14:00:39 UTC 2003
>Number: 57362
>Category: ports
>Synopsis: Update port: x11-toolkits/scintilla to 1.55
>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: Mon Sep 29 07:00:33 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 1.55
New 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 Sun Aug 17 03:05:25 2003
+++ x11-toolkits/scintilla/Makefile Sun Sep 28 13:41:03 2003
@@ -6,7 +6,7 @@
#
PORTNAME= scintilla
-PORTVERSION= 1.54
+PORTVERSION= 1.55
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.scintilla.org/
@@ -21,9 +21,23 @@
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_GNOME= gtk12
-INSTALLS_SHLIB= yes
MAKEFILE= makefile
+INSTALLS_SHLIB= yes
+
+.if defined(WITH_GTK2)
+USE_GNOME= gtk20
+PKGNAMESUFFIX= -gtk2
+.else
+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 Sun Aug 17 03:05:25 2003
+++ x11-toolkits/scintilla/distinfo Sat Sep 27 20:17:53 2003
@@ -1 +1 @@
-MD5 (scite154.tgz) = 5086acda2bb7a637fc34b0655e30930e
+MD5 (scite155.tgz) = f5292ac35853207d648c39decc165d63
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 Thu Jan 1 09:00:00 1970
+++ x11-toolkits/scintilla/files/patch-PlatGTK.cxx Sun Sep 28 12:44:29 2003
@@ -0,0 +1,20 @@
+--- 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 Thu Jan 1 09:00:00 1970
+++ x11-toolkits/scintilla/files/patch-ScintillaGTK.cxx Sun Sep 28 12:44:40 2003
@@ -0,0 +1,20 @@
+--- 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;
diff -urN /usr/ports/x11-toolkits/scintilla/files/patch-aa x11-toolkits/scintilla/files/patch-aa
--- /usr/ports/x11-toolkits/scintilla/files/patch-aa Sun Aug 17 03:05:25 2003
+++ x11-toolkits/scintilla/files/patch-aa Sun Sep 28 11:52:46 2003
@@ -1,10 +1,7 @@
-
-$FreeBSD: ports/x11-toolkits/scintilla/files/patch-aa,v 1.12 2003/08/16 16:47:28 krion Exp $
-
---- makefile.orig Sun Aug 10 19:55:54 2003
-+++ makefile Wed Aug 13 00:35:59 2003
-@@ -6,8 +6,8 @@
- # To build for GTK+ 2, define GTK2 on the make command line.
+--- makefile.orig Sun Sep 21 11:19:30 2003
++++ makefile Sun Sep 28 11:48:04 2003
+@@ -8,8 +8,8 @@
+ # To force GTK+ 1 build, define GTK1 on the make command line.
.SUFFIXES: .cxx .o .h .a
-CC = g++
@@ -14,7 +11,7 @@
RANLIB = touch
ifeq ($(OSTYPE),darwin)
-@@ -16,7 +16,8 @@
+@@ -18,7 +18,8 @@
RANLIB = ranlib
endif
@@ -24,7 +21,7 @@
vpath %.h ../src ../include
vpath %.cxx ../src
-@@ -31,9 +32,9 @@
+@@ -33,9 +34,9 @@
endif
ifdef DEBUG
@@ -35,17 +32,26 @@
+CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
endif
- ifdef GTK2
-@@ -43,7 +44,7 @@
+ # If explicit setting of GTK1 or GTK2 then use that else look for
+@@ -44,7 +45,7 @@
+ CONFIGFLAGS=pkg-config --cflags gtk+-2.0
+ else
+ ifdef GTK1
+-CONFIGFLAGS=gtk-config --cflags
++CONFIGFLAGS=pkg-config --cflags gtk+
+ else
+ ifneq (,$(findstring /,$(shell whereis -b pkg-config)))
+ CONFIGFLAGS=pkg-config --cflags gtk+-2.0
+@@ -55,7 +56,7 @@
endif
.cxx.o:
- $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
-+ $(CC) -DPIC -fpic $(shell $(GTK_CONFIG) --cflags) $(CXXFLAGS) -c $<
++ $(CC) -DPIC -fpic `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
#++Autogenerated -- run src/LexGen.py to regenerate
#**LEXOBJS=\\\n\(\*.o \)
-@@ -57,7 +58,7 @@
+@@ -69,7 +70,7 @@
# The LEXOBJS have to be treated specially as the functions in them are not called from external code
@@ -54,16 +60,16 @@
clean:
rm -f *.o $(COMPLIB)
-@@ -69,8 +70,10 @@
+@@ -81,8 +82,10 @@
ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \
KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o
- $(AR) rc $@ $^
- $(RANLIB) $@
-+ $(AR) $(shell $(GTK_CONFIG) --libs gthread) -o $@ $^
++ $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^
+
+ $(LEXRLIB): $(LEXOBJS)
-+ $(AR) $(shell $(GTK_CONFIG) --libs gthread) -o $@ $^
++ $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^
# Automatically generate header dependencies with "make deps"
include deps.mak
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list