Jako że spec do scite w repo był do dosyć starej wersji, a ta nie działała z gtk+ 2.4, więc poprawiłem zarówno scite jak i potrzebną przez nią scintillę. Załączam diffy na spece i poprawione patche. Gdyby jakaś dobra dusza mogła to włączyć.
PS
W jaki sposób szybko i skutecznie poprawiać patche - chodzi mi czy jest jakiś programik (edytor) który bierze .rej, patcha .orig i to wszystko na raz ładnie pokazuje, czy może jakoś inaczej?
Pozdrawiam
Olek
--- scintilla/gtk/makefile.orig 2004-07-29 16:07:26.300011088 +0000 +++ scintilla/gtk/makefile 2004-07-29 16:06:56.808494480 +0000 @@ -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. -.SUFFIXES: .cxx .c .o .h .a +.SUFFIXES: .cxx .c .o .h .a .lo .la CC = g++ CCOMP = gcc AR = ar @@ -17,7 +17,7 @@ RANLIB = ranlib endif -COMPLIB=../bin/scintilla.a +COMPLIB=../bin/libscintilla.la vpath %.h ../src ../include vpath %.cxx ../src @@ -32,61 +32,66 @@ endif ifdef DEBUG -CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS) +CXXFLAGS=-DDEBUG $(OPTFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS) else -CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) +CXXFLAGS=-DNDEBUG $(OPTFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS) endif # If explicit setting of GTK1 or GTK2 then use that else look for # pkg-config which is an OK indication that GTK2 is available ifdef GTK2 CONFIGFLAGS=pkg-config --cflags gtk+-2.0 -MARSHALLER=scintilla-marshal.o +LIBCONFIG=pkg-config --libs gtk+-2.0 gthread-2.0 +MARSHALLER=scintilla-marshal.lo else ifdef GTK1 CONFIGFLAGS=gtk-config --cflags +LIBCONFIG=gtk-config --libs ; glib-config --libs gthread else ifneq (,$(findstring /,$(shell whereis pkg-config))) CONFIGFLAGS=pkg-config --cflags gtk+-2.0 -MARSHALLER=scintilla-marshal.o +MARSHALLER=scintilla-marshal.lo else CONFIGFLAGS=gtk-config --cflags endif endif endif -.cxx.o: - $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $< -.c.o: - $(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $< +.cxx.lo: + libtool --mode=compile $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $< +.c.lo: + libtool --mode=compile $(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $< #++Autogenerated -- run src/LexGen.py to regenerate -#**LEXOBJS=\\\n\(\*.o \) +#**LEXOBJS=\\\n\(\*.lo \) LEXOBJS=\ -LexAda.o LexAPDL.o LexAsm.o LexAU3.o LexAVE.o LexBaan.o LexBash.o LexBullant.o \ -LexCLW.o LexConf.o LexCPP.o LexCrontab.o LexCSS.o LexEiffel.o LexErlang.o \ -LexEScript.o LexForth.o LexFortran.o LexGui4Cli.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 LexRuby.o LexScriptol.o LexSpecman.o LexSQL.o LexTeX.o LexVB.o \ -LexVerilog.o LexYAML.o +LexAda.lo LexAPDL.lo LexAsm.lo LexAU3.lo LexAVE.lo LexBaan.lo LexBash.lo LexBullant.lo \ +LexCLW.lo LexConf.lo LexCPP.lo LexCrontab.lo LexCSS.lo LexEiffel.lo LexErlang.lo \ +LexEScript.lo LexForth.lo LexFortran.lo LexGui4Cli.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 LexRuby.lo LexScriptol.lo LexSpecman.lo LexSQL.lo LexTeX.lo LexVB.lo \ +LexVerilog.lo LexYAML.lo #--Autogenerated -- end of automatically generated section all: $(COMPLIB) clean: - rm -f *.o $(COMPLIB) + rm -f *.lo $(COMPLIB) deps: - $(CC) -MM `$(CONFIGFLAGS)` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak + $(CC) -MM `$(CONFIGFLAGS)` $(CXXFLAGS) *.c *.cxx ../src/*.cxx >deps.mak -$(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.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 \ + 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 \ $(MARSHALLER) $(LEXOBJS) - $(AR) rc $@ $^ - $(RANLIB) $@ + libtool --mode=link $(CC) -o $@ $^ -rpath $(libdir) `$(LIBCONFIG)` + +install: $(COMPLIB) + install -d $(DESTDIR)$(libdir) + libtool --mode=install install $(COMPLIB) $(DESTDIR)$(libdir) # Automatically generate header dependencies with "make deps" include deps.mak
Index: scintilla.spec
===================================================================
RCS file: /cvsroot/SPECS/scintilla.spec,v
retrieving revision 1.10
diff -u -r1.10 scintilla.spec
--- scintilla.spec 8 Feb 2004 21:43:40 -0000 1.10
+++ scintilla.spec 30 Jul 2004 06:11:52 -0000
@@ -6,13 +6,13 @@
Summary: Free source code editing component for GTK+ and Win32
Summary(pl): Wolnodost�pna kontrolka edycyjna dla GTK+ i Win32
Name: scintilla
-Version: 1.58
+Version: 1.61
%define fver %(echo %{version} | tr -d .)
-Release: 2
+Release: 1
License: BSD-like
Group: Libraries
Source0: http://dl.sourceforge.net/scintilla/%{name}%{fver}.tgz
-# Source0-md5: 385226367e398c81f8f9d4df587ea088
+# Source0-md5: a7691bf93ab07fe4426c458605cff35e
Patch0: %{name}-make.patch
URL: http://scintilla.org/
%{?with_gtk1:BuildRequires: gtk+-devel >= 1.2.0}
@@ -79,6 +79,7 @@
%build
%{__make} -C gtk \
CC="%{__cxx}" \
+ CCOMP="%{__cc}" \
OPTFLAGS="%{rpmcflags}" \
libdir="%{_libdir}" \
%{?debug:DEBUG=1} \
--- scite-1.61/scite/gtk/makefile.orig 2004-07-29 21:14:01.293547008 +0000 +++ scite-1.61/scite/gtk/makefile 2004-07-29 21:13:27.303714248 +0000 @@ -45,7 +45,7 @@ bindir=$(prefix)/bin SYSCONF_PATH=$(prefix)/share/scite -INSTALL=install -o root -g root +INSTALL=install PROG = ../bin/SciTE @@ -59,9 +59,9 @@ CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) ifdef DEBUG -CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS) +CXXTFLAGS=-DDEBUG $(OPTFLAGS) $(CXXBASEFLAGS) else -CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) +CXXTFLAGS=-DNDEBUG $(OPTFLAGS) $(CXXBASEFLAGS) endif ifndef NO_LUA @@ -97,13 +97,10 @@ deps: $(CC) -MM `$(CONFIGFLAGS)` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak -# make should be run in ../../scintilla/gtk to compile all the lexers. -COMPLIB=../../scintilla/bin/scintilla.a - $(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \ MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \ - $(COMPLIB) $(LUA_OBJS) - $(CC) `$(CONFIGLIB)` `$(CONFIGTHREADS)` -DGTK $^ -o $@ + $(LUA_OBJS) + $(CC) `$(CONFIGLIB)` `$(CONFIGTHREADS)` -DGTK $^ -o $@ -lscintilla # Automatically generate header dependencies with "make deps" include deps.mak @@ -125,6 +122,7 @@ ifndef GTK2 $(INSTALL) -m 644 -D SciTE.desktop $(DESTDIR)$(datadir)/gnome/apps/Applications/SciTE.desktop endif + $(INSTALL) -m 644 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop $(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png endif
Index: scite.spec =================================================================== RCS file: /cvsroot/SPECS/scite.spec,v retrieving revision 1.6 diff -u -r1.6 scite.spec --- scite.spec 19 Dec 2003 17:49:44 -0000 1.6 +++ scite.spec 30 Jul 2004 06:10:47 -0000 @@ -6,17 +6,17 @@ Summary: SciTE - a programmers text editor Summary(pl): SciTE - edytor tekstu dla programist�w Name: scite -Version: 1.53 +Version: 1.61 Release: 1 License: BSD-like Group: X11/Applications -# Source0-md5: 156275ae6318c323b308f403033663cd -Source0: http://dl.sourceforge.net/scintilla/scite153.tgz +Source0: http://dl.sourceforge.net/scintilla/scite161.tgz +# Source0-md5: 13a08edea3103e4c72d66dee69342120 Patch0: %{name}-make.patch URL: http://scintilla.org/SciTE.html %{?with_gtk1:BuildRequires: gtk+-devel >= 1.2.0} %{!?with_gtk1:BuildRequires: gtk+2-devel >= 2.0.0} -BuildRequires: scintilla-devel +BuildRequires: scintilla-devel >= 0:1.61 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description
_______________________________________________ pld-devel-pl mailing list [EMAIL PROTECTED] http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
