3 files changed, 17 insertions, 33 deletions
diff --git a/graphics/OpenCASCADE/fix-ftgl-includes.patch b/graphics/OpenCASCADE/OpenCASCADE-6.5.2_ftgl.patch
index 920ca81feb..cb7fbc99d9 100644
--- a/graphics/OpenCASCADE/fix-ftgl-includes.patch
+++ b/graphics/OpenCASCADE/OpenCASCADE-6.5.2_ftgl.patch
@@ -1,15 +1,5 @@
-Fix detection of FTGL in configure.in
-
-Also modify installed headers to search for FTGL headers in
-the right directory.  This is not needed to build opencascade,
-but may help people including those headers.
-And last, fix usage of FTGL, FTFace is an internal structure
-of FTGL and is no more exported.
-
-Index: opencascade/ros/configure.in
-===================================================================
---- opencascade.orig/ros/configure.in
-+++ opencascade/ros/configure.in
+--- OpenCASCADE-6.5.2/ros/configure.ac	2011-09-30 13:32:47.000000000 -0300
++++ OpenCASCADE-6.5.2_patched/ros/configure.ac	2012-01-02 13:35:24.000000000 -0200
 @@ -422,7 +422,7 @@
    HAVE_FTGL=yes
    HAVE_FTGL_INC=yes
@@ -31,11 +21,9 @@ Index: opencascade/ros/configure.in
  #include <FTGL/FTGLTextureFont.h>
  ], [
  FTGLTextureFont font("");], [
-Index: opencascade/ros/inc/OpenGl_FontMgr.hxx
-===================================================================
---- opencascade.orig/ros/inc/OpenGl_FontMgr.hxx
-+++ opencascade/ros/inc/OpenGl_FontMgr.hxx
-@@ -7,7 +7,7 @@
+--- OpenCASCADE-6.5.2/ros/inc/OpenGl_FontMgr.hxx	2011-09-02 12:43:25.000000000 -0300
++++ OpenCASCADE-6.5.2_patched/ros/inc/OpenGl_FontMgr.hxx	2012-01-02 13:32:57.000000000 -0200
+@@ -6,7 +6,7 @@
  # include <stdlib.h>
  #endif
  
@@ -44,10 +32,8 @@ Index: opencascade/ros/inc/OpenGl_FontMgr.hxx
  
  #include <InterfaceGraphic.hxx>
  #include <TCollection_HAsciiString.hxx>
-Index: opencascade/ros/inc/OpenGl_TextRender.hxx
-===================================================================
---- opencascade.orig/ros/inc/OpenGl_TextRender.hxx
-+++ opencascade/ros/inc/OpenGl_TextRender.hxx
+--- OpenCASCADE-6.5.2/ros/inc/OpenGl_TextRender.hxx	2011-09-02 12:43:25.000000000 -0300
++++ OpenCASCADE-6.5.2_patched/ros/inc/OpenGl_TextRender.hxx	2012-01-02 13:32:57.000000000 -0200
 @@ -5,7 +5,7 @@
  #include <NCollection_DataMap.hxx>
  #include <TCollection_AsciiString.hxx>
@@ -57,10 +43,8 @@ Index: opencascade/ros/inc/OpenGl_TextRender.hxx
  
  #define NUM_FONT_SIZES 40
  #define NUM_CHAR_FONT 1024
-Index: opencascade/ros/src/OpenGl/OpenGl_FontMgr.cxx
-===================================================================
---- opencascade.orig/ros/src/OpenGl/OpenGl_FontMgr.cxx
-+++ opencascade/ros/src/OpenGl/OpenGl_FontMgr.cxx
+--- OpenCASCADE-6.5.2/ros/src/OpenGl/OpenGl_FontMgr.cxx	2011-09-02 12:43:25.000000000 -0300
++++ OpenCASCADE-6.5.2_patched/ros/src/OpenGl/OpenGl_FontMgr.cxx	2012-01-02 13:32:57.000000000 -0200
 @@ -1,8 +1,6 @@
  #include <OpenGl_FontMgr.hxx>
  
diff --git a/graphics/OpenCASCADE/OpenCASCADE.SlackBuild b/graphics/OpenCASCADE/OpenCASCADE.SlackBuild
index aef6eeeabc..263f69b9c9 100644
--- a/graphics/OpenCASCADE/OpenCASCADE.SlackBuild
+++ b/graphics/OpenCASCADE/OpenCASCADE.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for OpenCASCADE
 # With some inspiration from the Arch PKGBUILD script
 
-# Copyright 2010-2011 Niels Horn, Rio de Janeiro, RJ, Brazil
+# Copyright 2010-2012 Niels Horn, Rio de Janeiro, RJ, Brazil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# revision date: 2011/08/10
+# revision date: 2012/01/03
 
 PRGNAM=OpenCASCADE
-VERSION=${VERSION:-6.5.1}
+VERSION=${VERSION:-6.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,8 +77,8 @@ chmod -R u+w,go+r-w,a-s .
 patch -p1 < $CWD/newgcc.patch
 
 # Fix for newer fgtl versions
-#  (thanks to the guys from openSUSE)
-patch -p1 < $CWD/fix-ftgl-includes.patch
+#  (based on earlier patch from openSUSE)
+patch -p1 < $CWD/OpenCASCADE-6.5.2_ftgl.patch
 
 # Change to the directory where we'll build from
 cd ros
diff --git a/graphics/OpenCASCADE/OpenCASCADE.info b/graphics/OpenCASCADE/OpenCASCADE.info
index dcbbd2ee7d..1a2208c7c4 100644
--- a/graphics/OpenCASCADE/OpenCASCADE.info
+++ b/graphics/OpenCASCADE/OpenCASCADE.info
@@ -1,8 +1,8 @@
 PRGNAM="OpenCASCADE"
-VERSION="6.5.1"
+VERSION="6.5.2"
 HOMEPAGE="http://www.opencascade.org/"
-DOWNLOAD="http://files.opencascade.com/OCCT/OCC_6.5.1_release/OpenCASCADE651.tar.gz"
-MD5SUM="3d554533671c1c817ed0b70078e9e210"
+DOWNLOAD="http://files.opencascade.com/OCCT/OCC_6.5.2_release/OpenCASCADE652.tar.gz"
+MD5SUM="bb832d308409ddbdad89708496f2ecad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"