4 files changed, 31 insertions, 142 deletions
diff --git a/development/Coin/Coin.SlackBuild b/development/Coin/Coin.SlackBuild
index eb99408893..77dde87ab2 100644
--- a/development/Coin/Coin.SlackBuild
+++ b/development/Coin/Coin.SlackBuild
@@ -7,8 +7,10 @@
 # Revision date: 2010/07/10
 
 PRGNAM=Coin
-VERSION=${VERSION:-3.1.3}
-BUILD=${BUILD:-4}
+SRCNAM=coin
+VERSION=${VERSION:-4.0.0.f8a82c09bb5aa62702b9ed396067a25905571c82}
+COMMIT=f8a82c09bb5aa62702b9ed396067a25905571c82
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -51,9 +53,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$COMMIT
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -61,38 +63,36 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Thanks Fedora
-patch -p1 < $CWD/memhandler-initialization.patch
-
-# Thanks Debian
-patch -p1 < $CWD/coin-include_and_js.patch
-
-# fix compilation - from AUR
-sed -i \
-  '/^#include "fonts\/freetype.h"$/i #include <cstdlib>\n#include <cmath>' \
-  src/fonts/freetype.cpp
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux$ARCHQUADLET
-
-make
-make install DESTDIR=$PKG
+mkdir -p coin_build
+cd coin_build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -Hcoin -G "Unix Makefiles" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCOIN_BUILD_DOCUMENTATION=ON \
+    -DCOIN_BUILD_DOCUMENTATION_MAN=ON \
+    -DCMAKE_BUILD_TYPE=Release ..
+  
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+mv $PKG/usr/share/man $PKG/usr/
+mkdir -p $PKG/usr/man/man1
+cp man/man1/coin-config.1 $PKG/usr/man/man1/
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog FAQ* INSTALL* LICENSE.GPL NEWS RE* THANKS \
+  AUTHORS COPYING ChangeLog FAQ* INSTALL* NEWS RE* THANKS \
   $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/Coin/html $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG/usr/share/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/Coin/Coin.info b/development/Coin/Coin.info
index c6bf34c600..765ccbfbf6 100644
--- a/development/Coin/Coin.info
+++ b/development/Coin/Coin.info
@@ -1,8 +1,8 @@
 PRGNAM="Coin"
-VERSION="3.1.3"
-HOMEPAGE="https://bitbucket.org/Coin3D/coin/wiki/Home"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/Coin-3.1.3.tar.gz"
-MD5SUM="1538682f8d92cdf03e845c786879fbea"
+VERSION="4.0.0.f8a82c09bb5aa62702b9ed396067a25905571c82"
+HOMEPAGE="https://coin3d.github.io/"
+DOWNLOAD="https://github.com/coin3d/coin/archive/f8a82c0/coin-4.0.0.f8a82c09bb5aa62702b9ed396067a25905571c82.tar.gz"
+MD5SUM="17f98e2166a3189f7c8f2b783224bc0b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/Coin/coin-include_and_js.patch b/development/Coin/coin-include_and_js.patch
deleted file mode 100644
index ce435d0275..0000000000
--- a/development/Coin/coin-include_and_js.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- coin3-3.1.3.orig/include/Inventor/SbBasic.h
-+++ coin3-3.1.3/include/Inventor/SbBasic.h
-@@ -24,6 +24,7 @@
-  *
- \**************************************************************************/
- 
-+#include <Inventor/C/errors/debugerror.h>
- #include <Inventor/C/basic.h>
- 
- /* ********************************************************************** */
---- coin3-3.1.3.orig/html/dynsections.js
-+++ coin3-3.1.3/html/dynsections.js
-@@ -0,0 +1,78 @@
-+function toggleVisibility(linkObj)
-+{
-+ var base = $(linkObj).attr('id');
-+ var summary = $('#'+base+'-summary');
-+ var content = $('#'+base+'-content');
-+ var trigger = $('#'+base+'-trigger');
-+ var src=$(trigger).attr('src');
-+ if (content.is(':visible')===true) {
-+   content.hide();
-+   summary.show();
-+   $(linkObj).addClass('closed').removeClass('opened');
-+   $(trigger).attr('src',src.substring(0,src.length-8)+'closed.png');
-+ } else {
-+   content.show();
-+   summary.hide();
-+   $(linkObj).removeClass('closed').addClass('opened');
-+   $(trigger).attr('src',src.substring(0,src.length-10)+'open.png');
-+ } 
-+ return false;
-+}
-+
-+function updateStripes()
-+{
-+  $('table.directory tr').
-+       removeClass('even').filter(':visible:even').addClass('even');
-+}
-+function toggleLevel(level)
-+{
-+  $('table.directory tr').each(function(){ 
-+    var l = this.id.split('_').length-1;
-+    var i = $('#img'+this.id.substring(3));
-+    var a = $('#arr'+this.id.substring(3));
-+    if (l<level+1) {
-+      i.attr('src','ftv2folderopen.png');
-+      a.attr('src','ftv2mnode.png');
-+      $(this).show();
-+    } else if (l==level+1) {
-+      i.attr('src','ftv2folderclosed.png');
-+      a.attr('src','ftv2pnode.png');
-+      $(this).show();
-+    } else {
-+      $(this).hide();
-+    }
-+  });
-+  updateStripes();
-+}
-+function toggleFolder(id) 
-+{
-+  var n = $('[id^=row_'+id+']');
-+  var i = $('[id^=img_'+id+']');
-+  var a = $('[id^=arr_'+id+']');
-+  var c = n.slice(1);
-+  if (c.filter(':first').is(':visible')===true) {
-+    i.attr('src','ftv2folderclosed.png');
-+    a.attr('src','ftv2pnode.png');
-+    c.hide();
-+  } else {
-+    i.attr('src','ftv2folderopen.png');
-+    a.attr('src','ftv2mnode.png');
-+    c.show();
-+  }
-+  updateStripes();
-+}
-+
-+function toggleInherit(id)
-+{
-+  var rows = $('tr.inherit.'+id);
-+  var img = $('tr.inherit_header.'+id+' img');
-+  var src = $(img).attr('src');
-+  if (rows.filter(':first').is(':visible')===true) {
-+    rows.css('display','none');
-+    $(img).attr('src',src.substring(0,src.length-8)+'closed.png');
-+  } else {
-+    rows.css('display','table-row'); // using show() causes jump in firefox
-+    $(img).attr('src',src.substring(0,src.length-10)+'open.png');
-+  }
-+}
-+
diff --git a/development/Coin/memhandler-initialization.patch b/development/Coin/memhandler-initialization.patch
deleted file mode 100644
index 4c346487ed..0000000000
--- a/development/Coin/memhandler-initialization.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Coin-3.1.3/src/misc/SbHash.h.init	2010-03-02 22:20:09.000000000 +0900
-+++ Coin-3.1.3/src/misc/SbHash.h	2016-04-22 16:52:39.888883757 +0900
-@@ -89,6 +89,8 @@
-     cc_memalloc_deallocate(entry->memhandler, ptr);
-   }
-   SbHashEntry(const Key & key, const Type & obj) : key(key), obj(obj) {}
-+  SbHashEntry(const Key & key, const Type & obj, cc_memalloc *memhandler) 
-+		: key(key), obj(obj), memhandler(memhandler) {}
- 
-   Key key;
-   Type obj;
-@@ -218,7 +220,7 @@
-     /* Key not already in the hash table; insert a new
-      * entry as the first element in the bucket
-      */
--    entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj);
-+    entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj, this->memhandler);
-     entry->next = this->buckets[i];
-     this->buckets[i] = entry;
-