libraries/cairomm: Updated for version 1.2.4

4 files changed, 22 insertions, 17 deletions

diff --git a/libraries/cairomm/README b/libraries/cairomm/README
index ad0116b0eb..19aa411058 100644
--- a/libraries/cairomm/README
+++ b/libraries/cairomm/README
@@ -3,9 +3,3 @@ 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 (also available from SlackBuilds.org).
-
-If you want to build a newer version of cairomm, this script has been
-tested and found to work properly with cairomm-1.2.2.  The only change
-needed in the script is the VERSION string.  You will, however, have
-to install the cairo-1.2.4 package from Slackware 11.0 /testing.
-
diff --git a/libraries/cairomm/cairomm.SlackBuild b/libraries/cairomm/cairomm.SlackBuild
index fe9d4f00e8..66b55e42ab 100644
--- a/libraries/cairomm/cairomm.SlackBuild
+++ b/libraries/cairomm/cairomm.SlackBuild
@@ -25,7 +25,7 @@
 # Modified by the SlackBuilds.org project
 
 PKGNAME=cairomm
-VERSION=0.6.0
+VERSION=1.2.4
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -58,13 +58,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-static=no \
   || exit 1
 
-make -j3 || exit 1
+make || exit 1
 make install-strip DESTDIR=$PKG || exit 1
 
 mkdir -p $PKG/usr/doc/$PKGNAME-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README TODO examples \
+cp -a AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README TODO \
   $PKG/usr/doc/$PKGNAME-$VERSION
-mv $PKG/usr/share/doc/libcairomm-1.0/reference/html $PKG/usr/doc/$PKGNAME-$VERSION
+# API reference docs are in here, but we don't need those
 rm -rf $PKG/usr/share/doc
 cat $CWD/$PKGNAME.SlackBuild > $PKG/usr/doc/$PKGNAME-$VERSION/$PKGNAME.SlackBuild
 
diff --git a/libraries/cairomm/cairomm.info b/libraries/cairomm/cairomm.info
index fdec31eba7..ec28ce7f71 100644
--- a/libraries/cairomm/cairomm.info
+++ b/libraries/cairomm/cairomm.info
@@ -1,8 +1,8 @@
 PRGNAM="cairomm"
-VERSION="0.6.0"
+VERSION="1.2.4"
 HOMEPAGE="http://cairographics.org/cairomm/"
-DOWNLOAD="http://cairographics.org/releases/cairomm-0.6.0.tar.gz"
-MD5SUM="9d967cf486b0ac59d451d47922c99e6f"
+DOWNLOAD="http://cairographics.org/releases/cairomm-1.2.4.tar.gz"
+MD5SUM="5d862facfbd0098c9bae618b61f7c8e6"
 MAINTAINER="paul wisehart"
 EMAIL="wise@lupulin.net"
-APPROVED="robw810"
+APPROVED="rworkman"
diff --git a/libraries/cairomm/slack-desc b/libraries/cairomm/slack-desc
index 3fe3b19e2f..e22f77fa8d 100644
--- a/libraries/cairomm/slack-desc
+++ b/libraries/cairomm/slack-desc
@@ -1,8 +1,19 @@
-cairomm:
-cairomm: cairomm 1.2.2
-cairomm: pkg'd by paul wisehart <wise@lupulin.net>
+# 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------------------------------------------------------|
+cairomm: cairomm (C++ wrapper for the cairo graphics library)
 cairomm:
 cairomm: cairomm is a C++ wrapper for the cairo graphics library. It offers
 cairomm: all the power of cairo with an interface familiar to C++ developers,
 cairomm: including use of the Standard Template Library where it makes sense.
 cairomm: 
+cairomm:
+cairomm:
+cairomm:
+cairomm: 
+cairomm: