Accepting request 1300132 from science

OBS-URL: https://build.opensuse.org/request/show/1300132
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/occt?expand=0&rev=17

fix_freetype_tag_type.patch

@@ -1,24 +0,0 @@
-From 7236e83dcc1e7284e66dc61e612154617ef715d6 Mon Sep 17 00:00:00 2001
-From: dpasukhi <dpasukhi@opencascade.com>
-Date: Tue, 27 Aug 2024 11:33:29 +0100
-Subject: [PATCH] 0033808: Coding - FreeType Use unsigned point and contour
- indexing in `FT_Outline`
-
-Changes to auto instead of specific type
----
- src/StdPrs/StdPrs_BRepFont.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/StdPrs/StdPrs_BRepFont.cxx b/src/StdPrs/StdPrs_BRepFont.cxx
-index ab2d9b3c9f..cd701879b1 100644
---- a/src/StdPrs/StdPrs_BRepFont.cxx
-+++ b/src/StdPrs/StdPrs_BRepFont.cxx
-@@ -457,7 +457,7 @@ Standard_Boolean StdPrs_BRepFont::renderGlyph (const Standard_Utf32Char theChar,
-   for (short aContour = 0, aStartIndex = 0; aContour < anOutline->n_contours; ++aContour)
-   {
-     const FT_Vector* aPntList = &anOutline->points[aStartIndex];
--    const char* aTags      = &anOutline->tags[aStartIndex];
-+    const auto* aTags      = &anOutline->tags[aStartIndex];
-     const short anEndIndex = anOutline->contours[aContour];
-     const short aPntsNb    = (anEndIndex - aStartIndex) + 1;
-     aStartIndex = anEndIndex + 1;

occt-7.8.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7321af48c34dc253bf8aae3f0430e8cb10976961d534d8509e72516978aa82f5
-size 48432051

occt-7.9.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de442298cd8860f5580b01007f67f0ecd0b8900cfa4da467fa3c823c2d1a45df
+size 48575965

occt-use-system-tbb.patch

@@ -0,0 +1,56 @@
+Index: OCCT-7_9_1/CMakeLists.txt
+===================================================================
+--- OCCT-7_9_1.orig/CMakeLists.txt	2025-05-20 13:17:10.000000000 +0200
++++ OCCT-7_9_1/CMakeLists.txt	2025-07-15 17:39:10.823773749 +0200
+@@ -648,7 +648,7 @@ endif()
+ if (CAN_USE_TBB AND USE_TBB)
+   add_definitions (-DHAVE_TBB)
+   OCCT_ADD_VCPKG_FEATURE ("tbb")
+-  list (APPEND OCCT_3RDPARTY_CMAKE_LIST "adm/cmake/tbb")
++  find_package(TBB CONFIG REQUIRED)
+ elseif (NOT CAN_USE_TBB)
+   OCCT_CHECK_AND_UNSET ("USE_TBB")
+   OCCT_UNSET_VCPKG_FEATURE ("tbb")
+Index: OCCT-7_9_1/adm/cmake/tbb.cmake
+===================================================================
+--- OCCT-7_9_1.orig/adm/cmake/tbb.cmake	2025-07-15 17:40:48.874435495 +0200
++++ OCCT-7_9_1/adm/cmake/tbb.cmake	2025-07-15 17:41:19.293768202 +0200
+@@ -52,7 +52,7 @@ if (WIN32)
+   # Employ it.
+   if (EXISTS "${3RDPARTY_TBB_DIR}")
+     find_package (
+-      TBB 2021.5
++      TBB
+       PATHS "${3RDPARTY_TBB_DIR}" NO_DEFAULT_PATH
+       REQUIRED
+       CONFIG)
+@@ -173,23 +173,23 @@ else ()
+       endif()
+     endif()
+     if ((NOT "${3RDPARTY_TBB_DIR}" STREQUAL "") AND (EXISTS "${3RDPARTY_TBB_DIR}"))
+-      # Find TBB 2021.5 in existing directory.
++      # Find TBB in existing directory.
+       find_package (
+-      TBB 2021.5
++      TBB
+       PATHS "${3RDPARTY_TBB_DIR}" NO_DEFAULT_PATH
+       REQUIRED
+       CONFIG)
+     else()
+-      # Find TBB 2021.5 in system directory.
++      # Find TBB in system directory.
+       find_package (
+-      TBB 2021.5
++      TBB
+       REQUIRED
+       CONFIG)
+     endif()
+   else()
+-    # Find TBB 2021.5 in system directory.
++    # Find TBB in system directory.
+     find_package (
+-    TBB 2021.5
++    TBB
+     REQUIRED
+     CONFIG)
+   endif()

occt.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Jul 15 15:10:10 UTC 2025 - Andreas Schneider <asn@cryptomilk.org>
+
+- Update to version 7.9.1
+  * Details on
+    https://github.com/Open-Cascade-SAS/OCCT/releases/tag/V7_9_1
+    https://github.com/Open-Cascade-SAS/OCCT/releases/tag/V7_9_0
+- Added occt-use-system-tbb.patch
+- Removed fix_freetype_tag_type.patch
+
 -------------------------------------------------------------------
 Fri Mar  7 10:01:02 UTC 2025 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 

occt.spec

@@ -22,20 +22,21 @@
 %bcond_with    docs
 %endif
 
-%define OCCT_TAG 7_8_1
+%define OCCT_TAG 7_9_1
 
 Name:           occt
-Version:        7.8.1
+Version:        7.9.1
 Release:        0
-%define soname 7_8_1
-%define sover  7.8.1
+%define soname 7_9_1
+%define sover  7.9.1
 %define sover_len 3
 Summary:        OpenCASCADE Official Edition
 License:        LGPL-2.1-only WITH OCCT-exception-1.0
 Group:          Productivity/Graphics/CAD
 URL:            https://www.opencascade.com/open-cascade-technology/
 Source0:        https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V%{OCCT_TAG}.tar.gz#/occt-%{version}.tar.gz
-Patch0:         https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.patch#/fix_freetype_tag_type.patch
+# PATCH-FIX-OPENSUSE Use system installed TBB
+Patch0:         occt-use-system-tbb.patch
 BuildRequires:  bison
 BuildRequires:  cmake
 BuildRequires:  fdupes
@@ -43,6 +44,7 @@ BuildRequires:  flex
 BuildRequires:  gcc-c++
 BuildRequires:  tcl-devel
 BuildRequires:  tk-devel
+BuildRequires:  cmake(TBB)
 BuildRequires:  pkgconfig(RapidJSON)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
@@ -52,7 +54,6 @@ BuildRequires:  pkgconfig(xi)
 BuildRequires:  pkgconfig(xmu)
 %if %{with docs}
 BuildRequires:  doxygen
-BuildRequires:  mathjax
 %endif
 
 %description
@@ -190,22 +191,25 @@ harness executable.
 %cmake_build
 
 %if %{with docs}
+# Go back from build dir to source dir
 cd ..
-./gendoc -refman -html -mathjax="%{_datadir}/javascript/mathjax"
+
+chmod u+x ./adm/gendoc
+./adm/gendoc -refman -html
 %endif
 
 %install
 %cmake_install
 
 # Make scripts executable
-chmod 0755 %buildroot/usr/bin/*
+chmod 0755 %{buildroot}%{_bindir}/*.sh
 
 # fixing up broken files
 sed -i -e 's,'%{_lib}'\\${OCCT_INSTALL_BIN_LETTER}/,'%{_lib}'/,' %{buildroot}%{_libdir}/cmake/opencascade/*
 sed -i -e 's,/lib\$,/'%{_lib}'\$,' %{buildroot}%{_libdir}/cmake/opencascade/*
 grep -C5 -E "BIN_LETTER|/lib" %{buildroot}%{_libdir}/cmake/opencascade/*
 
-rm -rf %buildroot/usr/share/doc
+rm -rf %{buildroot}%{_datadir}/doc/opencascade/
 
 %fdupes %{buildroot}%{_datadir}
 
@@ -317,7 +321,7 @@ rm -rf %buildroot/usr/share/doc
 %{_datadir}/opencascade/data
 
 %files devel
-%doc README.txt
+%doc README.md
 %{_includedir}/opencascade
 %dir %{_libdir}/cmake
 %{_libdir}/cmake/opencascade