development/scite: Updated for version 3.02.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

6 files changed, 55 insertions, 20 deletions

diff --git a/development/scite/README b/development/scite/README
index d9eefa5f6219..905c7c95c47e 100644
--- a/development/scite/README
+++ b/development/scite/README
@@ -3,11 +3,12 @@ Scintilla, it has grown to be a generally useful editor with facilities
 for building and running programs. It is best used for jobs with simple
 configurations.
 
-There is an example configuration file (config/SciTEUser.properties) 
-provided with the tarball.  If you'd like to use it (at your own risk), 
-see the different options at http://www.scintilla.org/SciTEDoc.html, 
-rename it to .SciTEUser.properties, and place it in your user's homedir.
-
-The file config/SciTEGlobal.properties provided will get merged with the
-main SciTEGlobal.properties file at compile time; here you can make your
-system wide settings for all users.
+There are example configuration files provided with the tarball.
+If you'd like to use it (at your own risk), see the different options at
+http://www.scintilla.org/SciTEDoc.html, rename SciTEUser.properties.new
+to .SciTEUser.properties, and place it in your user's homedir.
+
+Please look into /usr/doc/scite-3.02 after installation to find the
+example configuration files and additional documentation.
+
+
diff --git a/development/scite/config/README.Slackware b/development/scite/config/README.Slackware
new file mode 100644
index 000000000000..9d0a6014b35d
--- /dev/null
+++ b/development/scite/config/README.Slackware
@@ -0,0 +1,26 @@
+README.Slackware
+
+SciTE.SlackBuild 
+
+The SciTE.SlackBuild is now also available from git: git://github.com/schiffsratte/scite.slackbuild.git
+
+In version 3.02 SciTE's GTK+3 support has still improved, it will integrate nicely into the Gnome3
+Desktop and use Adwaita or any other GTK+3 theme, if installed.
+It now saves files in the background and can print on GTK+3.
+Since 2.29 it always draws with Cairo on GTK+, gdk-pixbuf is no longer needed - compilation errors with GSB-Desktop installed at the same time are gone.
+The handling of the "properties" files has been changed again to avoid the replacement
+of existing settings. 
+All examples can be found now in /usr/doc/scite-$ver as it seems the right place to put them.
+The also got the extension "new" to mark them as templates.
+The main file SciTEGlobal.properties doesn't get altered anymore from within the SlackBuild (with one exception),but if you made changes to your existing SciTEGlobal.properties file, you need to back it up, 
+as the update procedure will replace the file .
+The only modification I have made is to change the help-browser to mozilla.
+This feature has been broken in former versions of SciTE as it still pointed to "netscape".
+In v3.02 the help uses "xdg-open" instead, but this can lead to unwanted behavior also.
+For example with Bluefish installed the help pages might open with Bluefish instead in Firefox or Seamonkey.
+As a full Slackware installation installs Seamonkey, the mozilla command should make sure to open the help pages in a browser.
+If you prefer the system standard browser instead, comment out line 51/52 of the SlackBuild.
+The SciTEUser.properties in your home directory stays untouched and will not be invalidated anymore from the changes in SciTEGlobal.properties.
+
+Finally the CFLAGS have been removed from the SlackBuild, as the makefiles of Scintilla and Scite use those flags, which had been replaced before, now by default.
+
diff --git a/development/scite/config/SciTEGlobal.properties b/development/scite/config/SciTEGlobal.properties.new
index aa8d3948d0c4..aa8d3948d0c4 100644
--- a/development/scite/config/SciTEGlobal.properties
+++ b/development/scite/config/SciTEGlobal.properties.new
diff --git a/development/scite/config/SciTEUser.properties b/development/scite/config/SciTEUser.properties.new
index 23477b7affb4..23477b7affb4 100644
--- a/development/scite/config/SciTEUser.properties
+++ b/development/scite/config/SciTEUser.properties.new
diff --git a/development/scite/scite.SlackBuild b/development/scite/scite.SlackBuild
index 423c7b7c0d7a..71777c6cd5dc 100644
--- a/development/scite/scite.SlackBuild
+++ b/development/scite/scite.SlackBuild
@@ -1,10 +1,11 @@
 #!/bin/sh
 # Slackware build script for SciTE
 # Written by Iskar Enev <iskar.enev[@]gmail.com>
-# Some modifications for v2.27 by Jens Weber <jens@tuxane.com>
+# v2.27: Some modifications by Jens Weber <jens@tuxane.com>
+# v3.02: (jw) Some more changes, see README.Slackware and changelog
 
 PRGNAM=scite
-VERSION=2.27
+VERSION=3.02
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -20,6 +21,7 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
+HELPBROWSER=mozilla
 
 
 if [ "$ARCH" = "i486" ]; then
@@ -47,13 +49,15 @@ chown -R root:root scite/ scintilla/
 chmod -R u+w,go+r-w,a-s scite/ scintilla/
 
 cd $TMP/scintilla
-sed -i "s%-Os%$SLKCFLAGS%g" gtk/makefile
+sed -i "s/^\(CXXFLAGS\)/\1+/g" gtk/makefile
+CXXFLAGS="$SLKCFLAGS" \
 make -C gtk prefix=/usr
 
 cd $TMP/scite
-sed -i "s%-Os%$SLKCFLAGS%g" gtk/makefile
-sed -i "s%-Os%$SLKCFLAGS%g" src/Embedded.properties
-sed -i "s%-Os%$SLKCFLAGS%g" src/cpp.properties
+sed -i "s%xdg-open%$HELPBROWSER%g" src/Embedded.properties
+sed -i "s%xdg-open%$HELPBROWSER%g" src/SciTEGlobal.properties
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 make -C gtk prefix=/usr
 make -C gtk install DESTDIR=$PKG
 
@@ -63,13 +67,17 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 ( cd $PKG/usr/bin ; ln -sf SciTE scite )
 
 mkdir -p $PKG/usr/share/scite
-cat $CWD/config/SciTEGlobal.properties >> $PKG/usr/share/scite/SciTEGlobal.properties
-
 mkdir -p $PKG/usr/man/man1
 cat doc/scite.1 | gzip -9c > $PKG/usr/man/man1/scite.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
 cp -a README License.txt  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/config/SciTEGlobal.properties.new >> $PKG/usr/doc/$PRGNAM-$VERSION/SciTEGlobal.properties.new
+cat $CWD/config/SciTEUser.properties.new >> $PKG/usr/doc/$PRGNAM-$VERSION/SciTEUser.properties.new
+cat $CWD/config/changelog >> $PKG/usr/doc/$PRGNAM-$VERSION/changelog
+cat $CWD/config/README.Slackware >> $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
+
+
 for i in $PKG/usr/share/scite/*.html $PKG/usr/share/scite/*.png ; do 
   ln -s /usr/share/scite/$(basename $i) \
         $PKG/usr/doc/$PRGNAM-$VERSION/html/$(basename $i) ;
diff --git a/development/scite/scite.info b/development/scite/scite.info
index ae05ece67a32..9c1a0f7e5bb3 100644
--- a/development/scite/scite.info
+++ b/development/scite/scite.info
@@ -1,10 +1,10 @@
 PRGNAM="scite"
-VERSION="2.27"
+VERSION="3.02"
 HOMEPAGE="http://scintilla.org/SciTE.html"
-DOWNLOAD="http://downloads.sourceforge.net/scintilla/scite227.tgz"
-MD5SUM="ac5aafa1b47da3792a56d5fd9f383fda"
+DOWNLOAD="http://downloads.sourceforge.net/scintilla/scite302.tgz"
+MD5SUM="928a4ef3773fe7eb30799bece8b3b879"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Jens Weber"
 EMAIL="jens@tuxane.com"
-APPROVED="rworkman"
+APPROVED="Niels Horn"