[Github-comments] [geany/geany] Update Scintilla to version 4.4.5 (#2600)

Thomas Martitz notifications at xxxxx
Mon Sep 28 17:44:18 UTC 2020 

Starting with scintilla 4.x I would like to use a new method for import scintilla. 

We keep a side branch scintilla-import that contains just plain upstream scintilla releases, i.e. the unpacked tarballs imported to git. This is done with a helper script achieve a linear history with file deletions properly reflected.

Integrating a release is done simply by merging the specific commit from the scintilla-import branch `git merge scintilla-import`.

The only downside is that we carry the complete tarball but we don't have to track/handle individual files anymore and properly handle deletions. Any changes we make to scintilla are automatically preserved by `git merge`
You can view, comment on, or merge this pull request online at:

  https://github.com/geany/geany/pull/2600

-- Commit Summary --

  * scintilla: delete geany from side branch to only include scintilla code
  * initial version of script for scintilla raw import
  * Import upstream scintilla from tarball, Version 440
  * Import upstream scintilla from tarball, Version 442
  * Import upstream scintilla from tarball, Version 443
  * Import upstream scintilla from tarball, Version 444
  * Import upstream scintilla from tarball, Version 445
  * Merge brach "scintilla-import"
  * scintilla: apply geany changes and restore compilation

-- File Changes --

    A scintilla/CONTRIBUTING (20)
    M scintilla/Makefile.am (2)
    M scintilla/README (110)
    A scintilla/bin/__init__.py (1)
    A scintilla/bin/empty.txt (1)
    A scintilla/cocoa/InfoBar.h (53)
    A scintilla/cocoa/InfoBar.mm (409)
    A scintilla/cocoa/InfoBarCommunicator.h (35)
    A scintilla/cocoa/PlatCocoa.h (126)
    A scintilla/cocoa/PlatCocoa.mm (2184)
    A scintilla/cocoa/QuartzTextLayout.h (109)
    A scintilla/cocoa/QuartzTextStyle.h (95)
    A scintilla/cocoa/QuartzTextStyleAttribute.h (72)
    A scintilla/cocoa/Scintilla/Info.plist (24)
    A scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj (811)
    A scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.xcworkspace/contents.xcworkspacedata (7)
    A scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (8)
    A scintilla/cocoa/Scintilla/module.modulemap (10)
    A scintilla/cocoa/ScintillaCocoa.h (253)
    A scintilla/cocoa/ScintillaCocoa.mm (2567)
    A scintilla/cocoa/ScintillaFramework/Info.plist (28)
    A scintilla/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj (1345)
    A scintilla/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.xcworkspace/contents.xcworkspacedata (7)
    A scintilla/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (8)
    A scintilla/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/xcshareddata/xcschemes/Scintilla.xcscheme (68)
    A scintilla/cocoa/ScintillaFramework/Scintilla_Prefix.pch (7)
    A scintilla/cocoa/ScintillaFramework/en.lproj/InfoPlist.strings (0)
    A scintilla/cocoa/ScintillaFramework/module.modulemap (10)
    A scintilla/cocoa/ScintillaTest/AppController.h (26)
    A scintilla/cocoa/ScintillaTest/AppController.mm (309)
    A scintilla/cocoa/ScintillaTest/Info.plist (28)
    A scintilla/cocoa/ScintillaTest/Scintilla-Info.plist (20)
    A scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj (431)
    A scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata (7)
    A scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (8)
    A scintilla/cocoa/ScintillaTest/ScintillaTest_Prefix.pch (7)
    A scintilla/cocoa/ScintillaTest/TestData.sql (215)
    A scintilla/cocoa/ScintillaTest/en.lproj/InfoPlist.strings (0)
    A scintilla/cocoa/ScintillaTest/en.lproj/MainMenu.xib (609)
    A scintilla/cocoa/ScintillaTest/main.m (15)
    A scintilla/cocoa/ScintillaView.h (169)
    A scintilla/cocoa/ScintillaView.mm (2174)
    A scintilla/cocoa/checkbuildosx.sh (66)
    A scintilla/cocoa/res/info_bar_bg.png (0)
    A scintilla/cocoa/res/info_bar_bg at 2x.png (0)
    A scintilla/cocoa/res/mac_cursor_busy.png (0)
    A scintilla/cocoa/res/mac_cursor_busy at 2x.png (0)
    A scintilla/cocoa/res/mac_cursor_flipped.png (0)
    A scintilla/cocoa/res/mac_cursor_flipped at 2x.png (0)
    A scintilla/cppcheck.suppress (218)
    A scintilla/delbin.bat (1)
    A scintilla/doc/AddSource.txt (30)
    A scintilla/doc/Design.html (246)
    A scintilla/doc/Icons.html (57)
    A scintilla/doc/Indicators.png (0)
    A scintilla/doc/Lexer.txt (226)
    A scintilla/doc/Markers.png (0)
    A scintilla/doc/Privacy.html (70)
    A scintilla/doc/SciBreak.jpg (0)
    A scintilla/doc/SciCoding.html (295)
    A scintilla/doc/SciRest.jpg (0)
    A scintilla/doc/SciTEIco.png (0)
    A scintilla/doc/SciWord.jpg (0)
    A scintilla/doc/ScintillaDoc.html (8797)
    A scintilla/doc/ScintillaDownload.html (71)
    A scintilla/doc/ScintillaHistory.html (13071)
    A scintilla/doc/ScintillaRelated.html (545)
    A scintilla/doc/ScintillaToDo.html (140)
    A scintilla/doc/ScintillaUsage.html (376)
    A scintilla/doc/Steps.html (142)
    A scintilla/doc/StyleMetadata.html (204)
    A scintilla/doc/annotations.png (0)
    A scintilla/doc/eolannotation.png (0)
    A scintilla/doc/index.html (196)
    A scintilla/doc/styledmargin.png (0)
    M scintilla/gtk/Converter.h (0)
    A scintilla/gtk/DepGen.py (23)
    M scintilla/gtk/PlatGTK.cxx (303)
    M scintilla/gtk/ScintillaGTK.cxx (20)
    M scintilla/gtk/ScintillaGTK.h (10)
    M scintilla/gtk/ScintillaGTKAccessible.cxx (1)
    A scintilla/gtk/deps.mak (1979)
    A scintilla/gtk/makefile (197)
    D scintilla/include/Compat.h (70)
    M scintilla/include/ILexer.h (22)
    M scintilla/include/Makefile.am (1)
    M scintilla/include/Platform.h (42)
    M scintilla/include/SciLexer.h (1)
    M scintilla/include/Scintilla.h (13)
    M scintilla/include/Scintilla.iface (29)
    A scintilla/lexers/LexA68k.cxx (345)
    A scintilla/lexers/LexAPDL.cxx (257)
    A scintilla/lexers/LexASY.cxx (270)
    A scintilla/lexers/LexAU3.cxx (908)
    A scintilla/lexers/LexAVE.cxx (229)
    A scintilla/lexers/LexAVS.cxx (291)
    M scintilla/lexers/LexAsm.cxx (6)
    A scintilla/lexers/LexAsn1.cxx (186)
    A scintilla/lexers/LexBaan.cxx (0)
    M scintilla/lexers/LexBash.cxx (0)
    M scintilla/lexers/LexBasic.cxx (0)
    A scintilla/lexers/LexBibTeX.cxx (0)
    A scintilla/lexers/LexBullant.cxx (0)
    A scintilla/lexers/LexCIL.cxx (0)
    A scintilla/lexers/LexCLW.cxx (0)
    M scintilla/lexers/LexCPP.cxx (0)
    A scintilla/lexers/LexConf.cxx (0)
    A scintilla/lexers/LexCrontab.cxx (0)
    A scintilla/lexers/LexCsound.cxx (0)
    M scintilla/lexers/LexD.cxx (0)
    A scintilla/lexers/LexDMAP.cxx (0)
    A scintilla/lexers/LexDMIS.cxx (0)
    A scintilla/lexers/LexDataflex.cxx (0)
    A scintilla/lexers/LexECL.cxx (0)
    A scintilla/lexers/LexEDIFACT.cxx (0)
    A scintilla/lexers/LexEScript.cxx (0)
    A scintilla/lexers/LexEiffel.cxx (0)
    A scintilla/lexers/LexErrorList.cxx (0)
    A scintilla/lexers/LexFlagship.cxx (0)
    A scintilla/lexers/LexGAP.cxx (0)
    A scintilla/lexers/LexGui4Cli.cxx (0)
    M scintilla/lexers/LexHTML.cxx (0)
    M scintilla/lexers/LexHaskell.cxx (0)
    A scintilla/lexers/LexHex.cxx (0)
    A scintilla/lexers/LexHollywood.cxx (0)
    A scintilla/lexers/LexIndent.cxx (0)
    A scintilla/lexers/LexInno.cxx (0)
    A scintilla/lexers/LexJSON.cxx (0)
    A scintilla/lexers/LexKVIrc.cxx (0)
    A scintilla/lexers/LexKix.cxx (0)
    M scintilla/lexers/LexLaTeX.cxx (0)
    A scintilla/lexers/LexLout.cxx (0)
    A scintilla/lexers/LexMMIXAL.cxx (0)
    A scintilla/lexers/LexMPT.cxx (0)
    A scintilla/lexers/LexMSSQL.cxx (0)
    A scintilla/lexers/LexMagik.cxx (0)
    A scintilla/lexers/LexMaxima.cxx (0)
    A scintilla/lexers/LexMetapost.cxx (0)
    A scintilla/lexers/LexModula.cxx (0)
    A scintilla/lexers/LexMySQL.cxx (0)
    A scintilla/lexers/LexNim.cxx (0)
    A scintilla/lexers/LexNimrod.cxx (0)
    A scintilla/lexers/LexOScript.cxx (0)
    A scintilla/lexers/LexOpal.cxx (0)
    A scintilla/lexers/LexPB.cxx (0)
    A scintilla/lexers/LexPLM.cxx (0)
    A scintilla/lexers/LexPOV.cxx (0)
    A scintilla/lexers/LexPS.cxx (0)
    M scintilla/lexers/LexPerl.cxx (0)
    A scintilla/lexers/LexPowerPro.cxx (0)
    A scintilla/lexers/LexProgress.cxx (0)
    M scintilla/lexers/LexPython.cxx (0)
    A scintilla/lexers/LexRaku.cxx (0)
    A scintilla/lexers/LexRebol.cxx (0)
    A scintilla/lexers/LexRegistry.cxx (0)
    M scintilla/lexers/LexRust.cxx (0)
    A scintilla/lexers/LexSAS.cxx (0)
    A scintilla/lexers/LexSML.cxx (0)
    M scintilla/lexers/LexSQL.cxx (0)
    A scintilla/lexers/LexSTTXT.cxx (0)
    A scintilla/lexers/LexScriptol.cxx (0)
    A scintilla/lexers/LexSmalltalk.cxx (0)
    A scintilla/lexers/LexSorcus.cxx (0)
    A scintilla/lexers/LexSpecman.cxx (0)
    A scintilla/lexers/LexSpice.cxx (0)
    A scintilla/lexers/LexStata.cxx (0)
    A scintilla/lexers/LexTACL.cxx (0)
    A scintilla/lexers/LexTADS3.cxx (0)
    A scintilla/lexers/LexTAL.cxx (0)
    A scintilla/lexers/LexTCMD.cxx (0)
    A scintilla/lexers/LexTeX.cxx (0)
    A scintilla/lexers/LexVB.cxx (0)
    M scintilla/lexers/LexVerilog.cxx (0)
    A scintilla/lexers/LexVisualProlog.cxx (0)
    A scintilla/lexers/LexX12.cxx (0)
    A scintilla/lexilla/scripts/LexillaGen.py (0)
    A scintilla/lexilla/scripts/RunTest.bat (0)
    A scintilla/lexilla/scripts/RunTest.sh (0)
    A scintilla/lexilla/src/DepGen.py (0)
    A scintilla/lexilla/src/Lexilla.cxx (0)
    A scintilla/lexilla/src/Lexilla.def (0)
    A scintilla/lexilla/src/Lexilla.h (0)
    A scintilla/lexilla/src/Lexilla.vcxproj (0)
    A scintilla/lexilla/src/Lexilla/Info.plist (0)
    A scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj (0)
    A scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/contents.xcworkspacedata (0)
    A scintilla/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (0)
    A scintilla/lexilla/src/LexillaVersion.rc (0)
    A scintilla/lexilla/src/README (0)
    A scintilla/lexilla/src/deps.mak (0)
    A scintilla/lexilla/src/lexilla.mak (0)
    A scintilla/lexilla/src/makefile (0)
    A scintilla/lexilla/src/nmdeps.mak (0)
    A scintilla/lexilla/test/LexillaAccess.cxx (0)
    A scintilla/lexilla/test/LexillaAccess.h (0)
    A scintilla/lexilla/test/README (0)
    A scintilla/lexilla/test/TestDocument.cxx (0)
    A scintilla/lexilla/test/TestDocument.h (0)
    A scintilla/lexilla/test/TestLexers.cxx (0)
    A scintilla/lexilla/test/TestLexers.vcxproj (0)
    A scintilla/lexilla/test/examples/batch/SciTE.properties (0)
    A scintilla/lexilla/test/examples/batch/x.bat (0)
    A scintilla/lexilla/test/examples/batch/x.bat.styled (0)
    A scintilla/lexilla/test/examples/cpp/SciTE.properties (0)
    A scintilla/lexilla/test/examples/cpp/x.cxx (0)
    A scintilla/lexilla/test/examples/cpp/x.cxx.styled (0)
    A scintilla/lexilla/test/examples/d/SciTE.properties (0)
    A scintilla/lexilla/test/examples/d/x.d (0)
    A scintilla/lexilla/test/examples/d/x.d.styled (0)
    A scintilla/lexilla/test/examples/errorlist/AllStyles.err (0)
    A scintilla/lexilla/test/examples/errorlist/AllStyles.err.styled (0)
    A scintilla/lexilla/test/examples/errorlist/SciTE.properties (0)
    A scintilla/lexilla/test/examples/hypertext/SciTE.properties (0)
    A scintilla/lexilla/test/examples/hypertext/apostophe.php (0)
    A scintilla/lexilla/test/examples/hypertext/apostophe.php.styled (0)
    A scintilla/lexilla/test/examples/hypertext/x.asp (0)
    A scintilla/lexilla/test/examples/hypertext/x.asp.styled (0)
    A scintilla/lexilla/test/examples/hypertext/x.html (0)
    A scintilla/lexilla/test/examples/hypertext/x.html.styled (0)
    A scintilla/lexilla/test/examples/hypertext/x.php (0)
    A scintilla/lexilla/test/examples/hypertext/x.php.styled (0)
    A scintilla/lexilla/test/examples/latex/AllStyles.tex (0)
    A scintilla/lexilla/test/examples/latex/AllStyles.tex.styled (0)
    A scintilla/lexilla/test/examples/latex/Feature1358.tex (0)
    A scintilla/lexilla/test/examples/latex/Feature1358.tex.styled (0)
    A scintilla/lexilla/test/examples/latex/SciTE.properties (0)
    A scintilla/lexilla/test/examples/lua/SciTE.properties (0)
    A scintilla/lexilla/test/examples/lua/x.lua (0)
    A scintilla/lexilla/test/examples/lua/x.lua.styled (0)
    A scintilla/lexilla/test/examples/makefile/SciTE.properties (0)
    A scintilla/lexilla/test/examples/makefile/x.mak (0)
    A scintilla/lexilla/test/examples/makefile/x.mak.styled (0)
    A scintilla/lexilla/test/examples/mmixal/AllStyles.mms (0)
    A scintilla/lexilla/test/examples/mmixal/AllStyles.mms.styled (0)
    A scintilla/lexilla/test/examples/mmixal/SciTE.properties (0)
    A scintilla/lexilla/test/examples/mmixal/references.mms (0)
    A scintilla/lexilla/test/examples/mmixal/references.mms.styled (0)
    A scintilla/lexilla/test/examples/mmixal/x.mms (0)
    A scintilla/lexilla/test/examples/mmixal/x.mms.styled (0)
    A scintilla/lexilla/test/examples/nim/SciTE.properties (0)
    A scintilla/lexilla/test/examples/nim/x.nim (0)
    A scintilla/lexilla/test/examples/nim/x.nim.styled (0)
    A scintilla/lexilla/test/examples/perl/SciTE.properties (0)
    A scintilla/lexilla/test/examples/perl/perl-test-5220delta.pl (0)
    A scintilla/lexilla/test/examples/perl/perl-test-5220delta.pl.styled (0)
    A scintilla/lexilla/test/examples/perl/perl-test-sub-prototypes.pl (0)
    A scintilla/lexilla/test/examples/perl/perl-test-sub-prototypes.pl.styled (0)
    A scintilla/lexilla/test/examples/perl/x.pl (0)
    A scintilla/lexilla/test/examples/perl/x.pl.styled (0)
    A scintilla/lexilla/test/examples/python/AllStyles.py (0)
    A scintilla/lexilla/test/examples/python/AllStyles.py.styled (0)
    A scintilla/lexilla/test/examples/python/SciTE.properties (0)
    A scintilla/lexilla/test/examples/python/x.py (0)
    A scintilla/lexilla/test/examples/python/x.py.styled (0)
    A scintilla/lexilla/test/examples/raku/SciTE.properties (0)
    A scintilla/lexilla/test/examples/raku/x.p6 (0)
    A scintilla/lexilla/test/examples/raku/x.p6.styled (0)
    A scintilla/lexilla/test/examples/ruby/SciTE.properties (0)
    A scintilla/lexilla/test/examples/ruby/x.rb (0)
    A scintilla/lexilla/test/examples/ruby/x.rb.styled (0)
    A scintilla/lexilla/test/examples/tcl/SciTE.properties (0)
    A scintilla/lexilla/test/examples/tcl/x.tcl (0)
    A scintilla/lexilla/test/examples/tcl/x.tcl.styled (0)
    A scintilla/lexilla/test/examples/vb/SciTE.properties (0)
    A scintilla/lexilla/test/examples/vb/x.vb (0)
    A scintilla/lexilla/test/examples/vb/x.vb.styled (0)
    A scintilla/lexilla/test/makefile (0)
    A scintilla/lexilla/test/testlexers.mak (0)
    A scintilla/lexilla/version.txt (0)
    M scintilla/lexlib/CatalogueModules.h (0)
    M scintilla/lexlib/CharacterCategory.cxx (0)
    M scintilla/lexlib/CharacterSet.h (0)
    M scintilla/lexlib/DefaultLexer.cxx (0)
    M scintilla/lexlib/DefaultLexer.h (0)
    M scintilla/lexlib/LexAccessor.h (0)
    M scintilla/lexlib/LexerBase.cxx (0)
    M scintilla/lexlib/LexerBase.h (0)
    M scintilla/lexlib/LexerModule.cxx (0)
    M scintilla/lexlib/LexerModule.h (0)
    M scintilla/lexlib/LexerSimple.h (0)
    M scintilla/lexlib/StyleContext.h (0)
    A scintilla/qt/README (0)
    A scintilla/qt/ScintillaEdit/ScintillaDocument.cpp (0)
    A scintilla/qt/ScintillaEdit/ScintillaDocument.h (0)
    A scintilla/qt/ScintillaEdit/ScintillaEdit.cpp.template (0)
    A scintilla/qt/ScintillaEdit/ScintillaEdit.h.template (0)
    A scintilla/qt/ScintillaEdit/ScintillaEdit.pro (0)
    A scintilla/qt/ScintillaEdit/WidgetGen.py (0)
    A scintilla/qt/ScintillaEdit/WidgetGen.pyc (0)
    A scintilla/qt/ScintillaEditBase/Notes.txt (0)
    A scintilla/qt/ScintillaEditBase/PlatQt.cpp (0)
    A scintilla/qt/ScintillaEditBase/PlatQt.h (0)
    A scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp (0)
    A scintilla/qt/ScintillaEditBase/ScintillaEditBase.h (0)
    A scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro (0)
    A scintilla/qt/ScintillaEditBase/ScintillaQt.cpp (0)
    A scintilla/qt/ScintillaEditBase/ScintillaQt.h (0)
    A scintilla/qt/ScintillaEditPy/README (0)
    A scintilla/qt/ScintillaEditPy/ScintillaConstants.py.template (0)
    A scintilla/qt/ScintillaEditPy/ScintillaEditPy.pro (0)

-- Patch Links --

https://github.com/geany/geany/pull/2600.patch
https://github.com/geany/geany/pull/2600.diff

-- 
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/pull/2600
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.geany.org/pipermail/github-comments/attachments/20200928/4823fac9/attachment-0001.htm>

More information about the Github-comments mailing list