Files
scintilla/scintilla-shared.patch

31 lines
1.0 KiB
Diff
Raw Permalink Normal View History

Accepting request 512835 from home:badshah400:branches:server:database - Update to version 3.7.5: * Added a caret line frame as an alternative visual for highlighting the caret line. * Added "Reverse Selected Lines" feature. * SciTE adds "Select All Bookmarks" command. * SciTE adds a save.path.suggestion setting to suggest a file name when saving an unnamed buffer. * Updated case conversion and character categories to Unicode 9. * The Baan lexer recognizes numeric literals in a more compliant manner including hexadecimal numbers and exponentials. * The Bash lexer recognizes strings in lists in more cases. Bug #1944. * The Fortran lexer recognizes a preprocessor line after a line continuation &. Bug #1935. * The Fortran folder can fold comments. Bug #1936. * The PowerShell lexer recognizes escaped quotes in strings. Bug #1929. * The Python lexer recognizes identifiers more accurately when they include non-ASCII characters. * The Python folder treats comments at the end of the file as separate from the preceding structure. * The YAML lexer recognizes comments in more situations and styles a "..." line like a "---" line. Bug #1931. * Update scroll bar when annotations added, removed, or visibility changed. Feature #1187. * Canceling modes with the Esc key preserves a rectangular selection. Bug #1940. * Builds are made with a sorted list of lexers to be more reproducible. Bug #1946. * SciTE examines at most 1 MB of a file to automatically OBS-URL: https://build.opensuse.org/request/show/512835 OBS-URL: https://build.opensuse.org/package/show/server:database/scintilla?expand=0&rev=27
2017-07-27 20:26:45 +00:00
Index: scintilla/gtk/makefile
===================================================================
Accepting request 512835 from home:badshah400:branches:server:database - Update to version 3.7.5: * Added a caret line frame as an alternative visual for highlighting the caret line. * Added "Reverse Selected Lines" feature. * SciTE adds "Select All Bookmarks" command. * SciTE adds a save.path.suggestion setting to suggest a file name when saving an unnamed buffer. * Updated case conversion and character categories to Unicode 9. * The Baan lexer recognizes numeric literals in a more compliant manner including hexadecimal numbers and exponentials. * The Bash lexer recognizes strings in lists in more cases. Bug #1944. * The Fortran lexer recognizes a preprocessor line after a line continuation &. Bug #1935. * The Fortran folder can fold comments. Bug #1936. * The PowerShell lexer recognizes escaped quotes in strings. Bug #1929. * The Python lexer recognizes identifiers more accurately when they include non-ASCII characters. * The Python folder treats comments at the end of the file as separate from the preceding structure. * The YAML lexer recognizes comments in more situations and styles a "..." line like a "---" line. Bug #1931. * Update scroll bar when annotations added, removed, or visibility changed. Feature #1187. * Canceling modes with the Esc key preserves a rectangular selection. Bug #1940. * Builds are made with a sorted list of lexers to be more reproducible. Bug #1946. * SciTE examines at most 1 MB of a file to automatically OBS-URL: https://build.opensuse.org/request/show/512835 OBS-URL: https://build.opensuse.org/package/show/server:database/scintilla?expand=0&rev=27
2017-07-27 20:26:45 +00:00
--- scintilla.orig/gtk/makefile
+++ scintilla/gtk/makefile
@@ -67,7 +67,7 @@ DEL = del /q
else
DEL = rm -f
endif
-COMPLIB=$(basedir)/bin/scintilla.a
+COMPLIB=$(basedir)/bin/libscintilla.la
COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION)
vpath %.h $(srcdir) $(basedir)/src $(basedir)/include
@@ -83,7 +83,7 @@ DEFINES += -DNO_CXX11_REGEX
endif
DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
-BASE_FLAGS += $(if $(DEBUG),-g,-O3)
+BASE_FLAGS += $(if $(DEBUG),-g)
CXX_BASE_FLAGS =--std=c++17 $(BASE_FLAGS)
CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS) $(CONFIG_FLAGS)
@@ -164,6 +164,7 @@ GTK_OBJS = \
$(COMPLIB): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER)
$(AR) $(ARFLAGS) $@ $^
$(RANLIB) $@
+ libtool --mode=link gcc $(CONFIGFLAGS) -o $@ $^ -rpath $(LIBDIR) $(CONFIGLDFLAGS) -version-info $(VERSION)
$(COMPONENT): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER)
$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(CONFIGLIB)