development/geany: Updated for version 0.17

4 files changed, 55 insertions, 14 deletions

diff --git a/development/geany/README b/development/geany/README
index f92e77aa9e..160af50f31 100644
--- a/development/geany/README
+++ b/development/geany/README
@@ -2,3 +2,12 @@ Geany is a text editor using the GTK2 toolkit with basic features of an
 integrated development environment. It was developed to provide a
 small and fast IDE, which has only a few dependencies from other
 packages. It supports many filetypes and has some nice features. 
+
+If you need the GTK Symbol completion (removed in Geany 0.16), You can 
+download them (and other tag-files from: 
+
+    http://download.geany.org/contrib/tags/
+
+and place them in ~/.config/geany/tags/ directory. After this you will 
+need to restart Geany for this to take effect.
+
diff --git a/development/geany/doinst.sh b/development/geany/doinst.sh
index 140e332222..5934a15ab1 100644
--- a/development/geany/doinst.sh
+++ b/development/geany/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/development/geany/geany.SlackBuild b/development/geany/geany.SlackBuild
index fed8e1b920..2e3f5459a0 100644
--- a/development/geany/geany.SlackBuild
+++ b/development/geany/geany.SlackBuild
@@ -1,13 +1,31 @@
 #!/bin/sh
 
 # Slackware build script for Geany
-
 # Written by  Evan Hisey <ehisey@gmail.com>
-# Modified by Robby Workman <rworkman@slackbuilds.org>
-# Modified by Michiel v. Wessem <michiel@slackbuilds.org>
+# Copyright 2009  Michiel van Wessem, Manchester, United Kingdom
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=geany
-VERSION=0.14
+VERSION=0.17
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -19,10 +37,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e # Exit on most errors
@@ -34,18 +55,22 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --exec-prefix=/usr \
   --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-the-force
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
@@ -61,8 +86,9 @@ make install DESTDIR=$PKG
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog* HACKING INSTALL README* THANKS TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/geany/GPL-2 $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL THANKS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/geany/geany.info b/development/geany/geany.info
index 89549c065d..16ee68950f 100644
--- a/development/geany/geany.info
+++ b/development/geany/geany.info
@@ -1,8 +1,8 @@
 PRGNAM="geany"
-VERSION="0.14"
+VERSION="0.17"
 HOMEPAGE="http://geany.uvena.de/Main/HomePage"
-DOWNLOAD="http://downloads.sourceforge.net/geany/geany-0.14.tar.bz2"
-MD5SUM="c6c22c7f9feff81a15f5c8ece03b87c1"
-MAINTAINER="Evan Hisey"
-EMAIL="ehisey@gmail.com"
-APPROVED="rworkman"
+DOWNLOAD="http://downloads.sourceforge.net/geany/geany-0.17.tar.bz2"
+MD5SUM="097f619f5f0800098a2438a216a28e7b"
+MAINTAINER="Michiel van Wessem"
+EMAIL="michiel@slackbuilds.org"
+APPROVED="dsomero"