4 files changed, 16 insertions, 34 deletions
diff --git a/desktop/cairo-dock/cairo-dock.SlackBuild b/desktop/cairo-dock/cairo-dock.SlackBuild
index 9392108c33..5ad8dd0e1c 100644
--- a/desktop/cairo-dock/cairo-dock.SlackBuild
+++ b/desktop/cairo-dock/cairo-dock.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
 
 # Slackware build script for cairo-dock
+
 # Written by Robert Goodall (cmd.line.geek@gmail.com)
-# Official Site: http://www.glx-dock.org/
+# Currently maintained by Erwin van Zanten (e.van.zanten.evz@gmail.com)
 
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -22,12 +23,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cairo-dock
-VERSION=${VERSION:-2.3.0~2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.1.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCBUILD=1
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -61,15 +60,11 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.$SRCBUILD.tar.gz
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# Starting with glib 2.32 it is now mandatory to
-# include glib.h instead of individual headers.
-patch -p1 -i $CWD/glib-single-include.patch
-
 cmake \
   -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
diff --git a/desktop/cairo-dock/cairo-dock.info b/desktop/cairo-dock/cairo-dock.info
index 5e3939e913..d4f859a407 100644
--- a/desktop/cairo-dock/cairo-dock.info
+++ b/desktop/cairo-dock/cairo-dock.info
@@ -1,10 +1,10 @@
 PRGNAM="cairo-dock"
-VERSION="2.3.0~2.1"
+VERSION="3.1.2"
 HOMEPAGE="http://www.glx-dock.org"
-DOWNLOAD="http://launchpad.net/cairo-dock-core/2.3/2.3.0/+download/cairo-dock-2.3.0~2.1.tar.gz"
-MD5SUM="8b0f016affc1dd5b3d2272ff99db4507"
+DOWNLOAD="https://launchpad.net/cairo-dock-core/3.1/3.1.2/+download/cairo-dock-3.1.2.tar.gz"
+MD5SUM="c1351c5a4ba21f279206f73cee90b12f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gtkglext"
-MAINTAINER="Robert Goodall"
-EMAIL="cmd.line.geek@gmail.com"
+MAINTAINER="Erwin van Zanten"
+EMAIL="e.van.zanten.evz@gmail.com"
diff --git a/desktop/cairo-dock/glib-single-include.patch b/desktop/cairo-dock/glib-single-include.patch
deleted file mode 100644
index f09298cd6f..0000000000
--- a/desktop/cairo-dock/glib-single-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: cairo-dock-2.3.0~2/src/gldit/cairo-dock-keybinder.h
-===================================================================
---- cairo-dock-2.3.0~2.orig/src/gldit/cairo-dock-keybinder.h
-+++ cairo-dock-2.3.0~2/src/gldit/cairo-dock-keybinder.h
-@@ -31,7 +31,7 @@
- #ifndef __CD_KEY_BINDER_H__
- #define __CD_KEY_BINDER_H__
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- #include "cairo-dock-struct.h"
- #include "cairo-dock-manager.h"
- 
diff --git a/desktop/cairo-dock/slack-desc b/desktop/cairo-dock/slack-desc
index 552741cbfd..e0c3ba1112 100644
--- a/desktop/cairo-dock/slack-desc
+++ b/desktop/cairo-dock/slack-desc
@@ -1,9 +1,9 @@
 # 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 ':'.
+# 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 ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
 cairo-dock: cairo-dock (a light and eye-candy dock)
@@ -15,5 +15,5 @@ cairo-dock: Cairo/OpenGL to render nice graphics with hardware acceleration,
 cairo-dock: which makes it very smooth and low on CPU. It's highly customisable
 cairo-dock: and comes with a lot of ready-to-use themes.
 cairo-dock:
-cairo-dock: homepage: http://www.glx-dock.org
+cairo-dock: Homepage: http://www.glx-dock.org
 cairo-dock: