x11-toolkits/scintilla: Update to 5.5.0

Also update at the same time editors/scite to keep them in sync.

PR:	279995

3 files changed, 38 insertions, 31 deletions

diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 9985982abcce..fc8a7cc3cdf9 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	scite
-DISTVERSION=	4.4.5
-PORTREVISION=	3
+DISTVERSION=	5.5.0
 CATEGORIES=	editors gnome
-MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
+MASTER_SITES=	https://www.scintilla.org/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 
 MAINTAINER=	cyberbotx@cyberbotx.com
@@ -10,19 +9,16 @@ COMMENT=	Full-featured SCIntilla based text editor for GTK/GNOME
 WWW=		https://www.scintilla.org/SciTE.html
 
 LICENSE=	SCINTILLA
-LICENSE_NAME=	License for Scintilla and SciTE
+LICENSE_NAME=	License for Lexilla, Scintilla and SciTE
 LICENSE_FILE=	${WRKSRC}/../License.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libscintilla.so:x11-toolkits/scintilla
+LIB_DEPENDS=	liblexilla.so:textproc/lexilla \
+		libscintilla.so:x11-toolkits/scintilla
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
-USES=		compiler:c++17-lang desktop-file-utils gmake gnome pkgconfig tar:tgz
-
-OPTIONS_DEFINE=	DOCS
-
-PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}
-WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
+USES=		compiler:c++20-lang desktop-file-utils gmake gnome pkgconfig \
+		tar:tgz
 
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 MAKEFILE=	makefile
@@ -31,9 +27,14 @@ MAKE_ARGS=	GTK3=1
 MAKE_ARGS+=	DEBUG=1
 .endif
 
+PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
+
 PORTDATA=	*.properties
 PORTDOCS=	*.html *.jpg *.png
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
@@ -45,12 +46,18 @@ post-patch:
 		${WRKSRC}/../src/SciTEGlobal.properties
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE \
+		${STAGEDIR}${PREFIX}/bin
 	${LN} -sf SciTE ${STAGEDIR}${PREFIX}/bin/scite
-	${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_DATA} ${WRKSRC}/SciTE.desktop ${STAGEDIR}${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${STAGEDIR}${PREFIX}/share/pixmaps
-	(cd ${WRKSRC}/../src && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
-	(cd ${WRKSRC}/../doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
+	${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 \
+		${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_DATA} ${WRKSRC}/SciTE.desktop \
+		${STAGEDIR}${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/Sci48M.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps
+	(cd ${WRKSRC}/../src && \
+		${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
+	(cd ${WRKSRC}/../doc && \
+		${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.post.mk>
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index d9ae763baa70..dbe2f170c3fe 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601836826
-SHA256 (scite445.tgz) = 9d74bde5e4ee18d767b6add5a6b95d7ffcedbcfd017c3df59e16b0785e3521a1
-SIZE (scite445.tgz) = 2777899
+TIMESTAMP = 1719371126
+SHA256 (scite550.tgz) = f7726a57be521f71c81b4fcc6d171fbf4a62e08c1c1840f5a74e014f3607ee11
+SIZE (scite550.tgz) = 4784815
diff --git a/editors/scite/files/patch-gtk_makefile b/editors/scite/files/patch-gtk_makefile
index 7396cbe55e23..7bb9535a50b6 100644
--- a/editors/scite/files/patch-gtk_makefile
+++ b/editors/scite/files/patch-gtk_makefile
@@ -1,6 +1,6 @@
---- gtk/makefile.orig	2020-09-11 10:44:44 UTC
+--- gtk/makefile.orig	2024-03-19 04:36:42 UTC
 +++ gtk/makefile
-@@ -18,9 +18,7 @@ ifdef CLANG
+@@ -19,9 +19,7 @@ SANITIZE = address
  # thread also need to create Position Independent Executable -> search online documentation
  SANITIZE = address
  #SANITIZE = undefined
@@ -11,23 +11,23 @@
  WARNINGS += -Wno-deprecated-register
  WARNINGS += -Wno-empty-body
  else
-@@ -59,7 +57,7 @@ COMPLIB=$(SCINTILLA_DIR)/bin/scintilla.a
+@@ -60,7 +58,7 @@ LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION)
  COMPONENT=$(srcdir)/../bin/libscintilla.$(SHAREDEXTENSION)
  LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION)
  
 -all: $(PROG) $(COMPONENT) $(LEXILLA)
 +all: $(PROG)
  
- vpath %.h $(srcdir) $(srcdir)/../src $(SCINTILLA_DIR)/include
- vpath %.cxx $(srcdir) $(srcdir)/../src
-@@ -151,7 +149,9 @@ SRC_OBJS = \
+ vpath %.h $(srcdir) $(srcdir)/../src $(LEXILLA_DIR)/include $(SCINTILLA_DIR)/include
+ vpath %.cxx $(srcdir) $(srcdir)/../src $(srcdir)/../../lexilla/access $(SCINTILLA_DIR)/call
+@@ -156,7 +154,9 @@ $(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o Directo
  	Utf8_16.o
  
- $(PROG): SciTEGTK.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
+ $(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
 -	$(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L ../../scintilla/bin -lscintilla $(LDLIBS)
-+	$(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic \
-+	-Wl,--version-script $(srcdir)/lua.vers $^ -o $@ -lscintilla \
-+	-Wl,--as-needed $(CONFIGLIB)
++	$(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--undefined-version \
++	-Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers \
++	$^ -o $@ $(CONFIGLIB) $(LIBS) -lscintilla -llexilla $(LDLIBS)
  
- # Automatically generate header dependencies with "make deps"
+ # Automatically generate header dependencies with "make depend"
  include deps.mak