Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update the patch for Scintilla to work with 3.7.5, 3.7.6 #1608

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update the patch for Scintilla to work with 3.7.5, 3.7.6 #1608

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions scintilla/scintilla_changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
A patch to Scintilla 3.54 containing our changes to Scintilla
(removing unused lexers, exporting symbols, and an updated marshallers file).
A patch to Scintilla LongTerm3 3.7.{5,6} containing our changes to Scintilla
(removing unused lexers, exporting symbols).
diff --git scintilla/gtk/ScintillaGTK.cxx scintilla/gtk/ScintillaGTK.cxx
index 0871ca2..49dc278 100644
index 0737b71..3e48ed6 100644
--- scintilla/gtk/ScintillaGTK.cxx
+++ scintilla/gtk/ScintillaGTK.cxx
@@ -3046,11 +3046,13 @@ sptr_t ScintillaGTK::DirectFunction(
@@ -2965,11 +2965,13 @@ sptr_t ScintillaGTK::DirectFunction(
}

/* legacy name for scintilla_object_send_message */
Expand All @@ -18,39 +18,39 @@ index 0871ca2..49dc278 100644
gintptr scintilla_object_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
return scintilla_send_message(sci, iMessage, wParam, lParam);
}
@@ -3062,6 +3064,7 @@ extern void Platform_Initialise();
@@ -2981,6 +2983,7 @@ extern void Platform_Initialise();
extern void Platform_Finalise();

/* legacy name for scintilla_object_get_type */
+GEANY_API_SYMBOL
GType scintilla_get_type() {
static GType scintilla_type = 0;
try {
@@ -3091,6 +3094,7 @@ GType scintilla_get_type() {
@@ -3010,6 +3013,7 @@ GType scintilla_get_type() {
return scintilla_type;
}

+GEANY_API_SYMBOL
GType scintilla_object_get_type() {
return scintilla_get_type();
}
@@ -3200,6 +3204,7 @@ static void scintilla_init(ScintillaObje
@@ -3118,6 +3122,7 @@ static void scintilla_init(ScintillaObject *sci) {
}

/* legacy name for scintilla_object_new */
+GEANY_API_SYMBOL
GtkWidget* scintilla_new() {
GtkWidget *widget = GTK_WIDGET(g_object_new(scintilla_get_type(), NULL));
gtk_widget_set_direction(widget, GTK_TEXT_DIR_LTR);
@@ -3207,6 +3212,7 @@ GtkWidget* scintilla_new() {
@@ -3125,6 +3130,7 @@ GtkWidget* scintilla_new() {
return widget;
}

+GEANY_API_SYMBOL
GtkWidget *scintilla_object_new() {
return scintilla_new();
}
@@ -3250,6 +3250,7 @@ void scintilla_release_resources(void) {
@@ -3147,6 +3153,7 @@ void scintilla_release_resources(void) {
static void *copy_(void *src) { return src; }
static void free_(void *) { }

Expand All @@ -59,10 +59,10 @@ index 0871ca2..49dc278 100644
static gsize type_id = 0;
if (g_once_init_enter(&type_id)) {
diff --git scintilla/src/Catalogue.cxx scintilla/src/Catalogue.cxx
index ed47aa8..e58f1ab 100644
index c4f7a7e..aeb12b3 100644
--- scintilla/src/Catalogue.cxx
+++ scintilla/src/Catalogue.cxx
@@ -77,123 +77,50 @@ int Scintilla_LinkLexers() {
@@ -72,123 +72,50 @@ int Scintilla_LinkLexers() {

//++Autogenerated -- run scripts/LexGen.py to regenerate
//**\(\tLINK_LEXER(\*);\n\)
Expand Down