From 8a1a87a0bb75f609d3466d15faffa4733ae1ead4 Mon Sep 17 00:00:00 2001 From: Jens Weber Date: Sun, 24 Jul 2011 13:09:52 -0500 Subject: [PATCH] development/scite: Updated for version 2.27. Signed-off-by: Robby Workman --- development/scite/README | 18 +-- .../scite/config/SciTEGlobal.properties | 105 ++++++++++++++++++ .../scite/{ => config}/SciTEUser.properties | 5 +- development/scite/doinst.sh | 1 + development/scite/scite.SlackBuild | 47 ++++---- development/scite/scite.info | 8 +- development/scite/slack-desc | 16 +-- 7 files changed, 157 insertions(+), 43 deletions(-) create mode 100644 development/scite/config/SciTEGlobal.properties rename development/scite/{ => config}/SciTEUser.properties (92%) diff --git a/development/scite/README b/development/scite/README index d2201cdc33..d9eefa5f62 100644 --- a/development/scite/README +++ b/development/scite/README @@ -1,9 +1,13 @@ SciTE is a SCIntilla based Text Editor. Originally built to demonstrate -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. +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 (SciTEUser.properties) provided -with the tarball. If you'd like to use it (at your own risk), learn the -different options, rename it to .SciTEUser.properties and place it under -your user's home directory. +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. diff --git a/development/scite/config/SciTEGlobal.properties b/development/scite/config/SciTEGlobal.properties new file mode 100644 index 0000000000..aa8d3948d0 --- /dev/null +++ b/development/scite/config/SciTEGlobal.properties @@ -0,0 +1,105 @@ +# Those settings get merged at package build time +# USER DEFINED SETTINGS +# Globals + +minimize.to.tray=1 +output.scroll=1 +tabbar.multiline=1 +toolbar.visible=1 +toolbar.usestockicons=1 +statusbar.visible=1 +pathbar.visible=1 +horizontal.scrollbar=1 +horizontal.scroll.width=700 +check.if.already.open=1 +fileselector.width=800 +fileselector.height=600 +fileselector.show.hidden=1 + + +# Sizes and visibility in edit pane + + +# Element styles + + +# Scripting + + +# Checking +save.all.for.build=1 +check.if.already.open=1 + +default.file.ext=.cxx +save.session=1 +session.bookmarks=1 + + +# Indentation + +# Wrapping of long lines +wrap=1 +wrap.style=2 +output.wrap=1 + + +# Folding +# enable folding, and show lines below when collapsed. + + +# Find and Replace +if PLAT_GTK + find.command=grep --line-number "$(find.what)" $(find.files) + + +find.in.dot=1 +find.in.binary=1 + +# Behaviour + +tabsize=3 +indent.size=3 + +autocompleteword.automatic=1 + +if PLAT_GTK + font.base=font:!Bitstream Vera Sans Mono,size:12 + # font.base=font:Arial,size:10 + font.small=$(font.base) + font.comment=$(font.base) + font.code.comment.box=$(font.comment) + font.code.comment.line=$(font.comment) + font.code.comment.doc=$(font.comment) + font.text=$(font.base) + font.text.comment=$(font.base) + font.embedded.base=$(font.base) + font.embedded.comment=$(font.base) + font.monospace=$(font.base) + font.vbs=$(font.base) +font.js=$(font.comment) + +comment.block.hypertext=//~ +comment.block.sql=--~ +xml.auto.close.tags=1 + +# Status Bar + +if PLAT_GTK + command.print.*=a2ps "$(FileNameExt)" + command.scite.help=mozilla "file://$(SciteDefaultHome)/SciTEDoc.html" + +# Internationalisation + + +# Export + +# Define values for use in the imported properties files + +Apache Confi&g|conf||\ +CMake|cmake||\ +&nnCron crontab|tab||\ + +# Import all the language specific properties files +import cmake +import nncrontab +lexer.*.slackbuilds=shell \ No newline at end of file diff --git a/development/scite/SciTEUser.properties b/development/scite/config/SciTEUser.properties similarity index 92% rename from development/scite/SciTEUser.properties rename to development/scite/config/SciTEUser.properties index a654cc15be..23477b7aff 100644 --- a/development/scite/SciTEUser.properties +++ b/development/scite/config/SciTEUser.properties @@ -5,12 +5,13 @@ position.width=1015 position.height=717 minimize.to.tray=1 - +toolbar.visible=1 horizontal.scrollbar=1 horizontal.scroll.width=700 tabbar.visible=1 statusbar.visible=1 +pathbar.visible=1 check.if.already.open=1 tabsize=3 @@ -24,7 +25,7 @@ autocompleteword.automatic=1 if PLAT_GTK font.base=font:!Bitstream Vera Sans Mono,size:12 - # font.base=font:Arial,size:12 + # font.base=font:Arial,size:10 font.small=$(font.base) font.comment=$(font.base) font.code.comment.box=$(font.comment) diff --git a/development/scite/doinst.sh b/development/scite/doinst.sh index 5fb28930db..4e8ba7071d 100644 --- a/development/scite/doinst.sh +++ b/development/scite/doinst.sh @@ -1,3 +1,4 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi + diff --git a/development/scite/scite.SlackBuild b/development/scite/scite.SlackBuild index 7f4569be4e..423c7b7c0d 100644 --- a/development/scite/scite.SlackBuild +++ b/development/scite/scite.SlackBuild @@ -1,9 +1,10 @@ #!/bin/sh # Slackware build script for SciTE # Written by Iskar Enev +# Some modifications for v2.27 by Jens Weber PRGNAM=scite -VERSION=2.12 +VERSION=2.27 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -20,6 +21,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -34,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -44,38 +46,39 @@ tar xvf $CWD/${PRGNAM}$(echo $VERSION | tr -d .).tgz chown -R root:root scite/ scintilla/ chmod -R u+w,go+r-w,a-s scite/ scintilla/ -# Build Scintilla first -cd $TMP/scintilla/gtk -sed -i "s%CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic -Os %CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic %" makefile -sed -i "s%CXXFLAGS=-DNDEBUG -Os %CXXFLAGS=-DNDEBUG $SLKCFLAGS %" makefile -make prefix=/usr +cd $TMP/scintilla +sed -i "s%-Os%$SLKCFLAGS%g" gtk/makefile +make -C gtk prefix=/usr -cd $TMP/scite/gtk -sed -i "s%CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -Os %CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic %" makefile -sed -i "s%CXXTFLAGS=-DNDEBUG -Os %CXXTFLAGS=-DNDEBUG $SLKCFLAGS %" makefile - -make prefix=/usr -make install DESTDIR=$PKG - -( cd $PKG/usr/bin ; ln -sf SciTE scite ) +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 +make -C gtk prefix=/usr +make -C gtk install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -cd $TMP/scite -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html -cp -a README License.txt $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $PKG/usr/share/scite/*.html $PKG/usr/share/scite/*.png \ - $PKG/usr/doc/$PRGNAM-$VERSION/html -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +( 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 +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) ; +done +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} - diff --git a/development/scite/scite.info b/development/scite/scite.info index f292a0720e..ae05ece67a 100644 --- a/development/scite/scite.info +++ b/development/scite/scite.info @@ -1,10 +1,10 @@ PRGNAM="scite" -VERSION="2.12" +VERSION="2.27" HOMEPAGE="http://scintilla.org/SciTE.html" -DOWNLOAD="http://downloads.sourceforge.net/scintilla/scite212.tgz" -MD5SUM="8868c06c1cfb248abd92cb3956bb5ba1" +DOWNLOAD="http://downloads.sourceforge.net/scintilla/scite227.tgz" +MD5SUM="ac5aafa1b47da3792a56d5fd9f383fda" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Jens Weber" EMAIL="jens@tuxane.com" -APPROVED="Erik Hanson" +APPROVED="rworkman" diff --git a/development/scite/slack-desc b/development/scite/slack-desc index 3ea6a0bfee..25edc65bd7 100644 --- a/development/scite/slack-desc +++ b/development/scite/slack-desc @@ -7,13 +7,13 @@ |-----handy-ruler------------------------------------------------------| scite: SciTE (SCIntilla based Text Editor) -scite: -scite: SciTE is a SCIntilla based Text Editor. Originally built to +scite: +scite: SciTE is a SCIntilla based Text Editor. Originally built to scite: demonstrate Scintilla, it has grown to be a generally useful scite: editor with facilities for building and running programs. -scite: -scite: -scite: -scite: -scite: -scite: +scite: +scite: There are more language files for SciTE on +scite: http://code.google.com/p/scite-files/wiki/Customization +scite: +scite: +scite: