summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/cairomm/README3
-rw-r--r--libraries/cairomm/cairomm.SlackBuild13
-rw-r--r--libraries/cairomm/cairomm.info8
3 files changed, 16 insertions, 8 deletions
diff --git a/libraries/cairomm/README b/libraries/cairomm/README
index 85b6a3ae77..b3aa95e766 100644
--- a/libraries/cairomm/README
+++ b/libraries/cairomm/README
@@ -2,5 +2,4 @@ cairomm is a C++ wrapper for the cairo graphics library. It offers
all the power of cairo with an interface familiar to C++ developers,
including use of the Standard Template Library where it makes sense.
-This requires glibmm, and graphviz is optional. Both are available
-from SlackBuilds.org.
+This requires glibmm, and graphviz is optional.
diff --git a/libraries/cairomm/cairomm.SlackBuild b/libraries/cairomm/cairomm.SlackBuild
index e9d0806d78..7b13a8691f 100644
--- a/libraries/cairomm/cairomm.SlackBuild
+++ b/libraries/cairomm/cairomm.SlackBuild
@@ -23,20 +23,25 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=cairomm
-VERSION=${VERSION:-1.6.4}
+VERSION=${VERSION:-1.8.0}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-CWD=$(pwd)
+CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
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
@@ -54,6 +59,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -68,10 +74,11 @@ cp -a AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README \
$PKG/usr/doc/$PRGNAM-$VERSION
# API reference docs are in here, but we don't need those
rm -rf $PKG/usr/share/doc
+rmdir $PKG/usr/share
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/cairomm/cairomm.info b/libraries/cairomm/cairomm.info
index de84cf6ee9..c97e265c6c 100644
--- a/libraries/cairomm/cairomm.info
+++ b/libraries/cairomm/cairomm.info
@@ -1,8 +1,10 @@
PRGNAM="cairomm"
-VERSION="1.6.4"
+VERSION="1.8.0"
HOMEPAGE="http://cairographics.org/cairomm/"
-DOWNLOAD="http://cairographics.org/releases/cairomm-1.6.4.tar.gz"
-MD5SUM="63561c62536173a98f03005dfe55c90e"
+DOWNLOAD="http://cairographics.org/releases/cairomm-1.8.0.tar.gz"
+DOWNLOAD_x86_64=""
+MD5SUM="15c0f56eee57bb418c38463a6297d715"
+MD5SUM_x86_64=""
MAINTAINER="paul wisehart"
EMAIL="wise@lupulin.net"
APPROVED="rworkman"