packages: scite/scite-make.patch, scite/scite.spec - updated to 2.27 - upda...

Thu Jun 23 12:51:27 CEST 2011

Author: qboosh                       Date: Thu Jun 23 10:51:27 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.27
- updated make patch
- use system lua (5.1)

---- Files affected:
packages/scite:
   scite-make.patch (1.7 -> 1.8) , scite.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: packages/scite/scite-make.patch
diff -u packages/scite/scite-make.patch:1.7 packages/scite/scite-make.patch:1.8

--- packages/scite/scite-make.patch:1.7	Mon May 17 01:41:34 2010
+++ packages/scite/scite-make.patch	Thu Jun 23 12:51:22 2011
@@ -1,11 +1,7 @@
---- scite-2.11/scite/gtk/makefile	2010-03-14 01:41:15.000000000 +0000
-+++ scite-2.11/scite/gtk/makefile	2010-05-16 23:34:00.000000000 +0000
-@@ -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)
+--- scite-2.27/scite/gtk/makefile.orig	2011-06-14 02:55:05.000000000 +0200
++++ scite-2.27/scite/gtk/makefile	2011-06-23 12:31:51.409587426 +0200
+@@ -53,9 +53,9 @@
+ CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
  
  ifdef DEBUG
 -CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
@@ -16,26 +12,29 @@
  endif
  
  ifndef NO_LUA
-@@ -102,8 +102,8 @@
+@@ -94,13 +94,13 @@
+ 	$(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
  
- $(PROG): SciTEGTK.o GUIGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o \
+ # make should be run in ../../scintilla/gtk to compile all the lexers.
+-COMPLIB=../../scintilla/bin/scintilla.a
++COMPLIB=-lscintilla
+ 
+ $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
+ FilePath.o SciTEBase.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
  PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
 -	JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
--	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB)
-+	JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
-+	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -lscintilla
+-	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -ldl -lstdc++
++	JobQueue.o GTKMutex.o IFaceTable.o LuaExtension.o
++	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(COMPLIB) $(CONFIGLIB) -ldl -lstdc++ -llua51
  
  # Automatically generate header dependencies with "make deps"
  include deps.mak
-@@ -123,9 +123,9 @@
+@@ -119,7 +119,7 @@
+ 	done
  
  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 644 -D SciTE.desktop $(DESTDIR)$(datadir)/gnome/apps/Applications/SciTE.desktop
- endif
  	$(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
  endif
+ 

================================================================
Index: packages/scite/scite.spec
diff -u packages/scite/scite.spec:1.21 packages/scite/scite.spec:1.22
--- packages/scite/scite.spec:1.21	Mon May 17 01:41:34 2010
+++ packages/scite/scite.spec	Thu Jun 23 12:51:22 2011
@@ -2,17 +2,19 @@
 Summary:	SciTE - a programmers text editor
 Summary(pl.UTF-8):	SciTE - edytor tekstu dla programistów
 Name:		scite
-Version:	2.11
+Version:	2.27
 Release:	1
 License:	BSD-like
 Group:		X11/Applications
-Source0:	http://dl.sourceforge.net/scintilla/scite%(echo %{version} | tr -d .).tgz
-# Source0-md5:	129aad231c9618aaa2c2e41226db2327
+Source0:	http://downloads.sourceforge.net/scintilla/scite%(echo %{version} | tr -d .).tgz
+# Source0-md5:	ac5aafa1b47da3792a56d5fd9f383fda
 Patch0:		%{name}-make.patch
 Patch1:		%{name}-desktop.patch
 URL:		http://scintilla.org/SciTE.html
 BuildRequires:	gtk+2-devel >= 1:2.0.0
 BuildRequires:	libstdc++-devel
+BuildRequires:	lua51-devel
+BuildRequires:	pkgconfig
 BuildRequires:	scintilla-devel >= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -26,8 +28,8 @@
 SciTE to graficzny edytor oparty o GTK+. Obsługuje wcięcia,
 podświetlanie składni oraz skróty klawiszowe dla wielu języków,
 ponadto może być rozszerzany poprzez edycję zorientowanych obiektowo
-plików konfiguracyjnych. Zawiera wsparcie dla Javy, C, C++, C#, shella
-i Apache'a.
+plików konfiguracyjnych. Zawiera wsparcie dla Javy, C, C++, C#,
+powłoki uniksowej i Apache'a.
 
 %prep
 %setup -q -c
@@ -60,8 +62,8 @@
 %attr(755,root,root) %{_bindir}/SciTE
 %{_datadir}/scite
 %{_mandir}/man1/SciTE.1*
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*.png
+%{_desktopdir}/SciTE.desktop
+%{_pixmapsdir}/Sci48M.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -69,6 +71,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2011/06/23 10:51:22  qboosh
+- updated to 2.27
+- updated make patch
+- use system lua (5.1)
+
 Revision 1.21  2010/05/16 23:41:34  arvenil
 - up to 2.11
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scite/scite-make.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scite/scite.spec?r1=1.21&r2=1.22&f=u

