[packages/scite] - updated to 2.29 (the last 2.x version) - updated make,desktop patches

[qboosh]

commit 1644c82d86c30b9adcff27f2a6ed5c4585299815
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Nov 14 23:04:37 2014 +0100

    - updated to 2.29 (the last 2.x version)
    - updated make,desktop patches

 scite-desktop.patch | 16 +++++++++-------
 scite-make.patch    | 20 ++++++++++----------
 scite.spec          |  4 ++--
 3 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/scite.spec b/scite.spec
index 3d87609..416503b 100644
--- a/scite.spec
+++ b/scite.spec
@@ -1,12 +1,12 @@
 Summary:	SciTE - a programmers text editor
 Summary(pl.UTF-8):	SciTE - edytor tekstu dla programistów
 Name:		scite
-Version:	2.27
+Version:	2.29
 Release:	1
 License:	BSD-like
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/scintilla/scite%(echo %{version} | tr -d .).tgz
-# Source0-md5:	ac5aafa1b47da3792a56d5fd9f383fda
+# Source0-md5:	55858b96c4ad64b38503682ff49d184e
 Patch0:		%{name}-make.patch
 Patch1:		%{name}-desktop.patch
 URL:		http://scintilla.org/SciTE.html
diff --git a/scite-desktop.patch b/scite-desktop.patch
index ce9f718..21a0ff4 100644
--- a/scite-desktop.patch
+++ b/scite-desktop.patch
@@ -1,23 +1,25 @@
---- scite-1.76/scite/gtk/SciTE.desktop.orig	2006-08-28 03:49:27.000000000 +0200
-+++ scite-1.76/scite/gtk/SciTE.desktop	2008-03-30 15:22:36.000000000 +0200
-@@ -1,16 +1,16 @@
+--- scite-2.29/scite/gtk/SciTE.desktop.orig	2014-11-14 22:57:42.645606118 +0100
++++ scite-2.29/scite/gtk/SciTE.desktop	2014-11-14 23:00:48.102265000 +0100
+@@ -1,19 +1,19 @@
  [Desktop Entry]
  Encoding=UTF-8
 -Version=1.0
  Name=SciTE Text Editor
  Name[es]=Editor de textos SciTE
  Name[fr]=Éditeur de texte SciTE
++Name[pl]=Edytor tekstu SciTE
+ Name[ru]=Текстовый редактор SciTE
  Comment=Edit your source files
  Comment[es]=Edita especializado para programación
  Comment[fr]=Éditer des fichiers sources
--GenericName=Text Editor
++Comment[pl]=Edycja plików źródłowych
+ Comment[ru]=Редактор исходных кодов
+ GenericName=Text Editor
 -Type=Application
-+Comment[pl]=Edytor tekstu SciTE
  Exec=SciTE %F
  Icon=Sci48M.png
  Terminal=false
-+Type=Application
  StartupNotify=true
 -Categories=TextEditor;Development;GTK;Application;
 +Categories=GTK;Development;
-+# vi: encoding=utf-8
+ MimeType=text/plain;
diff --git a/scite-make.patch b/scite-make.patch
index ab58a6b..35cc463 100644
--- a/scite-make.patch
+++ b/scite-make.patch
@@ -1,5 +1,5 @@
---- 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
+--- scite-2.29/scite/gtk/makefile.orig	2011-09-16 11:14:07.000000000 +0200
++++ scite-2.29/scite/gtk/makefile	2014-11-14 22:56:55.212274774 +0100
 @@ -53,9 +53,9 @@
  CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
  
@@ -12,7 +12,7 @@
  endif
  
  ifndef NO_LUA
-@@ -94,13 +94,13 @@
+@@ -99,13 +99,13 @@
  	$(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
  
  # make should be run in ../../scintilla/gtk to compile all the lexers.
@@ -23,18 +23,18 @@
  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,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -ldl -lstdc++
+-	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -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
++	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(COMPLIB) $(CONFIGLIB) $(LIBDL) -lstdc++ -llua51
  
  # Automatically generate header dependencies with "make deps"
  include deps.mak
-@@ -119,7 +119,7 @@
- 	done
+@@ -125,7 +125,7 @@
  
  ifdef gnomeprefix
--	$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
-+	$(INSTALL) -m 644 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
- 	$(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications $(DESTDIR)$(pixmapdir)
+-	$(INSTALL) -m 755 SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
++	$(INSTALL) -m 644 SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
+ 	$(INSTALL) -m 644 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
  endif
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/scite.git/commitdiff/1644c82d86c30b9adcff27f2a6ed5c4585299815