[packages/scintilla] - updated to 3.21.1

qboosh qboosh at pld-linux.org
Thu Jul 3 21:03:52 CEST 2025 

commit 7a624b58f9f1476e09c9fac502c5ce5d2bf9900e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jul 3 21:05:20 2025 +0200

    - updated to 3.21.1

 scintilla-glib.patch |  20 +++++
 scintilla-make.patch | 205 ++++++++++++++++++++++++++++++++++-----------------
 scintilla.spec       |  13 ++--
 3 files changed, 166 insertions(+), 72 deletions(-)
---
diff --git a/scintilla.spec b/scintilla.spec
index 0541d92..432d519 100644
--- a/scintilla.spec
+++ b/scintilla.spec
@@ -1,15 +1,17 @@
 Summary:	Free source code editing component for GTK+ and Win32
 Summary(pl.UTF-8):	Wolnodostępna kontrolka edycyjna dla GTK+ i Win32
 Name:		scintilla
-Version:	3.10.3
+Version:	3.21.1
 %define	fver	%(echo %{version} | tr -d .)
 Release:	1
 License:	BSD-like
 Group:		Libraries
-Source0:	http://downloads.sourceforge.net/scintilla/%{name}%{fver}.tgz
-# Source0-md5:	83db473eee8673970540197c9121c4f6
+Source0:	https://downloads.sourceforge.net/scintilla/%{name}%{fver}.tgz
+# Source0-md5:	99ae337cb6e06a50cac099a6f1ec7100
 Patch0:		%{name}-make.patch
-URL:		http://scintilla.org/
+Patch1:		%{name}-glib.patch
+URL:		https://scintilla.org/
+BuildRequires:	glib2-devel >= 2.0
 BuildRequires:	gtk+3-devel >= 3.0
 BuildRequires:	libstdc++-devel >= 6:4.8
 BuildRequires:	libtool
@@ -72,6 +74,7 @@ Statyczna biblioteka scintilla.
 %prep
 %setup -q -n %{name}%{fver}
 %patch -P0 -p1
+%patch -P1 -p1
 
 %build
 %{__make} -C gtk \
@@ -90,7 +93,7 @@ install -d $RPM_BUILD_ROOT%{_includedir}/%{name}
 	libdir="%{_libdir}" \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}
+cp -p include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/scintilla-glib.patch b/scintilla-glib.patch
new file mode 100644
index 0000000..f41811a
--- /dev/null
+++ b/scintilla-glib.patch
@@ -0,0 +1,20 @@
+--- scintilla3211/gtk/ScintillaGTKAccessible.cxx.orig	2020-09-12 17:33:27.000000000 +0200
++++ scintilla3211/gtk/ScintillaGTKAccessible.cxx	2025-07-03 06:22:28.846158697 +0200
+@@ -1004,7 +1004,7 @@ static gpointer scintilla_object_accessi
+ 
+ // @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(&type_id_result)) {
+ 		GTypeInfo tinfo = {
+@@ -1095,7 +1095,7 @@ AtkObject *ScintillaGTKAccessible::Widge
+ #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(&registered)) {
+ 		// Figure out whether accessibility is enabled by looking at the type of the accessible
diff --git a/scintilla-make.patch b/scintilla-make.patch
index ca6315e..4d763f5 100644
--- a/scintilla-make.patch
+++ b/scintilla-make.patch
@@ -1,49 +1,42 @@
---- scintilla3103/gtk/makefile.orig	2019-04-10 09:45:15.191390693 +0200
-+++ scintilla3103/gtk/makefile	2019-04-10 09:48:56.756857036 +0200
-@@ -6,7 +6,7 @@
- # Builds for GTK+ 2 and no longer supports GTK+ 1.
- # Also works with ming32-make on Windows.
+--- scintilla3211/gtk/makefile.orig	2020-09-12 17:33:27.000000000 +0200
++++ scintilla3211/gtk/makefile	2025-07-02 22:22:18.758750143 +0200
+@@ -9,7 +9,7 @@
+ 
+ .PHONY: all clean analyze depend
  
 -.SUFFIXES: .cxx .c .o .h .a .list
 +.SUFFIXES: .cxx .c .o .h .a .lo .la .list
  
  srcdir ?= .
- 
-@@ -49,7 +49,7 @@
- COMPLIB=$(srcdir)\..\bin\scintilla.a
+ basedir = $(srcdir)/..
+@@ -59,7 +59,7 @@ DEL = del /q
  else
  DEL = rm -f
--COMPLIB=$(srcdir)/../bin/scintilla.a
-+COMPLIB=$(srcdir)/../bin/libscintilla.la
  endif
+-COMPLIB=$(basedir)/bin/scintilla.a
++COMPLIB=$(basedir)/bin/libscintilla.la
  
- vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
-@@ -74,28 +74,28 @@
- 
- ifdef DEBUG
- ifdef CLANG
--CTFLAGS=-DDEBUG -g -fsanitize=$(SANITIZE) $(CXXBASEFLAGS) $(THREADFLAGS)
-+CTFLAGS=-DDEBUG $(OPTFLAGS) -fsanitize=$(SANITIZE) $(CXXBASEFLAGS) $(THREADFLAGS)
- else
--CTFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
-+CTFLAGS=-DDEBUG $(OPTFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS)
- endif
- else
--CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
-+CTFLAGS=-DNDEBUG $(OPTFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS)
+ vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib
+ vpath %.c $(srcdir)
+@@ -74,24 +74,24 @@ DEFINES += -DNO_CXX11_REGEX
  endif
  
- CXXTFLAGS:=--std=gnu++0x $(CTFLAGS) $(REFLAGS)
+ DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
+-BASE_FLAGS += $(if $(DEBUG),-g,-Os)
++BASE_FLAGS += $(OPTFLAGS)
+ 
+ CXX_BASE_FLAGS =--std=c++11 $(BASE_FLAGS)
+ CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS) $(CONFIG_FLAGS)
  ifdef LPEG_LEXER
- CXXTFLAGS+=-DLPEG_LEXER -I ../src/lua
- LUA_CFLAGS:=-std=c99 -pedantic -Wall -I ../src/lua -DLUA_USE_POSIX -DLUA_USE_DLOPEN
--LUAOBJS:=lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o linit.o \
+ CXX_BASE_FLAGS += -DLPEG_LEXER -I ../lua/src
+ LUA_CFLAGS:=-fPIC -std=c99 -pedantic -Wall -I ../lua/src -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+-LUA_OBJS:=lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o linit.o \
 -         llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
 -         ltable.o ltm.o lundump.o lvm.o lzio.o \
 -         lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o \
 -         lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o \
 -         lpcap.o lpcode.o lpprint.o lptree.o lpvm.o
-+LUAOBJS:=lapi.lo lcode.lo lctype.lo ldebug.lo ldo.lo ldump.lo lfunc.lo lgc.lo linit.lo \
++LUA_OBJS:=lapi.lo lcode.lo lctype.lo ldebug.lo ldo.lo ldump.lo lfunc.lo lgc.lo linit.lo \
 +         llex.lo lmem.lo lobject.lo lopcodes.lo lparser.lo lstate.lo lstring.lo \
 +         ltable.lo ltm.lo lundump.lo lvm.lo lzio.lo \
 +         lauxlib.lo lbaselib.lo lbitlib.lo lcorolib.lo ldblib.lo liolib.lo \
@@ -51,57 +44,135 @@
 +         lpcap.lo lpcode.lo lpprint.lo lptree.lo lpvm.lo
  endif
  
- CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
+ 
+ CONFIG_FLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION))
 -MARSHALLER=scintilla-marshal.o
 +MARSHALLER=scintilla-marshal.lo
  
  all: $(COMPLIB)
  
-@@ -104,10 +104,12 @@
+@@ -100,10 +100,14 @@ clean:
  
- .cxx.o:
- 	$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
-+.cxx.lo:
-+	libtool --tag=CXX --mode=compile $(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
- $(MARSHALLER): scintilla-marshal.c
--	$(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $<
--$(LUAOBJS): %.o: ../lua/src/%.c
+ %.o: %.cxx
+ 	$(CXX) $(CPPFLAGS) $(CXX_ALL_FLAGS) $(CXXFLAGS) -c $<
++%.lo: %.cxx
++	libtool --tag=CXX --mode=compile $(CXX) $(CPPFLAGS) $(CXX_ALL_FLAGS) $(CXXFLAGS) -c $<
+ %.o: %.c
+ 	$(CC) $(CPPFLAGS) $(DEFINES) $(INCLUDES) $(CONFIG_FLAGS) $(BASE_FLAGS) $(CFLAGS) -w -c $<
+-$(LUA_OBJS): %.o: ../lua/src/%.c
 -	$(CC) $(LUA_CFLAGS) $(CFLAGS) -c $<
-+	libtool --tag=CC --mode=compile $(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $<
-+$(LUAOBJS): %.lo: ../lua/src/%.c
++%.lo: %.c
++	libtool --tag=CC --mode=compile $(CC) $(CPPFLAGS) $(DEFINES) $(INCLUDES) $(CONFIG_FLAGS) $(BASE_FLAGS) $(CFLAGS) -w -c $<
++$(LUA_OBJS): %.lo: ../lua/src/%.c
 +	libtool --tag=CC --mode=compile $(CC) $(LUA_CFLAGS) $(CFLAGS) -c $<
  
  GLIB_GENMARSHAL = glib-genmarshal
  GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal
-@@ -117,7 +119,7 @@
- .list.c:
- 	$(GLIB_GENMARSHAL) --body $(GLIB_GENMARSHAL_FLAGS) $< > $@
- 
--LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx)))))
-+LEXOBJS:=$(addsuffix .lo,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx)))))
- 
- analyze:
- 	clang --analyze $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) $(srcdir)/*.cxx $(srcdir)/../src/*.cxx $(srcdir)/../lexlib/*.cxx $(srcdir)/../lexers/*.cxx
-@@ -129,15 +131,18 @@
- deps.mak:
- 	$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(DEPSRCS) | sed -e 's/\/usr.* //' | grep [a-zA-Z] > $@
- 
--$(COMPLIB): Accessor.o CharacterSet.o DefaultLexer.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \
--	CharClassify.o Decoration.o Document.o PerLine.o Catalogue.o CallTip.o CaseConvert.o CaseFolder.o \
--	ScintillaBase.o ContractionState.o EditModel.o Editor.o EditView.o ExternalLexer.o MarginView.o \
--	PropSetSimple.o PlatGTK.o \
--	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \
--	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
-+$(COMPLIB): Accessor.lo CharacterSet.lo DefaultLexer.lo LexerBase.lo LexerModule.lo LexerSimple.lo StyleContext.lo WordList.lo \
-+	CharClassify.lo Decoration.lo Document.lo PerLine.lo Catalogue.lo CallTip.lo CaseConvert.lo CaseFolder.lo \
-+	ScintillaBase.lo ContractionState.lo EditModel.lo Editor.lo EditView.lo ExternalLexer.lo MarginView.lo \
-+	PropSetSimple.lo PlatGTK.lo \
-+	KeyMap.lo LineMarker.lo PositionCache.lo ScintillaGTK.lo ScintillaGTKAccessible.lo CellBuffer.lo CharacterCategory.lo ViewStyle.lo \
-+	RESearch.lo RunStyles.lo Selection.lo Style.lo Indicator.lo AutoComplete.lo UniConversion.lo XPM.lo \
- 	$(MARSHALLER) $(LEXOBJS) $(LUAOBJS)
+@@ -119,62 +123,65 @@ analyze:
+ depend deps.mak:
+ 	python DepGen.py
+ 
+-LEX_OBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(basedir)/lexers/Lex*.cxx)))))
++LEX_OBJS:=$(addsuffix .lo,$(basename $(sort $(notdir $(wildcard $(basedir)/lexers/Lex*.cxx)))))
+ 
+ # Required for base Scintilla
+ SRC_OBJS = \
+-	AutoComplete.o \
+-	CallTip.o \
+-	CaseConvert.o \
+-	CaseFolder.o \
+-	CellBuffer.o \
+-	CharacterCategory.o \
+-	CharacterSet.o \
+-	CharClassify.o \
+-	ContractionState.o \
+-	DBCS.o \
+-	Decoration.o \
+-	Document.o \
+-	EditModel.o \
+-	Editor.o \
+-	EditView.o \
+-	Indicator.o \
+-	KeyMap.o \
+-	LineMarker.o \
+-	MarginView.o \
+-	PerLine.o \
+-	PositionCache.o \
+-	RESearch.o \
+-	RunStyles.o \
+-	Selection.o \
+-	Style.o \
+-	UniConversion.o \
+-	UniqueString.o \
+-	ViewStyle.o \
+-	XPM.o
++	AutoComplete.lo \
++	CallTip.lo \
++	CaseConvert.lo \
++	CaseFolder.lo \
++	CellBuffer.lo \
++	CharacterCategory.lo \
++	CharacterSet.lo \
++	CharClassify.lo \
++	ContractionState.lo \
++	DBCS.lo \
++	Decoration.lo \
++	Document.lo \
++	EditModel.lo \
++	Editor.lo \
++	EditView.lo \
++	Indicator.lo \
++	KeyMap.lo \
++	LineMarker.lo \
++	MarginView.lo \
++	PerLine.lo \
++	PositionCache.lo \
++	RESearch.lo \
++	RunStyles.lo \
++	Selection.lo \
++	Style.lo \
++	UniConversion.lo \
++	UniqueString.lo \
++	ViewStyle.lo \
++	XPM.lo
+ 
+ # Required by lexers
+ LEXLIB_OBJS = \
+-	Accessor.o \
+-	Catalogue.o \
+-	DefaultLexer.o \
+-	ExternalLexer.o \
+-	LexerBase.o \
+-	LexerModule.o \
+-	LexerSimple.o \
+-	PropSetSimple.o \
+-	StyleContext.o \
+-	WordList.o
++	Accessor.lo \
++	Catalogue.lo \
++	DefaultLexer.lo \
++	ExternalLexer.lo \
++	LexerBase.lo \
++	LexerModule.lo \
++	LexerSimple.lo \
++	PropSetSimple.lo \
++	StyleContext.lo \
++	WordList.lo
+ 
+ GTK_OBJS = \
+-	ScintillaBase.o \
+-	PlatGTK.o \
+-	ScintillaGTK.o \
+-	ScintillaGTKAccessible.o
++	ScintillaBase.lo \
++	PlatGTK.lo \
++	ScintillaGTK.lo \
++	ScintillaGTKAccessible.lo
+ 
+ $(COMPLIB): $(SRC_OBJS) $(LEXLIB_OBJS) $(GTK_OBJS) $(MARSHALLER) $(LEX_OBJS) $(LUA_OBJS)
 -	$(AR) $(ARFLAGS) $@ $^
 -	$(RANLIB) $@
-+	libtool --tag=CXX --mode=link $(CXX) -o $@ $^ -rpath $(libdir) -version-info 3:0:0 $(shell pkg-config --libs $(GTKVERSION))
++	libtool --tag=CXX --mode=link $(CXX) -o $@ $^ -rpath $(libdir) -version-info 3:0:0 $(shell $(PKG_CONFIG) --libs $(GTK_VERSION))
 +
 +install: $(COMPLIB)
 +	install -d $(DESTDIR)$(libdir)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/scintilla.git/commitdiff/7a624b58f9f1476e09c9fac502c5ce5d2bf9900e

More information about the pld-cvs-commit mailing list