SOURCES: scintilla-make.patch - Version 1.71-1.

[matkor]

Author: matkor                       Date: Mon Nov  6 12:11:40 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- Version 1.71-1.

---- Files affected:
SOURCES:
   scintilla-make.patch (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SOURCES/scintilla-make.patch
diff -u SOURCES/scintilla-make.patch:1.8 SOURCES/scintilla-make.patch:1.9
--- SOURCES/scintilla-make.patch:1.8	Sat Aug 27 15:35:53 2005
+++ SOURCES/scintilla-make.patch	Mon Nov  6 13:11:35 2006
@@ -1,6 +1,5 @@
-diff -urNbB scintilla.org/gtk/makefile scintilla/gtk/makefile
---- scintilla.org/gtk/makefile	2005-05-27 13:29:44.000000000 +0200
-+++ scintilla/gtk/makefile	2005-08-27 15:34:00.961960088 +0200
+--- scintilla/gtk/makefile.orig	2006-11-06 12:08:34.000000000 +0100
++++ scintilla/gtk/makefile	2006-11-06 12:43:48.000000000 +0100
 @@ -7,7 +7,7 @@
  # To force GTK+ 2 build, define GTK2 on the make command line.
  # To force GTK+ 1 build, define GTK1 on the make command line.
@@ -49,34 +48,37 @@
  else
  CONFIGFLAGS=gtk-config --cflags
  endif
-@@ -60,34 +60,42 @@
+@@ -59,37 +59,47 @@
+ 	$(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
  .c.o:
  	$(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $<
- 
 +.cxx.lo:
 +	libtool --tag=CXX --mode=compile $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
 +.c.lo:
 +	libtool --tag=CC --mode=compile $(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $<
-+	
++
+ 
  #++Autogenerated -- run src/LexGen.py to regenerate
  #**LEXOBJS=\\\n\(\*.o \)
  LEXOBJS=\
 -LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexAU3.o LexAVE.o LexBaan.o LexBash.o \
 -LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexConf.o LexCPP.o LexCrontab.o \
 -LexCsound.o LexCSS.o LexEiffel.o LexErlang.o LexEScript.o LexFlagship.o \
--LexForth.o LexFortran.o LexGui4Cli.o LexHaskell.o LexHTML.o LexKix.o LexLisp.o \
--LexLout.o LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o \
--LexNsis.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o \
--LexPython.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o LexSpecman.o \
--LexSQL.o LexTADS3.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o
+-LexForth.o LexFortran.o LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o \
+-LexLisp.o LexLout.o LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o \
+-LexMSSQL.o LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o LexPerl.o \
+-LexPOV.o LexPS.o LexPython.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o \
+-LexSpecman.o LexSpice.o LexSQL.o LexTADS3.o LexTCL.o LexTeX.o LexVB.o \
+-LexVerilog.o LexVHDL.o LexYAML.o
 +LexAda.lo LexAPDL.lo LexAsm.lo LexAsn1.lo LexAU3.lo LexAVE.lo LexBaan.lo LexBash.lo \
 +LexBasic.lo LexBullant.lo LexCaml.lo LexCLW.lo LexConf.lo LexCPP.lo LexCrontab.lo \
 +LexCsound.lo LexCSS.lo LexEiffel.lo LexErlang.lo LexEScript.lo LexFlagship.lo \
-+LexForth.lo LexFortran.lo LexGui4Cli.lo LexHaskell.lo LexHTML.lo LexKix.lo LexLisp.lo \
-+LexLout.lo LexLua.lo LexMatlab.lo LexMetapost.lo LexMMIXAL.lo LexMPT.lo LexMSSQL.lo \
-+LexNsis.lo LexOthers.lo LexPascal.lo LexPB.lo LexPerl.lo LexPOV.lo LexPS.lo \
-+LexPython.lo LexRebol.lo LexRuby.lo LexScriptol.lo LexSmalltalk.lo LexSpecman.lo \
-+LexSQL.lo LexTADS3.lo LexTeX.lo LexVB.lo LexVerilog.lo LexVHDL.lo LexYAML.lo
++LexForth.lo LexFortran.lo LexGui4Cli.lo LexHaskell.lo LexHTML.lo LexInno.lo LexKix.lo \
++LexLisp.lo LexLout.lo LexLua.lo LexMatlab.lo LexMetapost.lo LexMMIXAL.lo LexMPT.lo \
++LexMSSQL.lo LexNsis.lo LexOpal.lo LexOthers.lo LexPascal.lo LexPB.lo LexPerl.lo \
++LexPOV.lo LexPS.lo LexPython.lo LexRebol.lo LexRuby.lo LexScriptol.lo LexSmalltalk.lo \
++LexSpecman.lo LexSpice.lo LexSQL.lo LexTADS3.lo LexTCL.lo LexTeX.lo LexVB.lo \
++LexVerilog.lo LexVHDL.lo LexYAML.lo
  #--Autogenerated -- end of automatically generated section
  
  all: $(COMPLIB)
@@ -88,11 +90,13 @@
  deps:
  	$(CC) -MM `$(CONFIGFLAGS)` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak
  
--$(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o Document.o CallTip.o \
+-$(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o \
+-	CharClassify.o Document.o CallTip.o \
 -	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \
 -	KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
 -	RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
-+$(COMPLIB): DocumentAccessor.lo WindowAccessor.lo KeyWords.lo StyleContext.lo Document.lo CallTip.lo \
++$(COMPLIB): DocumentAccessor.lo WindowAccessor.lo KeyWords.lo StyleContext.lo \
++	CharClassify.lo Document.lo CallTip.lo \
 +	ScintillaBase.lo ContractionState.lo Editor.lo ExternalLexer.lo PropSet.lo PlatGTK.lo \
 +	KeyMap.lo LineMarker.lo ScintillaGTK.lo CellBuffer.lo ViewStyle.lo \
 +	RESearch.lo Style.lo Indicator.lo AutoComplete.lo UniConversion.lo XPM.lo \
@@ -100,6 +104,8 @@
 -	$(AR) rc $@ $^
 -	$(RANLIB) $@
 +	libtool --tag=CXX --mode=link $(CC) -o $@ $^ -rpath $(libdir) `$(LIBCONFIG)`
++
++
 +
 +install: $(COMPLIB)
 +	install -d $(DESTDIR)$(libdir)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/scintilla-make.patch?r1=1.8&r2=1.9&f=u