graphics/brlcad: updated for version 7.34.0

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 5 insertions, 81 deletions

diff --git a/graphics/brlcad/brlcad.SlackBuild b/graphics/brlcad/brlcad.SlackBuild
index 5a4b598d04..f514c2e301 100644
--- a/graphics/brlcad/brlcad.SlackBuild
+++ b/graphics/brlcad/brlcad.SlackBuild
@@ -15,8 +15,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=brlcad
-VERSION=${VERSION:-7.32.6}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-7.34.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -66,12 +66,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-# 20220225 bkw: Fix for null pointer dereference, causes "Error 139" in
-# 'Generating ../../share/db/nist/NIST_MBE_PMI_1.g'. Refs:
-# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256166
-# https://github.com/BRL-CAD/brlcad/commit/b0dd45620f1ffdd8814069df091b20e8780e1b3e
-patch -p1 < $CWD/fix-step-g-segfault.diff
-
 # thanks arch maintainers.
 # fixes build on i586.
 patch -p1 < $CWD/brlcad-skip-gstep.patch
diff --git a/graphics/brlcad/brlcad.info b/graphics/brlcad/brlcad.info
index e55e37ea30..52dae364a7 100644
--- a/graphics/brlcad/brlcad.info
+++ b/graphics/brlcad/brlcad.info
@@ -1,8 +1,8 @@
 PRGNAM="brlcad"
-VERSION="7.32.6"
+VERSION="7.34.0"
 HOMEPAGE="https://brlcad.org"
-DOWNLOAD="https://github.com/BRL-CAD/brlcad/releases/download/rel-7-32-6/brlcad-7.32.6.tar.bz2"
-MD5SUM="34ef03fa65588169aaac3460f2f25359"
+DOWNLOAD="https://github.com/BRL-CAD/brlcad/releases/download/rel-7-34-0/brlcad-7.34.0.tar.bz2"
+MD5SUM="d61017e14d21dffa5a7866b9d4e8844a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/brlcad/fix-step-g-segfault.diff b/graphics/brlcad/fix-step-g-segfault.diff
deleted file mode 100644
index 6c5048232d..0000000000
--- a/graphics/brlcad/fix-step-g-segfault.diff
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Naur brlcad-7.32.4/src/other/stepcode/src/clstepcore/complexSupport.h brlcad-7.32.4.patched/src/other/stepcode/src/clstepcore/complexSupport.h
---- brlcad-7.32.4/src/other/stepcode/src/clstepcore/complexSupport.h	2021-07-28 23:11:47.000000000 -0400
-+++ brlcad-7.32.4.patched/src/other/stepcode/src/clstepcore/complexSupport.h	2022-02-25 17:42:27.909342186 -0500
-@@ -208,26 +208,26 @@
-         // but all we need.
-         EntList * firstNot( JoinType );
-         EntList * nextNot( JoinType j ) {
--            return next->firstNot( j );
-+            return (next) ? next->firstNot(j) : NULL;
-         }
-         EntList * firstWanted( MatchType );
-         EntList * nextWanted( MatchType mat ) {
--            return next->firstWanted( mat );
-+            return (next) ? next->firstWanted(mat) : NULL;
-         }
-         EntList * lastNot( JoinType );
-         EntList * prevNot( JoinType j ) {
--            return prev->lastNot( j );
-+            return (prev) ? prev->lastNot(j) : NULL;
-         }
-         EntList * lastWanted( MatchType );
-         EntList * prevWanted( MatchType mat ) {
--            return prev->lastWanted( mat );
-+            return (prev) ? prev->lastWanted(mat) : NULL;
-         }
- 
-         JoinType join;
-         int multiple() {
-             return ( join != SIMPLE );
-         }
--        EntList * next, *prev;
-+        EntList * next = NULL, *prev = NULL;
- 
-     protected:
-         MatchType viable;
-diff -Naur brlcad-7.32.4/src/other/stepcode/src/exp2cxx/complexSupport.h brlcad-7.32.4.patched/src/other/stepcode/src/exp2cxx/complexSupport.h
---- brlcad-7.32.4/src/other/stepcode/src/exp2cxx/complexSupport.h	2021-07-28 23:11:48.000000000 -0400
-+++ brlcad-7.32.4.patched/src/other/stepcode/src/exp2cxx/complexSupport.h	2022-02-25 17:40:52.465760163 -0500
-@@ -162,26 +162,26 @@
-         // but all we need.
-         EntList * firstNot( JoinType );
-         EntList * nextNot( JoinType j ) {
--            return next->firstNot( j );
-+            return (next) ? next->firstNot(j) : NULL;
-         }
-         EntList * firstWanted( MatchType );
-         EntList * nextWanted( MatchType mat ) {
--            return next->firstWanted( mat );
-+            return (next) ? next->firstWanted(mat) : NULL;
-         }
-         EntList * lastNot( JoinType );
-         EntList * prevNot( JoinType j ) {
--            return prev->lastNot( j );
-+            return (prev) ? prev->lastNot(j) : NULL;
-         }
-         EntList * lastWanted( MatchType );
-         EntList * prevWanted( MatchType mat ) {
--            return prev->lastWanted( mat );
-+            return (prev) ? prev->lastWanted(mat) : NULL;
-         }
- 
-         JoinType join;
-         int multiple() {
-             return ( join != SIMPLE );
-         }
--        EntList * next, *prev;
-+        EntList * next = NULL, *prev = NULL;
- 
-     protected:
-         MatchType viable;