merging with changes made since 21th May

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1903 370017ae-e619-0410-ac65-c121f96126d4

6 files changed, 166 insertions, 7 deletions

diff --git a/dev/cpp/cairomm/cairomm.SlackBuild b/dev/cpp/cairomm/cairomm.SlackBuild
index 70a7664f..fffc56e0 100755
--- a/dev/cpp/cairomm/cairomm.SlackBuild
+++ b/dev/cpp/cairomm/cairomm.SlackBuild
@@ -31,7 +31,7 @@ CWD="$(pwd)"
 SRC_NAME="cairomm"
 PKG_NAME="cairomm"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.6.0}
+SRC_VERSION=${VERSION:=1.4.8}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
diff --git a/dev/cpp/glademm/glademm.SlackBuild b/dev/cpp/glademm/glademm.SlackBuild
new file mode 100755
index 00000000..6f38a633
--- /dev/null
+++ b/dev/cpp/glademm/glademm.SlackBuild
@@ -0,0 +1,152 @@
+#!/bin/bash
+#
+#  glademm.SlackBuild is free software; you can redistribute
+#  it and/or modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the License,
+#  or any later version.
+#
+#  gtkmm.SlackBuild is distributed in the hope that it will
+#  be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+#  Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along with
+#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+#  Place - Suite 330, Boston, MA 02111-1307, USA
+#
+# slackbuild for gtkmm, by Silvio Rhatto
+# requires: gtkmm
+# tested: glademm-2.6.6
+#
+
+# Look for slackbuildrc
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
+  source /etc/slackbuildrc
+fi
+
+# Set variables
+CWD="$(pwd)"
+SRC_NAME="libglademm"
+PKG_NAME="glademm"
+ARCH=${ARCH:=i486}
+SRC_VERSION=${VERSION:=2.6.6}
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
+BUILD=${BUILD:=1rd}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
+TMP=${TMP:=/tmp}
+PKG=${PKG:=$TMP/package-$PKG_NAME}
+REPOS=${REPOS:=$TMP}
+PREFIX=${PREFIX:=/usr}
+PKG_WORK="$TMP/$SRC_NAME"
+CONF_OPTIONS=${CONF_OPTIONS:=""}
+NUMJOBS=${NUMJOBS:=""}
+
+# Set system libraries' path and optmization flags based on $ARCH
+LIBDIR="$PREFIX/lib"
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+elif [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIR="$PREFIX/lib64"
+fi
+
+# Set error codes (used by createpkg)
+ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
+ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
+ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
+ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+
+# Clean up any leftovers of previous builds
+rm -rf "$PKG_WORK" 2> /dev/null
+rm -rf "$PKG" 2> /dev/null
+
+# Create directories if necessary
+mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
+mkdir -p "$PKG" || exit $ERROR_MKDIR
+mkdir -p "$REPOS" || exit $ERROR_MKDIR
+mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
+
+# Dowload source if necessary
+SRC="$SRC_NAME-$VERSION.tar.bz2"
+URL="http://ftp.acc.umu.se/pub/GNOME/sources/libglademm/2.6/$SRC"
+
+if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
+  wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
+fi
+
+# Untar
+cd "$PKG_WORK"
+tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+cd "$PKG_SRC"
+
+# Configure
+CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+  --prefix="$PREFIX" --libdir="$LIBDIR" $CONF_OPTIONS || exit $ERROR_CONF
+
+# Compile
+make $NUMJOBS || exit $ERROR_MAKE
+
+# Install
+make install DESTDIR="$PKG" || exit $ERROR_INSTALL
+
+# Strip binaries
+( cd "$PKG"
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Install documentation
+DOCS="AUTHORS TODO COPYING ChangeLog NEWS README INSTALL"
+mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
+for doc in $DOCS; do
+  if [ -f "$doc" ]; then
+    cp -a $doc "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
+  fi
+done
+
+# Add package description (slack-desc)
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+cat << EODESC > "$PKG/install/slack-desc"
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler--------------------------------------------------------|
+glademm: glademm (The C++ interface to LibGlade)
+glademm:
+glademm: Glademm is the official C++ interface for LibGlade, using the Gtkmm
+glademm: C++ interface of GTK.
+glademm: 
+glademm: 
+glademm:
+glademm:
+glademm:
+glademm:
+glademm:
+EODESC
+
+# Build the package
+cd "$PKG"
+makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+
+# Delete source and build directories if requested
+if [ "$CLEANUP" == "yes" ]; then
+  rm -rf "$PKG_WORK" "$PKG"
+fi
diff --git a/dev/cpp/glademm/slack-required b/dev/cpp/glademm/slack-required
new file mode 100644
index 00000000..32021618
--- /dev/null
+++ b/dev/cpp/glademm/slack-required
@@ -0,0 +1,6 @@
+# Dependency list to gtkmm
+#
+# dependency [condition] [version]]
+cairomm		
+glibmm		
+gtkmm
diff --git a/dev/cpp/glibmm/glibmm.SlackBuild b/dev/cpp/glibmm/glibmm.SlackBuild
index fc59ab5f..893547ca 100644
--- a/dev/cpp/glibmm/glibmm.SlackBuild
+++ b/dev/cpp/glibmm/glibmm.SlackBuild
@@ -31,7 +31,7 @@ CWD="$(pwd)"
 SRC_NAME="glibmm"
 PKG_NAME="glibmm"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=2.12.10}
+SRC_VERSION=${VERSION:=2.14.2}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
@@ -77,14 +77,14 @@ mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
 SRC="$SRC_NAME-$VERSION.tar.bz2"
-URL="http://ftp.acc.umu.se/pub/GNOME/sources/glibmm/2.12/$SRC"
+URL="http://ftp.acc.umu.se/pub/GNOME/sources/glibmm/2.14/$SRC"
 
 if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
 MD5SUM_SRC="$(md5sum "$SRC_DIR/$SRC" | cut -d " " -f 1)"
-MD5SUM_URL="85830693d669f0d86d6e64db3b57f581"
+MD5SUM_URL=58b4fdc97738795a19b1f5ad37f186b4
 
 [ "$MD5SUM_SRC" == "$MD5SUM_URL" ] || exit $ERROR_MD5
 
diff --git a/dev/cpp/gtkmm/gtkmm.SlackBuild b/dev/cpp/gtkmm/gtkmm.SlackBuild
index d7472904..0e4cd5ab 100755
--- a/dev/cpp/gtkmm/gtkmm.SlackBuild
+++ b/dev/cpp/gtkmm/gtkmm.SlackBuild
@@ -31,7 +31,7 @@ CWD="$(pwd)"
 SRC_NAME="gtkmm"
 PKG_NAME="gtkmm"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=2.8.12}
+SRC_VERSION=${VERSION:=2.12.7}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
@@ -77,7 +77,7 @@ mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
 SRC="$SRC_NAME-$VERSION.tar.bz2"
-URL="http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.8/$SRC"
+URL="http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.12/$SRC"
 
 if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
diff --git a/dev/cpp/gtkmm/slack-required b/dev/cpp/gtkmm/slack-required
index 8a259a14..5d33ddc9 100644
--- a/dev/cpp/gtkmm/slack-required
+++ b/dev/cpp/gtkmm/slack-required
@@ -1,4 +1,5 @@
 # Dependency list to gtkmm
 #
 # dependency [condition] [version]]
-cairomm		glibmm		
+cairomm		
+glibmm