[packages/scite] - updated to 3.5.1 - updated make,desktop patches, switched to GTK+ 3.x

[qboosh]

commit a8b8cfeab06222711499f45065fe888c7d1b91af
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Nov 15 20:36:41 2014 +0100

    - updated to 3.5.1
    - updated make,desktop patches, switched to GTK+ 3.x

 scite-desktop.patch |  8 ++++----
 scite-make.patch    | 21 +++++++++++----------
 scite.spec          | 12 +++++++-----
 3 files changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/scite.spec b/scite.spec
index 416503b..c8fe353 100644
--- a/scite.spec
+++ b/scite.spec
@@ -1,20 +1,21 @@
 Summary:	SciTE - a programmers text editor
 Summary(pl.UTF-8):	SciTE - edytor tekstu dla programistów
 Name:		scite
-Version:	2.29
+Version:	3.5.1
 Release:	1
 License:	BSD-like
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/scintilla/scite%(echo %{version} | tr -d .).tgz
-# Source0-md5:	55858b96c4ad64b38503682ff49d184e
+# Source0-md5:	e981452d454f1afe22be64616ba064d8
 Patch0:		%{name}-make.patch
 Patch1:		%{name}-desktop.patch
 URL:		http://scintilla.org/SciTE.html
-BuildRequires:	gtk+2-devel >= 1:2.0.0
+BuildRequires:	gtk+3-devel >= 3.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	lua51-devel
 BuildRequires:	pkgconfig
 BuildRequires:	scintilla-devel >= %{version}
+Requires:	scintilla >= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,9 +38,10 @@ powłoki uniksowej i Apache'a.
 
 %build
 %{__make} -C scite/gtk \
-	CC="%{__cxx}" \
+	CXX="%{__cxx}" \
 	OPTFLAGS="%{rpmcflags}" \
-	%{?debug:DEBUG=1}
+	%{?debug:DEBUG=1} \
+	GTK3=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/scite-desktop.patch b/scite-desktop.patch
index 21a0ff4..bd837b5 100644
--- a/scite-desktop.patch
+++ b/scite-desktop.patch
@@ -1,5 +1,5 @@
---- 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
+--- scite-3.5.1/scite/gtk/SciTE.desktop.orig	2014-11-15 20:18:17.155715011 +0100
++++ scite-3.5.1/scite/gtk/SciTE.desktop	2014-11-15 20:19:35.615711719 +0100
 @@ -1,19 +1,19 @@
  [Desktop Entry]
  Encoding=UTF-8
@@ -17,9 +17,9 @@
  GenericName=Text Editor
 -Type=Application
  Exec=SciTE %F
- Icon=Sci48M.png
+ Icon=Sci48M
  Terminal=false
  StartupNotify=true
 -Categories=TextEditor;Development;GTK;Application;
-+Categories=GTK;Development;
+++Categories=GTK;Development;
  MimeType=text/plain;
diff --git a/scite-make.patch b/scite-make.patch
index 35cc463..fb521b9 100644
--- a/scite-make.patch
+++ b/scite-make.patch
@@ -1,7 +1,7 @@
---- 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
+--- scite-3.5.1/scite/gtk/makefile.orig	2014-08-10 01:52:11.000000000 +0200
++++ scite-3.5.1/scite/gtk/makefile	2014-11-15 20:17:31.105716944 +0100
 @@ -53,9 +53,9 @@
- CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
+ CXXBASEFLAGS=-W -Wall -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
  
  ifdef DEBUG
 -CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
@@ -12,24 +12,25 @@
  endif
  
  ifndef NO_LUA
-@@ -99,13 +99,13 @@
- 	$(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
+@@ -107,14 +107,14 @@
+ 	$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.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.
 -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 \
+ FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o \
+ Exporters.o  MatchMarker.o StringHelpers.o \
+ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.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) $(LIBDL) -lstdc++
+-	$(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
 +	JobQueue.o GTKMutex.o IFaceTable.o LuaExtension.o
-+	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(COMPLIB) $(CONFIGLIB) $(LIBDL) -lstdc++ -llua51
++	$(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(COMPLIB) $(CONFIGLIB) $(LIBDL) -lm -lstdc++ -llua51
  
  # Automatically generate header dependencies with "make deps"
  include deps.mak
-@@ -125,7 +125,7 @@
+@@ -134,7 +134,7 @@
  
  ifdef gnomeprefix
  	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications $(DESTDIR)$(pixmapdir)
================================================================

---- gitweb:

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