scintilla/scintilla_changes.patch

   1 A patch to Scintilla 3.54 containing our changes to Scintilla
   2 (removing unused lexers, exporting symbols, and an updated marshallers file).
   3 diff --git scintilla/gtk/ScintillaGTK.cxx scintilla/gtk/ScintillaGTK.cxx
   4 index 0871ca2..49dc278 100644
   5 --- scintilla/gtk/ScintillaGTK.cxx
   6 +++ scintilla/gtk/ScintillaGTK.cxx
   7 @@ -3046,11 +3046,13 @@ sptr_t ScintillaGTK::DirectFunction(
   8  }
   9
  10  /* legacy name for scintilla_object_send_message */
  11 +GEANY_API_SYMBOL
  12  sptr_t scintilla_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
  13         ScintillaGTK *psci = static_cast<ScintillaGTK *>(sci->pscin);
  14         return psci->WndProc(iMessage, wParam, lParam);
  15  }
  16
  17 +GEANY_API_SYMBOL
  18  sptr_t scintilla_object_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
  19         return scintilla_send_message(sci, iMessage, wParam, lParam);
  20  }
  21 @@ -3062,6 +3064,7 @@ extern void Platform_Initialise();
  22  extern void Platform_Finalise();
  23
  24  /* legacy name for scintilla_object_get_type */
  25 +GEANY_API_SYMBOL
  26  GType scintilla_get_type() {
  27         static GType scintilla_type = 0;
  28         try {
  29 @@ -3091,6 +3094,7 @@ GType scintilla_get_type() {
  30         return scintilla_type;
  31  }
  32
  33 +GEANY_API_SYMBOL
  34  GType scintilla_object_get_type() {
  35         return scintilla_get_type();
  36  }
  37 @@ -3200,6 +3204,7 @@ static void scintilla_init(ScintillaObje
  38  }
  39
  40  /* legacy name for scintilla_object_new */
  41 +GEANY_API_SYMBOL
  42  GtkWidget* scintilla_new() {
  43         GtkWidget *widget = GTK_WIDGET(g_object_new(scintilla_get_type(), NULL));
  44         gtk_widget_set_direction(widget, GTK_TEXT_DIR_LTR);
  45 @@ -3207,6 +3212,7 @@ GtkWidget* scintilla_new() {
  46         return widget;
  47  }
  48
  49 +GEANY_API_SYMBOL
  50  GtkWidget *scintilla_object_new() {
  51         return scintilla_new();
  52  }
  53 diff --git scintilla/gtk/scintilla-marshal.c scintilla/gtk/scintilla-marshal.c
  54 index be57b7c..cee3e73 100644
  55 --- scintilla/gtk/scintilla-marshal.c
  56 +++ scintilla/gtk/scintilla-marshal.c
  57 @@ -35,8 +35,8 @@
  58  #define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
  59  #define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
  60  #define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
  61 -#define g_marshal_value_peek_enum(v)     (v)->data[0].v_int
  62 -#define g_marshal_value_peek_flags(v)    (v)->data[0].v_uint
  63 +#define g_marshal_value_peek_enum(v)     (v)->data[0].v_long
  64 +#define g_marshal_value_peek_flags(v)    (v)->data[0].v_ulong
  65  #define g_marshal_value_peek_float(v)    (v)->data[0].v_float
  66  #define g_marshal_value_peek_double(v)   (v)->data[0].v_double
  67  #define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
  68 @@ -50,10 +50,10 @@
  69  /* NONE:INT,POINTER (scintilla-marshal.list:1) */
  70  void
  71  scintilla_marshal_VOID__INT_POINTER (GClosure     *closure,
  72 -                                     GValue       *return_value,
  73 +                                     GValue       *return_value G_GNUC_UNUSED,
  74                                       guint         n_param_values,
  75                                       const GValue *param_values,
  76 -                                     gpointer      invocation_hint,
  77 +                                     gpointer      invocation_hint G_GNUC_UNUSED,
  78                                       gpointer      marshal_data)
  79  {
  80    typedef void (*GMarshalFunc_VOID__INT_POINTER) (gpointer     data1,
  81 diff --git scintilla/src/Catalogue.cxx scintilla/src/Catalogue.cxx
  82 index ed47aa8..e58f1ab 100644
  83 --- scintilla/src/Catalogue.cxx
  84 +++ scintilla/src/Catalogue.cxx
  85 @@ -77,120 +77,50 @@ int Scintilla_LinkLexers() {
  86
  87  //++Autogenerated -- run scripts/LexGen.py to regenerate
  88  //**\(\tLINK_LEXER(\*);\n\)
  89 -       LINK_LEXER(lmA68k);
  90         LINK_LEXER(lmAbaqus);
  91         LINK_LEXER(lmAda);
  92 -       LINK_LEXER(lmAPDL);
  93 -       LINK_LEXER(lmAs);
  94         LINK_LEXER(lmAsm);
  95 -       LINK_LEXER(lmAsn1);
  96 -       LINK_LEXER(lmASY);
  97 -       LINK_LEXER(lmAU3);
  98 -       LINK_LEXER(lmAVE);
  99 -       LINK_LEXER(lmAVS);
 100 -       LINK_LEXER(lmBaan);
 101         LINK_LEXER(lmBash);
 102         LINK_LEXER(lmBatch);
 103 -       LINK_LEXER(lmBibTeX);
 104 -       LINK_LEXER(lmBlitzBasic);
 105 -       LINK_LEXER(lmBullant);
 106         LINK_LEXER(lmCaml);
 107 -       LINK_LEXER(lmClw);
 108 -       LINK_LEXER(lmClwNoCase);
 109         LINK_LEXER(lmCmake);
 110         LINK_LEXER(lmCOBOL);
 111         LINK_LEXER(lmCoffeeScript);
 112 -       LINK_LEXER(lmConf);
 113         LINK_LEXER(lmCPP);
 114 -       LINK_LEXER(lmCPPNoCase);
 115 -       LINK_LEXER(lmCsound);
 116         LINK_LEXER(lmCss);
 117         LINK_LEXER(lmD);
 118         LINK_LEXER(lmDiff);
 119 -       LINK_LEXER(lmDMAP);
 120 -       LINK_LEXER(lmDMIS);
 121 -       LINK_LEXER(lmECL);
 122 -       LINK_LEXER(lmEiffel);
 123 -       LINK_LEXER(lmEiffelkw);
 124         LINK_LEXER(lmErlang);
 125 -       LINK_LEXER(lmErrorList);
 126 -       LINK_LEXER(lmESCRIPT);
 127         LINK_LEXER(lmF77);
 128 -       LINK_LEXER(lmFlagShip);
 129         LINK_LEXER(lmForth);
 130         LINK_LEXER(lmFortran);
 131         LINK_LEXER(lmFreeBasic);
 132 -       LINK_LEXER(lmGAP);
 133 -       LINK_LEXER(lmGui4Cli);
 134         LINK_LEXER(lmHaskell);
 135         LINK_LEXER(lmHTML);
 136 -       LINK_LEXER(lmIHex);
 137 -       LINK_LEXER(lmInno);
 138 -       LINK_LEXER(lmKix);
 139 -       LINK_LEXER(lmKVIrc);
 140         LINK_LEXER(lmLatex);
 141         LINK_LEXER(lmLISP);
 142 -       LINK_LEXER(lmLiterateHaskell);
 143 -       LINK_LEXER(lmLot);
 144 -       LINK_LEXER(lmLout);
 145         LINK_LEXER(lmLua);
 146 -       LINK_LEXER(lmMagikSF);
 147         LINK_LEXER(lmMake);
 148         LINK_LEXER(lmMarkdown);
 149 -       LINK_LEXER(lmMatlab);
 150 -       LINK_LEXER(lmMETAPOST);
 151 -       LINK_LEXER(lmMMIXAL);
 152 -       LINK_LEXER(lmModula);
 153 -       LINK_LEXER(lmMSSQL);
 154 -       LINK_LEXER(lmMySQL);
 155 -       LINK_LEXER(lmNimrod);
 156 -       LINK_LEXER(lmNncrontab);
 157 +       // We use Octave instead of Matlab
 158         LINK_LEXER(lmNsis);
 159         LINK_LEXER(lmNull);
 160         LINK_LEXER(lmOctave);
 161 -       LINK_LEXER(lmOpal);
 162 -       LINK_LEXER(lmOScript);
 163         LINK_LEXER(lmPascal);
 164 -       LINK_LEXER(lmPB);
 165         LINK_LEXER(lmPerl);
 166         LINK_LEXER(lmPHPSCRIPT);
 167 -       LINK_LEXER(lmPLM);
 168         LINK_LEXER(lmPO);
 169 -       LINK_LEXER(lmPOV);
 170 -       LINK_LEXER(lmPowerPro);
 171         LINK_LEXER(lmPowerShell);
 172 -       LINK_LEXER(lmProgress);
 173         LINK_LEXER(lmProps);
 174 -       LINK_LEXER(lmPS);
 175 -       LINK_LEXER(lmPureBasic);
 176         LINK_LEXER(lmPython);
 177         LINK_LEXER(lmR);
 178 -       LINK_LEXER(lmREBOL);
 179 -       LINK_LEXER(lmRegistry);
 180         LINK_LEXER(lmRuby);
 181         LINK_LEXER(lmRust);
 182 -       LINK_LEXER(lmScriptol);
 183 -       LINK_LEXER(lmSmalltalk);
 184 -       LINK_LEXER(lmSML);
 185 -       LINK_LEXER(lmSorc);
 186 -       LINK_LEXER(lmSpecman);
 187 -       LINK_LEXER(lmSpice);
 188         LINK_LEXER(lmSQL);
 189 -       LINK_LEXER(lmSrec);
 190 -       LINK_LEXER(lmSTTXT);
 191 -       LINK_LEXER(lmTACL);
 192 -       LINK_LEXER(lmTADS3);
 193 -       LINK_LEXER(lmTAL);
 194         LINK_LEXER(lmTCL);
 195 -       LINK_LEXER(lmTCMD);
 196 -       LINK_LEXER(lmTEHex);
 197 -       LINK_LEXER(lmTeX);
 198         LINK_LEXER(lmTxt2tags);
 199 -       LINK_LEXER(lmVB);
 200 -       LINK_LEXER(lmVBScript);
 201         LINK_LEXER(lmVerilog);
 202         LINK_LEXER(lmVHDL);
 203 -       LINK_LEXER(lmVisualProlog);
 204         LINK_LEXER(lmXML);
 205         LINK_LEXER(lmYAML);
 206