diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/scintilla.patch | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index bec42794..d1056195 100644 --- a/src/Makefile +++ b/src/Makefile @@ -345,7 +345,7 @@ else gtdialog_url = $(root_url)/gtdialog/archive/default.zip endif -scintilla_tgz = scintilla511.tgz +scintilla_tgz = scintilla513.tgz lexilla_tgz = lexilla510.tgz scinterm_zip = scinterm_3.1.zip scintillua_zip = scintillua_5.2.zip diff --git a/src/scintilla.patch b/src/scintilla.patch index 74fba967..deeefcc1 100644 --- a/src/scintilla.patch +++ b/src/scintilla.patch @@ -3,6 +3,7 @@ Scintilla changes: * Add Message::ChangeInsertion for programmatically setting input method. This is helpful on newer versions of macOS, where changing the input method is flaky. * Handle leading whitespace in XPM images in order to prevent crashes. +* Fixed crash in upstream Scintilla that will ultimately be fixed. diff -r 52d56f79dc0f gtk/ScintillaGTK.cxx --- a/gtk/ScintillaGTK.cxx Fri Apr 09 15:11:26 2021 +1000 @@ -32,3 +33,16 @@ diff -r 22b6bbb36280 src/XPM.cxx if ((0 == memcmp(textForm, "/* X", 4)) && (0 == memcmp(textForm, "/* XPM */", 9))) { // Build the lines form out of the text form std::vector<const char *> linesForm = LinesFormFromTextForm(textForm); +diff -r beeb51d2c645 gtk/ScintillaGTK.cxx +--- a/gtk/ScintillaGTK.cxx Wed Sep 29 10:29:58 2021 +1000 ++++ b/gtk/ScintillaGTK.cxx Thu Sep 30 16:28:06 2021 -0400 +@@ -282,9 +282,6 @@ + if (settingsHandlerId) { + g_signal_handler_disconnect(settings, settingsHandlerId); + } +- if (settings) { +- g_object_unref(settings); +- } + } + + void ScintillaGTK::RealizeThis(GtkWidget *widget) { |