SOURCES: scite-make.patch - updated for 1.76

[shadzik]

Author: shadzik                      Date: Sun Mar 30 13:28:36 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.76

---- Files affected:
SOURCES:
   scite-make.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/scite-make.patch
diff -u SOURCES/scite-make.patch:1.4 SOURCES/scite-make.patch:1.5
--- SOURCES/scite-make.patch:1.4	Tue Nov 23 22:24:49 2004
+++ SOURCES/scite-make.patch	Sun Mar 30 15:28:31 2008
@@ -1,17 +1,11 @@
-diff -urN scite162.org/scite/gtk/makefile scite162/scite/gtk/makefile
---- scite162.org/scite/gtk/makefile	2004-08-20 09:21:00.000000000 +0200
-+++ scite162/scite/gtk/makefile	2004-11-23 22:20:05.481069583 +0100
-@@ -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)
+--- scite-1.76/scite/gtk/makefile	2007-12-01 01:27:26.000000000 +0100
++++ scite-1.76/scite/gtk/makefile-new	2008-03-30 14:47:49.000000000 +0200
+@@ -56,12 +56,12 @@
+ 
+ #CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings
+ INCLUDEDIRS=-I ../../scintilla/include -I ../src
+-CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -Os -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
++CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
  
  ifdef DEBUG
 -CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
@@ -24,20 +18,24 @@
  ifndef NO_LUA
 @@ -102,8 +102,8 @@
  
- $(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
- MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
--	$(COMPLIB) $(LUA_OBJS)
--	$(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ `$(CONFIGLIB)`
-+	$(LUA_OBJS)
-+	$(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ `$(CONFIGLIB)` -lscintilla
+ $(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o \
+ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
+-	JobQueue.o GTKMutex.o $(COMPLIB) $(LUA_OBJS)
+-	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB)
++	JobQueue.o GTKMutex.o $(LUA_OBJS)
++	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -lscintilla
  
  # Automatically generate header dependencies with "make deps"
  include deps.mak
-@@ -127,6 +127,7 @@
+@@ -123,9 +123,9 @@
+ 
+ ifdef gnomeprefix
+ ifdef GTK2
+-	$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
++	$(INSTALL) -m 644 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
  else
- 	$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/gnome/apps/Applications/SciTE.desktop
+-	$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/gnome/apps/Applications/SciTE.desktop
++	$(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
- 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/scite-make.patch?r1=1.4&r2=1.5&f=u