[update] editors/{scintilla,scite} 5.3.5
Hi,
here's an update to the latest version of the SciTE editor/IDE
(https://www.scintilla.org), there was a previous attempt for 4.4.6 3
years ago (cf
https://marc.info/?l=openbsd-ports=160779863709630=2).
since then, the lexers have been split off in a separate project
(lexilla) but the scite distfile ships its source, so i went the lazy
way and built a static lib out of it in pre-build and tell SciTE to
statically link against it. The resulting binary has working syntax
highlighting so lexilla works.
scintilla also now properly link against GTK, and scite installs a
desktop file.
since no other port use scintilla (everyone seems to bundle it, or use
the qscintilla variant), one could also build it directly from the scite
source tarball like lexilla.. opinions ?
feedback and okays welcome.
Landry
? scite/patch-gtk_makefile
Index: scintilla/Makefile
===
RCS file: /cvs/ports/editors/scintilla/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- scintilla/Makefile 6 Mar 2023 13:37:15 - 1.32
+++ scintilla/Makefile 25 Apr 2023 06:22:02 -
@@ -1,15 +1,13 @@
COMMENT= source code editing component for GTK+
-VERSION= 4.0.3
-REVISION= 0
+VERSION= 5.3.4
DISTNAME= scintilla${VERSION:S/.//g}
PKGNAME= scintilla-${VERSION}
CATEGORIES=editors x11
-SHARED_LIBS= scintilla 11.0 \
- scintilla_lexers11.0
+SHARED_LIBS= scintilla 12.0
-HOMEPAGE= http://www.scintilla.org/
+HOMEPAGE= https://www.scintilla.org/
# old Python license
PERMIT_PACKAGE=Yes
@@ -26,13 +24,14 @@
WANTLIB= m ${COMPILER_LIBCXX}
-# -std=gnu++17
+# -std=c++17
COMPILER= base-clang ports-gcc
-# Not LIB_DEPENDS as it's only shared libraries that don't link directly
-# to gtk+3
-BUILD_DEPENDS= x11/gtk+3
-RUN_DEPENDS= x11/gtk+3
+LIB_DEPENDS= x11/gtk+3
+
+WANTLIB += atk-1.0 cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gtk-3 harfbuzz intl
+WANTLIB += pango-1.0 pangocairo-1.0
.for n v in ${SHARED_LIBS}
MAKE_ENV+= LIB$n_VERSION=${LIB$n_VERSION}
@@ -40,12 +39,5 @@
WRKDIST= ${WRKDIR}/scintilla
WRKSRC=${WRKDIST}/gtk
-
-post-extract:
- perl -pi -e 's|\x0d||' ${WRKDIST}/include/*.h ${WRKDIST}/gtk/*.cxx \
- ${WRKDIST}/src/*.cxx
-
-pre-build:
- perl -pi -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/${MAKE_FILE}
.include
Index: scintilla/distinfo
===
RCS file: /cvs/ports/editors/scintilla/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- scintilla/distinfo 24 Feb 2018 10:54:50 - 1.12
+++ scintilla/distinfo 25 Apr 2023 06:22:02 -
@@ -1,2 +1,2 @@
-SHA256 (scintilla403.tgz) = nmfi9NjJy6Pi6D7qiDhSrZrfqNwXdfJR+GjMbNBYya4=
-SIZE (scintilla403.tgz) = 1404814
+SHA256 (scintilla534.tgz) = PwGxrvK36Y9iivLP+WWHb10V7igB2d+W3TrO2PCHy0Y=
+SIZE (scintilla534.tgz) = 1318534
Index: scintilla/patches/patch-gtk_ScintillaGTKAccessible_cxx
===
RCS file: scintilla/patches/patch-gtk_ScintillaGTKAccessible_cxx
diff -N scintilla/patches/patch-gtk_ScintillaGTKAccessible_cxx
--- scintilla/patches/patch-gtk_ScintillaGTKAccessible_cxx 11 Mar 2022
18:58:34 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,24 +0,0 @@
-Fix build with GLib >=2.68
-https://sourceforge.net/p/scintilla/code/ci/790bfd4c0747eb5e0bc4d627a101298207a8421e/tree/gtk/ScintillaGTKAccessible.cxx?diff=bf180d712ff771fe40a2d5dc178fa0a15cf14b2d
-
-Index: gtk/ScintillaGTKAccessible.cxx
gtk/ScintillaGTKAccessible.cxx.orig
-+++ gtk/ScintillaGTKAccessible.cxx
-@@ -1015,7 +1015,7 @@ static gpointer scintilla_object_accessible_parent_cla
-
- // @p parent_type is only required on GTK 3.2 to 3.6, and only on the first
call
- static GType scintilla_object_accessible_get_type(GType parent_type
G_GNUC_UNUSED) {
-- static volatile gsize type_id_result = 0;
-+ static gsize type_id_result = 0;
-
- if (g_once_init_enter(_id_result)) {
- GTypeInfo tinfo = {
-@@ -1106,7 +1106,7 @@ AtkObject *ScintillaGTKAccessible::WidgetGetAccessible
- #if HAVE_GTK_A11Y_H // just instantiate the accessible
- *cache = scintilla_object_accessible_new(0, G_OBJECT(widget));
- #elif HAVE_GTK_FACTORY // register in the factory and let GTK instantiate
-- static volatile gsize registered = 0;
-+ static gsize registered = 0;
-
- if (g_once_init_enter()) {
- // Figure out whether accessibility is enabled by looking at
the type of the accessible
Index: scintilla/patches/patch-gtk_makefile
===
RCS file: /cvs/ports/editors/scintilla/patches/patch-gtk_makefile,v
retrieving revision 1.15
diff -u -r1.15 patch-gtk_makefile
---
update: editors/scintilla + editors/scite to 4.4.6
Hi,
Here an update to editors/scintilla (a library) and editors/scite
(editor based on scintilla) to 4.4.6
In editors/scintilla, the library 'scintilla_lexers' (which was "port
homemade" for scite) is now properly exported as 'lexilla' (by
upstream). So I just changed the SHARED_LIBS part to keep the name
from upstream. All library versioning is proper to openbsd, so I kept
the current version identique for 'scintilla' and 'lexilla' libraries.
The upstream makefile (of both ports) is a bit spagetti, and changed
since last update, so the big diffs on them.
Tested on amd64.
Comments or OK ?
--
Sebastien Marie
diff f509cc83fea9c4b51979334e1e39915b75c7f8a3 /home/semarie/repos/openbsd/ports
blob - 815f39119a9b90baa9947b7839048b1633d46241
file + editors/scintilla/Makefile
--- editors/scintilla/Makefile
+++ editors/scintilla/Makefile
@@ -2,15 +2,15 @@
COMMENT= source code editing component for GTK+
-VERSION= 4.0.3
+VERSION= 4.4.6
DISTNAME= scintilla${VERSION:S/.//g}
PKGNAME= scintilla-${VERSION}
CATEGORIES=editors x11
-SHARED_LIBS= scintilla 11.0 \
- scintilla_lexers11.0
+SHARED_LIBS= scintilla 12.0 \
+ lexilla 12.0
-HOMEPAGE= http://www.scintilla.org/
+HOMEPAGE= https://www.scintilla.org/
# old Python license
PERMIT_PACKAGE=Yes
blob - 49104d793d1b1170d4559285e7ecbb7608a60030
file + editors/scintilla/distinfo
--- editors/scintilla/distinfo
+++ editors/scintilla/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scintilla403.tgz) = nmfi9NjJy6Pi6D7qiDhSrZrfqNwXdfJR+GjMbNBYya4=
-SIZE (scintilla403.tgz) = 1404814
+SHA256 (scintilla446.tgz) = LfkwbsRTn0/hP4a6uPJBm6kEZJM9fMqEbXu25wRuwtw=
+SIZE (scintilla446.tgz) = 1640227
blob - da46a19cd256a3dfee2c1dbf79504c2303b55fbc
file + editors/scintilla/patches/patch-gtk_makefile
--- editors/scintilla/patches/patch-gtk_makefile
+++ editors/scintilla/patches/patch-gtk_makefile
@@ -1,119 +1,76 @@
-$OpenBSD: patch-gtk_makefile,v 1.14 2018/02/24 10:54:50 bket Exp $
+$OpenBSD$
Index: gtk/makefile
--- gtk/makefile.orig
+++ gtk/makefile
-@@ -8,19 +8,9 @@
+@@ -15,28 +15,8 @@ srcdir ?= .
+ basedir = $(srcdir)/..
- srcdir ?= .
-
--.SUFFIXES: .cxx .c .o .h .a .list
+ WARNINGS = -Wpedantic -Wall
-ifdef CLANG
-CXX = clang++
--CXXWARNFLAGS = -Wall -pedantic -Wno-deprecated-register -Wno-missing-braces
-CC = clang
+ WARNINGS += -Wno-deprecated-register
+-ifdef windir
+-# Turn off some warnings that occur when Clang is being used on Windows where
it
+-# is including Microsoft headers.
+-# incompatible-ms-struct is because more complex structs are not quite the
same as MSVC
+-WARNINGS += -Wno-incompatible-ms-struct
+-# language-extension-token is because of __int64 in glib-2.0 glibconfig.h
+-WARNINGS += -Wno-language-extension-token
+-# register may be used in glib
+-# This produces a warning since -Wno-register is not valid for C files but it
still works
+-WARNINGS += -Wno-register
+-DEFINES += -D_CRT_SECURE_NO_DEPRECATE
+-endif
-# Can choose aspect to sanitize: address and undefined can simply change
SANITIZE but for
-# thread also need to create Position Independent Executable -> search online
documentation
-SANITIZE = address
-#SANITIZE = undefined
--else
--CXXWARNFLAGS = -Wall -pedantic
+-BASE_FLAGS += -fsanitize=$(SANITIZE)
-endif
-+.SUFFIXES: .cxx .c .o .h .a .list .so
++
ARFLAGS = rc
-+AR = ar
- RANLIB = touch
+ RANLIB ?= ranlib
+ PKG_CONFIG ?= pkg-config
+@@ -58,7 +38,7 @@ normalize = $(if $(windir),$(subst /,\,$1),$1)
- ifdef GTK3
-@@ -48,18 +38,21 @@ DEL = del /q
- COMPLIB=$(srcdir)\..\bin\scintilla.a
+ PYTHON = $(if $(windir),pyw,python3)
+
+-SHAREDEXTENSION = $(if $(windir),dll,so)
++SHAREDEXTENSION = $(if $(windir),dll,so).${LIBscintilla_VERSION}
+
+ ifdef windir
+ CC = gcc
+@@ -66,9 +46,9 @@ DEL = del /q
+ LEXILLA = lexilla.dll
else
DEL = rm -f
--COMPLIB=$(srcdir)/../bin/scintilla.a
-+COMPLIB=$(srcdir)/../bin/libscintilla.a
-+LEXERLIB=$(srcdir)/../bin/libscintilla_lexers.a
-+SHAREDLIB=$(srcdir)/../bin/libscintilla.so.${LIBscintilla_VERSION}
-+SHAREDLEXER=$(srcdir)/../bin/libscintilla_lexers.so.${LIBscintilla_lexers_VERSION}
+-LEXILLA = liblexilla.so
++LEXILLA = liblexilla.so.${LIBlexilla_VERSION}
endif
+-COMPLIB=$(basedir)/bin/scintilla.a
++COMPLIB=$(basedir)/bin/libscintilla.a
+ COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION)
- vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
- vpath %.c $(srcdir)
- vpath %.cxx $(srcdir) $(srcdir)/../src $(srcdir)/../lexlib $(srcdir)/../lexers
-
--INCLUDEDIRS=-I $(srcdir)/../include -I $(srcdir)/../src -I $(srcdir)/../lexlib
-+INCLUDEDIRS=-I $(srcdir)/../include -I $(srcdir)/../src -I
$(srcdir)/../lexlib -I${LOCALBASE}/include
- ifdef CHECK_DEPRECATED
- DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
+ vpath %.h $(srcdir) $(basedir)/src $(basedir)/include
UPDATE editors/scintilla
Enclosed a diff for bringing scintilla to the latest version. Tested ok
on amd64 using scite.
Comments/OK?
Index: Makefile
===
RCS file: /cvs/ports/editors/scintilla/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile14 Dec 2017 06:44:23 - 1.27
+++ Makefile24 Feb 2018 09:44:16 -
@@ -2,13 +2,13 @@
COMMENT= source code editing component for GTK+
-VERSION= 4.0.2
+VERSION= 4.0.3
DISTNAME= scintilla${VERSION:S/.//g}
PKGNAME= scintilla-${VERSION}
CATEGORIES=editors x11
-SHARED_LIBS= scintilla 10.0 \
- scintilla_lexers10.0
+SHARED_LIBS= scintilla 11.0 \
+ scintilla_lexers11.0
HOMEPAGE= http://www.scintilla.org/
@@ -30,7 +30,7 @@ MAKE_ENV= CXX='${CXX}' CXXFLAGS='${CXXFL
WANTLIB= m ${COMPILER_LIBCXX}
-# -std=gnu++14
+# -std=gnu++17
COMPILER= base-clang ports-clang ports-gcc
# Not LIB_DEPENDS as it's only shared libraries that don't link directly
Index: distinfo
===
RCS file: /cvs/ports/editors/scintilla/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo1 Nov 2017 17:01:23 - 1.11
+++ distinfo24 Feb 2018 09:44:16 -
@@ -1,2 +1,2 @@
-SHA256 (scintilla402.tgz) = h9lhB0zWRvp/kuPUiMsStqLQg4oZRLVsuVeNhXG7vU4=
-SIZE (scintilla402.tgz) = 1401547
+SHA256 (scintilla403.tgz) = nmfi9NjJy6Pi6D7qiDhSrZrfqNwXdfJR+GjMbNBYya4=
+SIZE (scintilla403.tgz) = 1404814
Index: patches/patch-gtk_makefile
===
RCS file: /cvs/ports/editors/scintilla/patches/patch-gtk_makefile,v
retrieving revision 1.13
diff -u -p -r1.13 patch-gtk_makefile
--- patches/patch-gtk_makefile 1 Nov 2017 17:01:23 - 1.13
+++ patches/patch-gtk_makefile 24 Feb 2018 09:44:16 -
@@ -58,7 +58,7 @@ Index: gtk/makefile
+CTFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
endif
- CXXTFLAGS:=--std=gnu++14 $(CTFLAGS) $(REFLAGS)
+ CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(REFLAGS)
@@ -88,8 +81,12 @@ MARSHALLER=scintilla-marshal.o
.cxx.o:
Update: editors/{scintilla,scite} 2.22 - 3.0.0
Fairly simple update. SciTE 3.0.0 can now use either GTK+2 or GTK+3,
and I'm choosing to switch it to GTK+3. Many lexer fixes among other
changes, see http://www.scintilla.org/ScintillaHistory.html for details.
Tested on i386.
Jeremy
Index: editors/scintilla/Makefile
===
RCS file: /cvs/ports/editors/scintilla/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- editors/scintilla/Makefile 16 Sep 2011 09:48:09 - 1.15
+++ editors/scintilla/Makefile 15 Nov 2011 01:48:25 -
@@ -2,14 +2,13 @@
COMMENT= source code editing component for GTK+
-VERSION= 2.22
-DISTNAME= scintilla${VERSION:S/.//}
+VERSION= 3.0.0
+DISTNAME= scintilla${VERSION:S/.//g}
PKGNAME= scintilla-${VERSION}
-REVISION= 0
CATEGORIES=editors x11
-SHARED_LIBS= scintilla 7.0 \
- scintilla_lexers7.0
+SHARED_LIBS= scintilla 8.0 \
+ scintilla_lexers8.0
HOMEPAGE= http://www.scintilla.org/
@@ -29,10 +28,11 @@ NO_REGRESS= Yes
MAKE_FILE= makefile
MAKE_ENV= CXX='${CXX}' CXXFLAGS='${CXXFLAGS}' \
- NO_SHARED_LIBS='${NO_SHARED_LIBS:L}'
+ NO_SHARED_LIBS='${NO_SHARED_LIBS:L}' \
+ GTK3=1
-WANTLIB= m stdc++ gtk-x11-2.0 gdk-x11-2.0
-LIB_DEPENDS= x11/gtk+2
+WANTLIB= m stdc++
+LIB_DEPENDS= x11/gtk+3
.for n v in ${SHARED_LIBS}
MAKE_ENV+= LIB$n_VERSION=${LIB$n_VERSION}
Index: editors/scintilla/distinfo
===
RCS file: /cvs/ports/editors/scintilla/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- editors/scintilla/distinfo 2 Dec 2010 21:24:39 - 1.8
+++ editors/scintilla/distinfo 15 Nov 2011 01:48:25 -
@@ -1,5 +1,5 @@
-MD5 (scintilla222.tgz) = B/NBPxNOraEXAedpWnPXZw==
-RMD160 (scintilla222.tgz) = XZSke3JlGxTjiHDq1ogHRI8iMa8=
-SHA1 (scintilla222.tgz) = YkwZPdRKGB4q5pXIr0bAdDJ/Vgk=
-SHA256 (scintilla222.tgz) = XPKT/GdVwZoHmKlsZc+0ltyFD4mnRMjA08nOqem9DRg=
-SIZE (scintilla222.tgz) = 1009848
+MD5 (scintilla300.tgz) = nbe52Jt1TFDtMv0qdy8nXw==
+RMD160 (scintilla300.tgz) = easWsivZFm96Zz1fW5LoY50pGqg=
+SHA1 (scintilla300.tgz) = cv+QQptD26+J1dpqR352+Unip1Q=
+SHA256 (scintilla300.tgz) = E7r1xM0jVkwdVPnseIy4VAXyZm+0MX9NMqZ+ngsGQWs=
+SIZE (scintilla300.tgz) = 969138
Index: editors/scintilla/patches/patch-gtk_makefile
===
RCS file: /cvs/ports/editors/scintilla/patches/patch-gtk_makefile,v
retrieving revision 1.8
diff -u -p -r1.8 patch-gtk_makefile
--- editors/scintilla/patches/patch-gtk_makefile3 Oct 2010 18:09:01
- 1.8
+++ editors/scintilla/patches/patch-gtk_makefile15 Nov 2011 01:48:25
-
@@ -1,6 +1,6 @@
$OpenBSD: patch-gtk_makefile,v 1.8 2010/10/03 18:09:01 jeremy Exp $
gtk/makefile.orig Tue Aug 17 20:03:30 2010
-+++ gtk/makefile Sat Oct 2 20:04:57 2010
+--- gtk/makefile.orig Mon Aug 1 04:49:04 2011
gtk/makefile Tue Nov 15 02:05:09 2011
@@ -6,7 +6,7 @@
# Builds for GTK+ 2 and no longer supports GTK+ 1.
# Also works with ming32-make on Windows.
@@ -10,36 +10,40 @@ $OpenBSD: patch-gtk_makefile,v 1.8 2010/
ifdef CLANG
CC = clang
CCOMP = clang
-@@ -23,14 +23,17 @@ RANLIB = ranlib
- endif
- endif
-
+@@ -36,17 +36,20 @@ DEL = del /q
+ COMPLIB=..\bin\scintilla.a
+ else
+ DEL = rm -f
-COMPLIB=../bin/scintilla.a
+COMPLIB=../bin/libscintilla.a
+LEXERLIB=../bin/libscintilla_lexers.a
+SHAREDLIB=../bin/libscintilla.so.${LIBscintilla_VERSION}
+SHAREDLEXER=../bin/libscintilla_lexers.so.${LIBscintilla_lexers_VERSION}
+ endif
vpath %.h ../src ../include ../lexlib
vpath %.cxx ../src ../lexlib ../lexers
-INCLUDEDIRS=-I ../include -I ../src -I ../lexlib
-+INCLUDEDIRS=-I ../include -I ../src -I ../lexlib -I /usr/local/include
- #~ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
++INCLUDEDIRS=-I ../include -I ../src -I ../lexlib -I${LOCALBASE}/include
+ ifdef CHECK_DEPRECATED
+ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
+ endif
-CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long
-pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
+CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long
-pedantic -DGTK -DSCI_LEXER -Dunix $(INCLUDEDIRS) $(DEPRECATED)
ifdef NOTHREADS
THREADFLAGS=-DG_THREADS_IMPL_NONE
-@@ -41,35 +44,70 @@ endif
+@@ -57,7 +60,7 @@ endif
ifdef DEBUG
CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
else
-CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
-+CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
++CXXFLAGS=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
endif
- CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
+
Re: Update editors/{scintilla,scite} to 2.22
On 2010/12/01 17:49, Jeremy Evans wrote: Simple version update submitted by user: On 11/30 05:08, remi.poin...@xiri.fr wrote: Hi, I seen a new version for scintilla and scite : 2.22 make port-lib-depends-check indicates few libs in extra, but I didn't remove these, I prefer to have your validation. According to ldd /usr/local/bin/SciTE, those libraries are used, so I'm not sure why port-lib-depends-check isn't picking them up. Use objdump -p, ldd shows more libraries than we're interested in for WANTLIB.
Update editors/{scintilla,scite} to 2.22
Simple version update submitted by user:
On 11/30 05:08, remi.poin...@xiri.fr wrote:
Hi,
I seen a new version for scintilla and scite : 2.22
make port-lib-depends-check indicates few libs in extra, but I didn't remove
these, I prefer to have your validation.
According to ldd /usr/local/bin/SciTE, those libraries are
used, so I'm not sure why port-lib-depends-check isn't
picking them up.
I didn't add spaces around variables for readable diff.
Are the 2 diff OK ?
Tested on amd64. Looking for OKs.
Jeremy
Index: scintilla/Makefile
===
RCS file: /cvs/ports/editors/scintilla/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- scintilla/Makefile 15 Nov 2010 23:22:07 - 1.13
+++ scintilla/Makefile 30 Nov 2010 17:11:35 -
@@ -2,7 +2,7 @@
COMMENT= source code editing component for GTK+
-VERSION= 2.21
+VERSION= 2.22
DISTNAME= scintilla${VERSION:S/.//}
PKGNAME= scintilla-${VERSION}
CATEGORIES=editors x11
Index: scintilla/distinfo
===
RCS file: /cvs/ports/editors/scintilla/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- scintilla/distinfo 3 Oct 2010 18:09:01 - 1.7
+++ scintilla/distinfo 30 Nov 2010 17:11:35 -
@@ -1,5 +1,5 @@
-MD5 (scintilla221.tgz) = l8h5/AgjR+jHY2tOZZ35Sw==
-RMD160 (scintilla221.tgz) = bwGEWdn+Xfjxwq/YdNe7g3Ym/PU=
-SHA1 (scintilla221.tgz) = t5ELBeQ4ZoiZXvVw0kDYgEickVU=
-SHA256 (scintilla221.tgz) = A1wKtWrFSgwvnUX27vIXb3V6nPn/o2KakkCnQC1LUQg=
-SIZE (scintilla221.tgz) = 999005
+MD5 (scintilla222.tgz) = B/NBPxNOraEXAedpWnPXZw==
+RMD160 (scintilla222.tgz) = XZSke3JlGxTjiHDq1ogHRI8iMa8=
+SHA1 (scintilla222.tgz) = YkwZPdRKGB4q5pXIr0bAdDJ/Vgk=
+SHA256 (scintilla222.tgz) = XPKT/GdVwZoHmKlsZc+0ltyFD4mnRMjA08nOqem9DRg=
+SIZE (scintilla222.tgz) = 1009848
Index: scite/Makefile
===
RCS file: /cvs/ports/editors/scite/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- scite/Makefile 15 Nov 2010 23:22:07 - 1.18
+++ scite/Makefile 30 Nov 2010 17:11:59 -
@@ -2,10 +2,9 @@
COMMENT= flexible and small GTK+ editor
-VERSION= 2.21
+VERSION= 2.22
DISTNAME= scite${VERSION:S/.//}
PKGNAME= scite-${VERSION}
-REVISION= 0
CATEGORIES=editors x11
HOMEPAGE= http://www.scintilla.org/SciTE.html
Index: scite/distinfo
===
RCS file: /cvs/ports/editors/scite/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- scite/distinfo 3 Oct 2010 18:09:01 - 1.7
+++ scite/distinfo 30 Nov 2010 17:11:59 -
@@ -1,5 +1,5 @@
-MD5 (scite221.tgz) = ayka+nC9/9k/eM32AhueSA==
-RMD160 (scite221.tgz) = lik0kx9LXoISoTRLbLlJTgxo1gw=
-SHA1 (scite221.tgz) = WAiHswjguExvcJr/qXJXLtqldh8=
-SHA256 (scite221.tgz) = uoZSG+PqsctVVy1bcX5HF6PuxW742dYsDc3e0jnpz6c=
-SIZE (scite221.tgz) = 1920326
+MD5 (scite222.tgz) = +MxSD+LZ//hZiQduK4tznA==
+RMD160 (scite222.tgz) = gSsb52qi6yTsXmei2mT0zt9FBnM=
+SHA1 (scite222.tgz) = CbH8L2k8GTT5AodnG6Xw6bQlhiA=
+SHA256 (scite222.tgz) = lbkEMYQUxZEKHhyMDGMbdhVj24PMdc1akkTaFWtZKo4=
+SIZE (scite222.tgz) = 1816710
Re: Update editors/scintilla scite 1.76-2.21
On Sat, Oct 02, 2010 at 08:21:27PM -0700, Jeremy Evans wrote:
Fairly simple version update, lots of new features, see
http://www.scintilla.org/ScintillaHistory.html.
-$OpenBSD: patch-src_KeyWords_cxx,v 1.3 2008/03/22 11:44:42 steven Exp $
cvs log doesn't explain this patch... are you sure it can be safely
removed ?
Index: scite/patches/patch-src_Embedded_properties
-command.scite.help=netscape file://$(SciteDefaultHome)/SciTEDoc.html
-+command.scite.help=firefox file://__DOCDIR__/SciTEDoc.html
++command.scite.help=firefox
file:///usr/local/share/doc/scite/SciTEDoc.html
This should be patched to use ${LOCALBASE} + run ${SUBST_CMD} on it.. or
__DOCDIR__ if it still exists or one of the Makefile variable available.
ok otherwise.
Landry
Re: Update editors/scintilla scite 1.76-2.21
On Sat, Oct 2, 2010 at 11:49 PM, Landry Breuil lan...@rhaalovely.net wrote:
On Sat, Oct 02, 2010 at 08:21:27PM -0700, Jeremy Evans wrote:
Fairly simple version update, lots of new features, see
http://www.scintilla.org/ScintillaHistory.html.
-$OpenBSD: patch-src_KeyWords_cxx,v 1.3 2008/03/22 11:44:42 steven Exp $
cvs log doesn't explain this patch... are you sure it can be safely
removed ?
Yes. The original problem was the while loop would never finish. I
talked to the Scintilla developer years ago about it and it was
because we are using shared linking of the scintilla lexers, when only
static linking is supported, and it was caused by some difference
between the two. Without changing the while into a for with a defined
number of lexers, SciTE would hang on startup. I tested it without
the patch (which no longer applies because the source file has been
removed), and it doesn't hang, so I assume the problem has been
resolved upstream.
As to why we are using shared linking for scintilla and the lexers
when only static is supported upstream, that's how it was before I
took over maintenance.
Index: scite/patches/patch-src_Embedded_properties
- command.scite.help=netscape file://$(SciteDefaultHome)/SciTEDoc.html
-+ command.scite.help=firefox file://__DOCDIR__/SciTEDoc.html
++ command.scite.help=firefox
file:///usr/local/share/doc/scite/SciTEDoc.html
This should be patched to use ${LOCALBASE} + run ${SUBST_CMD} on it.. or
__DOCDIR__ if it still exists or one of the Makefile variable available.
ok otherwise.
OK, I'll make that change.
Jeremy
Update editors/scintilla scite 1.76-2.21
Fairly simple version update, lots of new features, see
http://www.scintilla.org/ScintillaHistory.html.
Tested on amd64. Looking for OKs.
Jeremy
Index: scintilla/Makefile
===
RCS file: /cvs/ports/editors/scintilla/Makefile,v
retrieving revision 1.11
diff -N -u -p scintilla/Makefile
--- scintilla/Makefile 22 Mar 2008 11:44:42 - 1.11
+++ scintilla/Makefile 3 Oct 2010 03:13:01 -
@@ -2,17 +2,17 @@
COMMENT= source code editing component for GTK+
-VERSION= 1.76
+VERSION= 2.21
DISTNAME= scintilla${VERSION:S/.//}
PKGNAME= scintilla-${VERSION}
CATEGORIES=editors x11
-SHARED_LIBS= scintilla 6.0 \
- scintilla_lexers6.0
+SHARED_LIBS= scintilla 7.0 \
+ scintilla_lexers7.0
HOMEPAGE= http://www.scintilla.org/
-MAINTAINER=Jeremy Evans open...@jeremyevans.net
+MAINTAINER=Jeremy Evans jer...@openbsd.org
# old Python license
PERMIT_PACKAGE_CDROM= may not sell
@@ -30,7 +30,8 @@ MAKE_FILE=makefile
MAKE_ENV= CXX='${CXX}' CXXFLAGS='${CXXFLAGS}' \
NO_SHARED_LIBS='${NO_SHARED_LIBS:L}'
-LIB_DEPENDS= gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2
+WANTLIB= m stdc++ gtk-x11-2.0 gdk-x11-2.0
+LIB_DEPENDS= ::x11/gtk+2
.for n v in ${SHARED_LIBS}
MAKE_ENV+= LIB$n_VERSION=${LIB$n_VERSION}
Index: scintilla/distinfo
===
RCS file: /cvs/ports/editors/scintilla/distinfo,v
retrieving revision 1.6
diff -N -u -p scintilla/distinfo
--- scintilla/distinfo 22 Mar 2008 11:44:42 - 1.6
+++ scintilla/distinfo 3 Oct 2010 03:13:01 -
@@ -1,5 +1,5 @@
-MD5 (scintilla176.tgz) = mnHizOVIRZcuGVWT+csb8g==
-RMD160 (scintilla176.tgz) = 5Nv5Ak5OGEAUHd2gB2Y5qG1UeO0=
-SHA1 (scintilla176.tgz) = dfBFdiYK1BJZbS4tq8nafE4lW6Q=
-SHA256 (scintilla176.tgz) = lsFfalDyUOU8G/Xlxoz+g4JDFUcSOmOdaVLpL0FjMJo=
-SIZE (scintilla176.tgz) = 766081
+MD5 (scintilla221.tgz) = l8h5/AgjR+jHY2tOZZ35Sw==
+RMD160 (scintilla221.tgz) = bwGEWdn+Xfjxwq/YdNe7g3Ym/PU=
+SHA1 (scintilla221.tgz) = t5ELBeQ4ZoiZXvVw0kDYgEickVU=
+SHA256 (scintilla221.tgz) = A1wKtWrFSgwvnUX27vIXb3V6nPn/o2KakkCnQC1LUQg=
+SIZE (scintilla221.tgz) = 999005
Index: scintilla/patches/patch-gtk_makefile
===
RCS file: /cvs/ports/editors/scintilla/patches/patch-gtk_makefile,v
retrieving revision 1.7
diff -N -u -p scintilla/patches/patch-gtk_makefile
--- scintilla/patches/patch-gtk_makefile22 Mar 2008 11:44:42 -
1.7
+++ scintilla/patches/patch-gtk_makefile3 Oct 2010 03:13:01 -
@@ -1,18 +1,18 @@
-$OpenBSD: patch-gtk_makefile,v 1.7 2008/03/22 11:44:42 steven Exp $
gtk/makefile.orig Fri Jan 18 23:18:13 2008
-+++ gtk/makefile Sat Mar 22 12:30:08 2008
-@@ -7,7 +7,7 @@
- # To force GTK+ 2 build, define GTK2 on the make command line.
- # To force GTK+ 1 build, define GTK1 on the make command line.
+$OpenBSD$
+--- gtk/makefile.orig Tue Aug 17 20:03:30 2010
gtk/makefile Sat Oct 2 20:04:57 2010
+@@ -6,7 +6,7 @@
+ # Builds for GTK+ 2 and no longer supports GTK+ 1.
+ # Also works with ming32-make on Windows.
-.SUFFIXES: .cxx .c .o .h .a
+.SUFFIXES: .cxx .c .o .h .a .so
- CC = g++
- CCOMP = gcc
- AR = ar
-@@ -17,13 +17,16 @@ ifeq ($(shell uname),Darwin)
- RANLIB = ranlib
+ ifdef CLANG
+ CC = clang
+ CCOMP = clang
+@@ -23,14 +23,17 @@ RANLIB = ranlib
endif
+ endif
-COMPLIB=../bin/scintilla.a
+COMPLIB=../bin/libscintilla.a
@@ -20,17 +20,18 @@ $OpenBSD: patch-gtk_makefile,v 1.7 2008/03/22 11:44:42
+SHAREDLIB=../bin/libscintilla.so.${LIBscintilla_VERSION}
+SHAREDLEXER=../bin/libscintilla_lexers.so.${LIBscintilla_lexers_VERSION}
- vpath %.h ../src ../include
- vpath %.cxx ../src
+ vpath %.h ../src ../include ../lexlib
+ vpath %.cxx ../src ../lexlib ../lexers
--INCLUDEDIRS=-I ../include -I ../src
--CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic -Os
-DGTK -DSCI_LEXER $(INCLUDEDIRS)
-+INCLUDEDIRS=-I ../include -I ../src -I /usr/local/include
-+CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic -DGTK
-DSCI_LEXER -Dunix $(INCLUDEDIRS)
+-INCLUDEDIRS=-I ../include -I ../src -I ../lexlib
++INCLUDEDIRS=-I ../include -I ../src -I ../lexlib -I /usr/local/include
+ #~ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
+-CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long
-pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
++CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long
-pedantic -DGTK -DSCI_LEXER -Dunix $(INCLUDEDIRS) $(DEPRECATED)
ifdef NOTHREADS
THREADFLAGS=-DG_THREADS_IMPL_NONE
-@@ -34,7 +37,7 @@ endif
+@@ -41,35 +44,70 @@ endif
ifdef DEBUG
CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
else
@@ -38,9 +39,8 @@
Re: Update: editors/scintilla and editors/scite 1.54-1.72
Jeremy Evans [2007-01-17, 15:33:36]:
This is an update of SciTE and Scintilla from version 1.54 to 1.72
(changes at http://scintilla.sourceforge.net/ScintillaHistory.html).
Major changes are moving from GTK1 to GTK2 (so tabs are supported) and
new and updated lexers. Builds and runs find on i386-current. I've
been using a similar port for 1.70 and 1.71 for about 6 months on
amd64 (on 3.9/4.0-release) without problems.
This port currently doesn't have maintainer, so I'm offering to take
maintainership (included in the attached diffs).
lib-depends-check on Scintilla says gtk-x11-2 and gdk-x11-2 are Extra,
but I'm pretty sure they are required.
Please test and commit.
char *p;
while ((p = strstr (unixStyleFileName, //)) != NULL) {
- strcpy (p, p + 1);
+ strlcpy (p, p + 1, sizeof(p));
}
This does not do what you seem to expect.
I'm simply removing stuff like this from the diff.
As Nikolay said yesterday, this strl* stuff should be fixed upstream,
rather than in our tree ...
Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
Re: Update: editors/scintilla and editors/scite 1.54-1.72
On 1/18/07, steven mestdagh [EMAIL PROTECTED] wrote:
Jeremy Evans [2007-01-17, 15:33:36]:
This is an update of SciTE and Scintilla from version 1.54 to 1.72
(changes at http://scintilla.sourceforge.net/ScintillaHistory.html).
Major changes are moving from GTK1 to GTK2 (so tabs are supported) and
new and updated lexers. Builds and runs find on i386-current. I've
been using a similar port for 1.70 and 1.71 for about 6 months on
amd64 (on 3.9/4.0-release) without problems.
This port currently doesn't have maintainer, so I'm offering to take
maintainership (included in the attached diffs).
lib-depends-check on Scintilla says gtk-x11-2 and gdk-x11-2 are Extra,
but I'm pretty sure they are required.
Please test and commit.
char *p;
while ((p = strstr (unixStyleFileName, //)) != NULL) {
- strcpy (p, p + 1);
+ strlcpy (p, p + 1, sizeof(p));
}
This does not do what you seem to expect.
I'm simply removing stuff like this from the diff.
As Nikolay said yesterday, this strl* stuff should be fixed upstream,
rather than in our tree ...
That's fine. The strl* changes were made back when that was still
recommended practice. I've already contacted upstream and they will
not be making similar changes. The one patch that is important
(besides the makefile patches) is patch-src_KeyWords_cxx in scintilla.
Without that, SciTE goes into an infinite loop when loading lexers.
I mentioned this on the scintilla mailing list and they said it might
be do to an unusual build setup (lexers are usually statically linked,
but are dynamically linked on OpenBSD). I fixed it by changing the
while loop to a for loop. See
http://aspn.activestate.com/ASPN/Mail/Message/scintilla-interest/3269695
for details.
Jeremy
