[Github-comments] [geany/geany] Update Scintilla to version 5.1.1 (9c8451f)

Robert Di Pardo notifications at xxxxx
Thu Aug 19 23:44:07 UTC 2021


Heads up: `lexlib` was moved into the `lexilla` source tree, so that last include statement does nothing.

Try including `scintilla/src` instead:
```diff
diff --git a/scintilla/Makefile.am b/scintilla/Makefile.am
index 4fe3851c0..543b7a4d6 100644
--- a/scintilla/Makefile.am
+++ b/scintilla/Makefile.am
@@ -175,7 +175,7 @@ liblexilla_la_CPPFLAGS += -I$(srcdir)/lexilla/include -I$(srcdir)/lexilla/lexlib
 liblexilla_la_SOURCES = $(LEXLIB_SRCS) $(LEXER_SRCS)
 
 libscintilla_la_CPPFLAGS = $(AM_CPPFLAGS)
-libscintilla_la_CPPFLAGS += -I$(top_srcdir) -I$(srcdir)/include -I$(srcdir)/lexlib 
+libscintilla_la_CPPFLAGS += -I$(top_srcdir) -I$(srcdir)/include -I$(srcdir)/src
 libscintilla_la_SOURCES = $(SRCS)
 
 marshallers: gtk/scintilla-marshal.list
```
That might resolve your [header resolution problem](https://app.travis-ci.com/github/geany/geany/jobs/532735207#L1222):
```
make[2]: Leaving directory '/home/travis/build/geany/geany/_build/ctags'
Making all in scintilla
make[2]: Entering directory '/home/travis/build/geany/geany/_build/scintilla'
  CXX      gtk/libscintilla_la-PlatGTK.lo
  CXX      gtk/libscintilla_la-ScintillaGTK.lo
../../scintilla/gtk/PlatGTK.cxx:30:10: fatal error: Debugging.h: No such file or directory
 #include "Debugging.h"
          ^~~~~~~~~~~~~
```

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/commit/9c8451f77a7d8f027edfb6d0e53001059903c4ff#commitcomment-55166162
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.geany.org/pipermail/github-comments/attachments/20210819/baeda4a7/attachment.htm>


More information about the Github-comments mailing list