[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2024-04-14 Thread Andrew Ammerlaan 
commit: 74af42387178d837aa7831d4724522ab6d9743f0
Author: Paul Zander  gmail  com>
AuthorDate: Thu Apr 11 14:22:40 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Apr 14 14:15:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74af4238

sci-libs/opencascade: move 7.8.0 -> 7.8.1

7.8.1 addresses a critical issue regarding backward binary
compatibility with version 7.8.0.

Closes: https://bugs.gentoo.org/927788
Closes: https://bugs.gentoo.org/927890
Signed-off-by: Paul Zander  gmail.com>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/opencascade/Manifest  |  3 +-
 .../opencascade-7.8.0-jemalloc-noexcept.patch  | 13 ++
 .../files/opencascade-7.8.1-vtk_components.patch   | 24 +++
 sci-libs/opencascade/metadata.xml  |  1 +
 sci-libs/opencascade/opencascade-7.7.2-r1.ebuild   | 18 ++---
 ...scade-7.8.0.ebuild => opencascade-7.8.1.ebuild} | 20 +++---
 sci-libs/opencascade/opencascade-.ebuild   | 46 --
 7 files changed, 91 insertions(+), 34 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index ac0e7aa5db19..fa54d19c63f2 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,7 +1,6 @@
 DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B 
ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d
 SHA512 
c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded
 DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B 
b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a
 SHA512 
6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c
-DIST opencascade-7.7.1.tar.gz 48408076 BLAKE2B 
46e14a47a0ce555ac17a3fca520c1f21d7ca05c67b54259e3d2d8560618db096313d5be3d5e4a24acad1912534c17293ad203f48dd7464690aec86e287d9f230
 SHA512 
f095848d212afbe7e71614d46f57222e347246aec7c92aafae59e6f07798f5371c7a125042c149393ee7d361f28eb89b5196de17a7cc37233f1586ba919c0839
 DIST opencascade-7.7.2.tar.gz 48404428 BLAKE2B 
28d637e75eca570e38401a0a59127ffdbcb06838a91cc3899fe905834bb47e0e9a92d16cde52027d94e78b0fbddc2043340a35dcb0f4a472c4f2bdac2713216c
 SHA512 
d9e882d44bb65616f8cfce68ebdcd5765669b84e3d82cfb2d1bc22b71b0e878442c079bacc37e9d54f28ce98a7c23bf81f2a3e3e7bbeeec38927ca739f423dee
-DIST opencascade-7.8.0.tar.gz 48428565 BLAKE2B 
91253101072af27c94b82b82beed5c1f1d7460f4154600fba805c5b2d27976a4841b9a9dfab9e67706d02463b2c630c5b63d1f056e84c69c9c8eeaca7e7caebf
 SHA512 
af176cbd105c49949282c16bb6e30f69167bc6c00a50e0ae69aea555815d47ac3c4540c233e596c5add7cb846c2b33d7be267d8e02472286e758b662b4a652ab
+DIST opencascade-7.8.1.tar.gz 48432051 BLAKE2B 
de7a40b8e6612642a1567d2cf3e6b471c9edeadbc7f686bc8648502165c8d824b3574259874ecb1775c856703fd8df7481c9bc07a66a3a321a83e699e6802052
 SHA512 
807c1f8732926cfdabcfbdf8d6a0e76b8dba1a1e614afe084a467ffb4cfd80623f5e3afa7e9905b1ac96667c93e01b5f98ceaa8948a576a1093d98df98cc8f81
 DIST opencascade-dataset-7.7.0.tar.gz 128392200 BLAKE2B 
ebfbe6f24520144ca4a82e4ddd0486890552c2de1b62bf5c0d4990d777d4a1458dea54f8a6f08d8a0999582fb4325eda0002fc8a0137b9e66d024a47145d1279
 SHA512 
71d7e807b1d629fe7371b9d1d503024d00b7c1ae1775e62803eeffd127bd1c768e5240fdd1f949a237737089d528b5d4e43d26db025bbe14a4e0e4616ebdc5d8
 DIST opencascade-dataset-7.8.0.tar.xz 97049756 BLAKE2B 
aae5f076d9fc8a0d8a05028b0d9ffb527978e7acfdf5ecbc7e71c5ee3d6060cd7db9e56dba5b94a445bf5cf208126711cda70306607bdc5cd5e8b68df8fc150c
 SHA512 
9b4c91d7b4743c47f2cf8d9a3b6ded73409a13133013424150ee9bdb61fd771c0b8799c7f31b459a7d2ba140399b9c0c972e2d0476188006361b4fb04042d990

diff --git 
a/sci-libs/opencascade/files/opencascade-7.8.0-jemalloc-noexcept.patch 
b/sci-libs/opencascade/files/opencascade-7.8.0-jemalloc-noexcept.patch
new file mode 100644
index ..2c4a98f5a1fd
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.8.0-jemalloc-noexcept.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Standard/Standard.cxx b/src/Standard/Standard.cxx
+index bb06de7..f73164f 100644
+--- a/src/Standard/Standard.cxx
 b/src/Standard/Standard.cxx
+@@ -28,7 +28,7 @@
+ #elif (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ 
>= 1)) && (defined(__i386) || defined(__x86_64)))
+ #include 
+ #else
+-extern "C" int posix_memalign(void** thePtr, size_t theAlign, size_t theSize);
++extern "C" int posix_memalign(void** thePtr, size_t theAlign, size_t theSize) 
throw ();
+ #endif
+ 
+ namespace

diff --git a/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch 
b/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch
new file mode 100644
index ..224becfdec1f
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2023-07-31 Thread Joonas Niilola 
commit: 5e2d9cb1e3a5ae5e530bef03d12b6b44d7a8c252
Author: Violet Purcell  inventati  org>
AuthorDate: Tue Jul 11 20:24:57 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 31 08:43:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e2d9cb1

sci-libs/opencascade: Fix build on musl

Signed-off-by: Violet Purcell  inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/31496
Signed-off-by: Joonas Niilola  gentoo.org>

 .../opencascade/files/opencascade-7.7.0-musl.patch | 97 ++
 ...7.6.3-r1.ebuild => opencascade-7.6.3-r2.ebuild} |  3 +-
 ...7.7.0-r1.ebuild => opencascade-7.7.0-r2.ebuild} |  1 +
 3 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-musl.patch 
b/sci-libs/opencascade/files/opencascade-7.7.0-musl.patch
new file mode 100644
index ..45aeb449ac73
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.7.0-musl.patch
@@ -0,0 +1,97 @@
+From 4351ac37b19bf43ff9a8f21e5126deb7f43f751e Mon Sep 17 00:00:00 2001
+From: Violet Purcell 
+Date: Tue, 11 Jul 2023 16:13:32 -0400
+Subject: [PATCH] Fix building with musl
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -554,6 +554,10 @@ OCCT_IS_PRODUCT_REQUIRED (CSF_EIGEN CAN_USE_EIGEN)
+ # define CSF variable
+ OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_csf")
+ 
++# Check for execinfo.h
++include(CheckIncludeFile)
++CHECK_INCLUDE_FILE("execinfo.h" HAS_EXECINFO_H)
++
+ # Tcl (mandatory for Draw Harness)
+ if (USE_TCL)
+   message (STATUS "Info: TCL is used by OCCT")
+--- a/src/OSD/OSD_MemInfo.cxx
 b/src/OSD/OSD_MemInfo.cxx
+@@ -184,12 +184,16 @@ void OSD_MemInfo::Update()
+ #endif
+   #endif
+ 
++  #if defined(__GLIBC__)
+   #ifdef HAS_MALLINFO2
+ const struct mallinfo2 aMI = mallinfo2();
+   #else
+ const struct mallinfo aMI = mallinfo();
+   #endif
+ myCounters[MemHeapUsage] = aMI.uordblks;
++  #else
++myCounters[MemHeapUsage] = 0;
++  #endif
+   }
+ 
+   if (!IsActive (MemVirtual)
+--- a/src/OSD/OSD_signal.cxx
 b/src/OSD/OSD_signal.cxx
+@@ -758,7 +758,7 @@ typedef void (* SIG_PFV) (int);
+ 
+ #include 
+ 
+-#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
++#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__) && 
 defined(__GLIBC__)
+   #include 
+ #endif
+ 
+@@ -974,7 +974,7 @@ static void SegvHandler(const int theSignal,
+ //===
+ void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+   feclearexcept (FE_ALL_EXCEPT);
+   if (theFloatingSignal)
+   {
+@@ -1007,7 +1007,7 @@ void OSD::SetFloatingSignal (Standard_Boolean 
theFloatingSignal)
+ //===
+ Standard_Boolean OSD::ToCatchFloatingSignals()
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+   return (fegetexcept() & _OSD_FPX) != 0;
+ #else
+   return Standard_False;
+--- a/src/Standard/Standard_StackTrace.cxx
 b/src/Standard/Standard_StackTrace.cxx
+@@ -29,7 +29,7 @@
+   //#include 
+ #elif defined(__QNX__)
+   //#include  // requires linking to libbacktrace
+-#elif !defined(_WIN32) && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
++#elif defined (HAS_EXECINFO_H)
+   #include 
+ #elif defined(_WIN32) && !defined(OCCT_UWP)
+ 
+@@ -313,7 +313,7 @@ Standard_Boolean Standard::StackTrace (char* theBuffer,
+   Message::SendTrace ("Standard::StackTrace() is not implemented for this CPU 
architecture");
+   return false;
+ #endif
+-#else
++#elif defined (HAS_EXECINFO_H)
+   const int aTopSkip = theNbTopSkip + 1; // skip this function call and 
specified extra number
+   int aNbTraces = theNbTraces + aTopSkip;
+   void** aStackArr = (void** )alloca (sizeof(void*) * aNbTraces);
+@@ -360,5 +360,7 @@ Standard_Boolean Standard::StackTrace (char* theBuffer,
+ strcat (theBuffer, "\n=");
+   }
+   return true;
++#else
++  return false;
+ #endif
+ }
+-- 
+2.41.0
+

diff --git a/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild 
b/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
rename to sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
index 82352ba3e3a2..0ea3c5736c42 100644
--- a/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -69,6 +69,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
"${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
"${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch
+   "${FILESDIR}"/${PN}-7.7.0-musl.patch
 )
 
 src_prepare() {

diff --git

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2023-01-28 Thread Andreas Sturmlechner 
commit: ff9032e688571dde15e9d36cebedf5a247ded1b8
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Jan 27 11:32:35 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan 28 22:32:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff9032e6

sci-libs/opencascade: drop 7.5.3-r8

Cleanup old. No consumers left for this version in ::gentoo. There's one
consumer for that version in the ::science repo.

Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/29296
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/opencascade/Manifest  |   1 -
 1-0001-allow-default-search-path-for-Qt5.patch |  26 ---
 ...e-7.5.1-0002-remove-unnecessary-Qt5-check.patch |  28 
 ...-7.5.1-0003-add-Gentoo-configuration-type.patch |  26 ---
 ...fix-AllValues-name-collision-with-vtk-9.0.patch | 172 
 sci-libs/opencascade/opencascade-7.5.3-r8.ebuild   | 176 -
 6 files changed, 429 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index b0510b20df5f..af71bb8b4462 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,3 +1,2 @@
-DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B 
be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1
 SHA512 
2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
 DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B 
ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d
 SHA512 
c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded
 DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B 
b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a
 SHA512 
6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c

diff --git 
a/sci-libs/opencascade/files/opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch
 
b/sci-libs/opencascade/files/opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch
deleted file mode 100644
index 68be3e1c8803..
--- 
a/sci-libs/opencascade/files/opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c7d8a7374284186136d72fc285f9e55045b306fb Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Wed, 3 Feb 2021 23:31:23 +0100
-Subject: [PATCH] allow default search path for Qt5
-
-Signed-off-by: Bernd Waibel 

- adm/cmake/qt.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/adm/cmake/qt.cmake b/adm/cmake/qt.cmake
-index 535e6a20..6c2141dd 100644
 a/adm/cmake/qt.cmake
-+++ b/adm/cmake/qt.cmake
-@@ -24,7 +24,7 @@ set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
- 
- # Now we can apply standard CMake finder for Qt5. We do this mostly
- # to have qt5_wrap_cpp() function available and Qt5_FOUND variable filled
--find_package(Qt5 QUIET COMPONENTS Widgets Quick Xml PATHS ${3RDPARTY_QT_DIR} 
NO_DEFAULT_PATH)
-+find_package(Qt5 COMPONENTS Widgets Quick Xml REQUIRED)
- if (NOT ${Qt5_FOUND})
-   # Now we can apply standard CMake finder for Qt. We do this mostly
-   # to have qt4_wrap_cpp() function available
--- 
-2.30.0
-

diff --git 
a/sci-libs/opencascade/files/opencascade-7.5.1-0002-remove-unnecessary-Qt5-check.patch
 
b/sci-libs/opencascade/files/opencascade-7.5.1-0002-remove-unnecessary-Qt5-check.patch
deleted file mode 100644
index 91d5c66c7614..
--- 
a/sci-libs/opencascade/files/opencascade-7.5.1-0002-remove-unnecessary-Qt5-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From dcf67dbc486a97256ea6df7b968f69346e7b3dba Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Wed, 3 Feb 2021 23:45:27 +0100
-Subject: [PATCH] remove unnecessary Qt5 check
-
-Signed-off-by: Bernd Waibel 

- adm/cmake/qt_macro.cmake | 4 
- 1 file changed, 4 deletions(-)
-
-diff --git a/adm/cmake/qt_macro.cmake b/adm/cmake/qt_macro.cmake
-index ec897384..363d9c52 100644
 a/adm/cmake/qt_macro.cmake
-+++ b/adm/cmake/qt_macro.cmake
-@@ -2,10 +2,6 @@
- 
- macro (FIND_QT_PACKAGE PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE 
PROJECT_INCLUDES)
- 
--  if ("${3RDPARTY_QT_DIR}" STREQUAL "")
--message (FATAL_ERROR "Empty Qt dir")
--  endif()
--
-   if (${Qt5_FOUND})
- #message (STATUS "Qt5 cmake configuration")
- 
--- 
-2.30.0
-

diff --git 
a/sci-libs/opencascade/files/opencascade-7.5.1-0003-add-Gentoo-configuration-type.patch
 
b/sci-libs/opencascade/files/opencascade-7.5.1-0003-add-Gentoo-configuration-type.patch
deleted file mode 100644
index 0665790d20a1..
---

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2022-12-31 Thread Sam James 
commit: bdaa85f652b25c81c889d9a1bcff53a819b0afc2
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Dec 18 15:37:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 31 15:36:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdaa85f6

sci-libs/opencascade: build 7.7.0 against vtk-9.2

cleanup some X related libraries

Closes: https://bugs.gentoo.org/886343
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 .../opencascade-7.7.0-build-against-vtk-9.2.patch  | 36 ++
 ...de-7.7.0.ebuild => opencascade-7.7.0-r1.ebuild} | 25 ++-
 2 files changed, 45 insertions(+), 16 deletions(-)

diff --git 
a/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch 
b/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch
new file mode 100644
index ..7e744189a8d2
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch
@@ -0,0 +1,36 @@
+From: 
http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=7f523af8e8a63ee17d8fc26f107c191cd51dcd44;hp=0b4962a7f04caef12d090d087b7196cefde0703c
+
+From: Aiden Grossman 
+Date: Mon, 10 Oct 2022 18:25:13 + (-0700)
+Subject: Fix naming conflict between X11 headers and VTK 9.2.2+
+X-Git-Url: 
http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=7f523af8e8a63ee17d8fc26f107c191cd51dcd44;hp=0b4962a7f04caef12d090d087b7196cefde0703c
+
+Fix naming conflict between X11 headers and VTK 9.2.2+
+
+Currently, the GLX headers include the X11 headers which use a
+preprocessor define to make Status an int. However, VTK has a class
+called Status, and this define replaces this class name with int which
+results in compilation errors. This patch undefs Status and Success,
+which are both defined in the X11 headers if they exist so that there
+are no conflicts within the VTK headers for newer versions.
+---
+
+--- a/src/IVtkDraw/IVtkDraw_Interactor.cxx
 b/src/IVtkDraw/IVtkDraw_Interactor.cxx
+@@ -27,6 +27,16 @@
+ #undef AllValues
+ #endif
+ 
++// Prevent naming collisions between X11
++// and VTK versions 9.2.0 and above.
++// X11 is included through glx
++#ifdef Status
++#undef Status
++#endif
++#ifdef Success
++#undef Success
++#endif
++
+ #include 
+ #include 
+ #endif

diff --git a/sci-libs/opencascade/opencascade-7.7.0.ebuild 
b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
similarity index 88%
rename from sci-libs/opencascade/opencascade-7.7.0.ebuild
rename to sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
index c2f7e7dbf7a4..efd245f9b465 100644
--- a/sci-libs/opencascade/opencascade-7.7.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype:2
virtual/opengl
-   x11-libs/libXmu
+   x11-libs/libX11
examples? (
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -63,6 +63,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.7.0-add-missing-include-limits.patch
"${FILESDIR}"/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch
"${FILESDIR}"/${PN}-7.7.0-avoid-pre-stripping-binaries.patch
+   "${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch
 )
 
 src_prepare() {
@@ -132,24 +133,16 @@ src_configure() {
fi
 
if use vtk; then
+   mycmakeargs+=(
+   -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+   
-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
+   )
if has_version ">=sci-libs/vtk-9.2.0"; then
-   mycmakeargs+=(
-   -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-   
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2
-   
-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-   )
+   mycmakeargs+=( 
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 )
elif has_version ">=sci-libs/vtk-9.1.0"; then
-   mycmakeargs+=(
-   -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-   
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1
-   
-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-   )
+   mycmakeargs+=( 
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 )
elif has_version ">=sci-libs/vtk-9.0.0"; then
-   mycmakeargs+=(
-   -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-   
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0
-   
-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-   )
+   mycmakeargs+=(

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2022-06-25 Thread Sam James 
commit: d7f8763ca52ef8a17cf9271997fc8e4a4c83e75d
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 25 23:06:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 25 23:33:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f8763c

sci-libs/opencascade: allow newer TBB

Bug: https://bugs.gentoo.org/851783
Signed-off-by: Sam James  gentoo.org>

 .../files/opencascade-7.5.3-tbb-2021.patch | 51 ++
 ...7.5.3-r7.ebuild => opencascade-7.5.3-r8.ebuild} |  3 +-
 ...7.6.1-r1.ebuild => opencascade-7.6.1-r2.ebuild} |  3 +-
 ...de-7.6.2.ebuild => opencascade-7.6.2-r1.ebuild} |  3 +-
 4 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch 
b/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch
new file mode 100644
index ..38770ac9a541
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch
@@ -0,0 +1,51 @@
+https://github.com/Open-Cascade-SAS/OCCT/commit/740833a6a88e481f474783c426b6f6311ed586d3
+
+From 740833a6a88e481f474783c426b6f6311ed586d3 Mon Sep 17 00:00:00 2001
+From: kgv 
+Date: Mon, 29 Nov 2021 21:26:45 +0300
+Subject: [PATCH] 0032697: Configuration - fix compilation errors with oneTBB
+ 2021
+
+Removed usage of no more existing tbb::task_scheduler_init and 
tbb::captured_exception.
+--- a/src/OSD/OSD_Parallel_TBB.cxx
 b/src/OSD/OSD_Parallel_TBB.cxx
+@@ -25,7 +25,9 @@ Standard_DISABLE_DEPRECATION_WARNINGS
+ #include 
+ #include 
+ #include 
+-#include 
++#if TBB_VERSION_MAJOR < 2021
++  #include 
++#endif
+ Standard_ENABLE_DEPRECATION_WARNINGS
+ 
+ //===
+@@ -38,12 +40,16 @@ void OSD_Parallel::forEachExternal (UniversalIterator& 
theBegin,
+ const FunctorInterface& theFunctor,
+ Standard_Integer theNbItems)
+ {
++#if TBB_VERSION_MAJOR >= 2021
++  // task_scheduler_init is removed,
++  // exceptions are captured without proxy tbb::captured_exception object
++  (void )theNbItems;
++  tbb::parallel_for_each (theBegin, theEnd, theFunctor);
++#else
+   try
+   {
+ const Handle(OSD_ThreadPool)& aThreadPool = OSD_ThreadPool::DefaultPool();
+-const Standard_Integer aNbThreads = theNbItems > 0 ?
+-  aThreadPool->NbDefaultThreadsToLaunch() : -1;
+-
++const Standard_Integer aNbThreads = theNbItems > 0 ? 
aThreadPool->NbDefaultThreadsToLaunch() : -1;
+ tbb::task_scheduler_init aScheduler (aNbThreads);
+ tbb::parallel_for_each (theBegin, theEnd, theFunctor);
+   }
+@@ -51,6 +57,7 @@ void OSD_Parallel::forEachExternal (UniversalIterator& 
theBegin,
+   {
+ throw Standard_ProgramError (anException.what());
+   }
++#endif
+ }
+ 
+ #endif /* HAVE_TBB */
+

diff --git a/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild 
b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
rename to sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
index 8287de53da6b..87b782fa5e6a 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
)
ffmpeg? ( media-video/ffmpeg:= )
freeimage? ( media-libs/freeimage )
-   tbb? (

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2022-06-14 Thread Joonas Niilola 
commit: b62d48ddf7302a3db272a0ffc494fb0f8defe8f5
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Jun  5 09:05:43 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jun 14 16:01:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62d48dd

sci-libs/opencascade: avoid pre-stripping binaries

Remove cmake settings for gcc and clang to not strip the binaries
during linking stage.

Closes: https://bugs.gentoo.org/831800
Bug: https://dev.opencascade.org/content/dont-pre-strip-binaries
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/25764
Signed-off-by: Joonas Niilola  gentoo.org>

 ...ascade-7.6.2-avoid-pre-stripping-binaries.patch | 33 ++
 sci-libs/opencascade/opencascade-7.5.2-r6.ebuild   |  1 +
 sci-libs/opencascade/opencascade-7.5.3-r7.ebuild   |  1 +
 sci-libs/opencascade/opencascade-7.6.0-r4.ebuild   |  1 +
 sci-libs/opencascade/opencascade-7.6.1-r1.ebuild   |  1 +
 sci-libs/opencascade/opencascade-7.6.2.ebuild  |  1 +
 6 files changed, 38 insertions(+)

diff --git 
a/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch
 
b/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch
new file mode 100644
index ..144047fba163
--- /dev/null
+++ 
b/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/831800
+https://dev.opencascade.org/content/dont-pre-strip-binaries
+
+From 88e59e0199daaf66184833e366e9deb1299078a9 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sun, 5 Jun 2022 09:48:09 +0200
+Subject: [PATCH] avoid pre-stripping binaries
+
+Signed-off-by: Bernd Waibel 
+--- a/adm/cmake/occt_defs_flags.cmake
 b/adm/cmake/occt_defs_flags.cmake
+@@ -133,8 +133,6 @@ if ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang")
+ # does not support option "-std=c++0x"
+ set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
+   endif()
+-  # Optimize size of binaries
+-  set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}")
+ elseif(MINGW)
+   add_definitions(-D_WIN32_WINNT=0x0601)
+   # _WIN32_WINNT=0x0601 (use Windows 7 SDK)
+@@ -150,9 +148,6 @@ elseif(MINGW)
+ elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
+   # Require C++11
+   set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
+-  # Optimize size of binaries
+-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+-  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+ endif()
+ 
+ if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
+-- 
+2.35.1
+

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild 
b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
index 4ba6a2ccee23..d4500132ab1f 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch

"${FILESDIR}"/${PN}-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
+   "${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
 )
 
 src_prepare() {

diff --git a/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild 
b/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
index 7dc58dcd6393..8287de53da6b 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch

"${FILESDIR}"/${PN}-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
+   "${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
 )
 
 src_prepare() {

diff --git a/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild 
b/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
index cd8196d34d06..41e15cf2bd76 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
@@ -64,6 +64,7 @@ PATCHES=(

"${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
+   "${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
 )
 
 src_prepare() {

diff --git a/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild 
b/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
index cd8196d34d06..41e15cf2bd76 100644
--- a/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
@@ -64,6 +64,7 @@ PATCHES=(

"${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2022-01-12 Thread Sam James 
commit: 4db0fd6113765ff6f6865e47bdbe8f4f2495e4f4
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 13 01:07:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 13 01:25:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db0fd61

sci-libs/opencascade: fix installed environment file for non-slotted

We're no longer using slotted OCC but I don't think we fully
completed the version. I was initially going to wait but
upon reflection, I think this is the only way forward
that makes sense (updating the env.in to reflect
the earlier changes).

The old/outdated env file results in build failures
in e.g. kicad.

(Also, change ESYSROOT -> EPREFIX for the env file
as the env file is for the end result system.)

Bug: https://bugs.gentoo.org/831069
Bug: https://bugs.gentoo.org/831054
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/files/opencascade.env.in  | 32 +++---
 ...7.5.2-r3.ebuild => opencascade-7.5.2-r4.ebuild} |  5 ++--
 ...7.5.3-r4.ebuild => opencascade-7.5.3-r5.ebuild} |  5 ++--
 ...de-7.6.0.ebuild => opencascade-7.6.0-r1.ebuild} |  5 ++--
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/sci-libs/opencascade/files/opencascade.env.in 
b/sci-libs/opencascade/files/opencascade.env.in
index d7148c241f11..28006d724806 100644
--- a/sci-libs/opencascade/files/opencascade.env.in
+++ b/sci-libs/opencascade/files/opencascade.env.in
@@ -10,8 +10,8 @@
 
 # define the root directory of Open CASCADE Technology (needed)
 CASROOT="VAR_CASROOT"
-PATH="VAR_CASROOT/lib/opencascade-VAR_PV/bin"
-LDPATH="VAR_CASROOT/lib/opencascade-VAR_PV"
+PATH="VAR_CASROOT/lib/opencascade/bin"
+LDPATH="VAR_CASROOT/lib/opencascade"
 
 #
 # The MMGT_* variables are used to determine how memory management will work
@@ -79,21 +79,21 @@ LDPATH="VAR_CASROOT/lib/opencascade-VAR_PV"
 
 # The following CSF_* variables define various directories and files where
 # OCCT is looking for resources.
-CSF_GraphicShr="VAR_CASROOT/lib/opencascade-VAR_PV/libTKOpenGl.so"
-CSF_MIGRATION_TYPES="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource/MigrationSheet.txt"
-CSF_MDTVTexturesDirectory="VAR_CASROOT/share/opencascade-VAR_PV/resources/Textures"
-CSF_PluginDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_StandardDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_StandardLiteDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_XCAFDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_XmlOcafResource="VAR_CASROOT/share/opencascade-VAR_PV/resources/XmlOcafResource"
+CSF_GraphicShr="VAR_CASROOT/lib/opencascade/libTKOpenGl.so"
+CSF_MIGRATION_TYPES="VAR_CASROOT/share/opencascade/resources/StdResource/MigrationSheet.txt"
+CSF_MDTVTexturesDirectory="VAR_CASROOT/share/opencascade/resources/Textures"
+CSF_PluginDefaults="VAR_CASROOT/share/opencascade/resources/StdResource"
+CSF_StandardDefaults="VAR_CASROOT/share/opencascade/resources/StdResource"
+CSF_StandardLiteDefaults="VAR_CASROOT/share/opencascade/resources/StdResource"
+CSF_XCAFDefaults="VAR_CASROOT/share/opencascade/resources/StdResource"
+CSF_XmlOcafResource="VAR_CASROOT/share/opencascade/resources/XmlOcafResource"
 # The below values might be optional.
-CSF_IGESDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource"
-CSF_ShadersDirectory="VAR_CASROOT/share/opencascade-VAR_PV/resources/Shaders"
-CSF_SHMessage="VAR_CASROOT/share/opencascade-VAR_PV/resources/SHMessage"
-CSF_STEPDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource"
-CSF_UnitsDefinition="VAR_CASROOT/share/opencascade-VAR_PV/resources/UnitsAPI/Units.dat"
-CSF_XSMessage="VAR_CASROOT/share/opencascade-VAR_PV/resources/XSMessage"
+CSF_IGESDefaults="VAR_CASROOT/share/opencascade/resources/XSTEPResource"
+CSF_ShadersDirectory="VAR_CASROOT/share/opencascade/resources/Shaders"
+CSF_SHMessage="VAR_CASROOT/share/opencascade/resources/SHMessage"
+CSF_STEPDefaults="VAR_CASROOT/share/opencascade/resources/XSTEPResource"
+CSF_UnitsDefinition="VAR_CASROOT/share/opencascade/resources/UnitsAPI/Units.dat"
+CSF_XSMessage="VAR_CASROOT/share/opencascade/resources/XSMessage"
 
 # TODO: check those
 # they were defined in the original ebuild but the directories and files

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r3.ebuild 
b/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
similarity index 97%
rename from sci-libs/opencascade/opencascade-7.5.2-r3.ebuild
rename to sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
index 080f7888f0bd..7f662a01ff3a 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -135,8 +135,7 @@

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2021-10-30 Thread Sam James 
commit: 82fb77334931d62d9811a1c361d2a3756dc10c86
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Oct 27 17:31:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 31 02:22:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82fb7733

sci-libs/opencascade: drop 7.4.0

Bugs: https://github.com/gentoo/sci/issues/1119

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/22729
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/Manifest  |   1 -
 ...Gentoo-specific-avoid-pre-stripping-files.patch |  30 -
 .../files/opencascade-7.4.0-find-qt.patch  |  85 
 ...pencascade-7.4.0-fix-flow-control-nesting.patch |  31 -
 .../files/opencascade-7.4.0-fix-install.patch  | 133 ---
 ...7.4.0-fix-issue-with-cmake-path-variables.patch |  41 --
 .../opencascade/files/opencascade-7.4.0.env.in | 103 ---
 sci-libs/opencascade/metadata.xml  |   3 -
 sci-libs/opencascade/opencascade-7.4.0-r5.ebuild   | 147 -
 9 files changed, 574 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index a6e46ffdc98..aa5f02d0bfc 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,4 +1,3 @@
-DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B 
c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f
 SHA512 
eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
 DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B 
b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a
 SHA512 
ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a4621c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 
86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288
 SHA512 
f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B 
be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1
 SHA512 
2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47

diff --git 
a/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch
 
b/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch
deleted file mode 100644
index 0d4015cabd7..000
--- 
a/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2ddba09ea491ae5d18b074a2d1126d44c0a2b1f6 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Tue, 9 Feb 2021 22:26:14 +0100
-Subject: [PATCH] [Gentoo-specific] avoid pre-stripping files
-
-Signed-off-by: Bernd Waibel 

- adm/cmake/occt_defs_flags.cmake | 6 --
- 1 file changed, 6 deletions(-)
-
-diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake
-index 5484c675..4e513ab5 100644
 a/adm/cmake/occt_defs_flags.cmake
-+++ b/adm/cmake/occt_defs_flags.cmake
-@@ -137,12 +137,6 @@ elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
-   set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
- endif()
- 
--# Optimize size of binaries
--if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR MINGW)
--  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
--  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
--endif()
--
- if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
-   set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
-   set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
--- 
-2.30.0
-

diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch 
b/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch
deleted file mode 100644
index 1ebc1106a31..000
--- a/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 7304c888e57a581e9dc8ef2005e960ec579d58f4 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Sat, 9 Nov 2019 17:15:27 +0100
-Subject: [PATCH] Gentoo-specific: disable internal 3RDPARTY_QT_DIR
-
-The patch disables searching for internal 3rd-party Qt. Instead
-system installed Qt is used. The call to find_package uses REQUIRED
-flag for this.
-
-Signed-off-by: Bernd Waibel 

- adm/cmake/qt.cmake   | 24 
- adm/cmake/qt_macro.cmake |  6 +++---
- 2 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2021-05-04 Thread Sam James 
commit: 2ff6f73b2c6c62702952b3e712f878c32a1597da
Author: Bernd Waibel  gmail  com>
AuthorDate: Sat Feb  6 09:31:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  4 22:02:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ff6f73b

sci-libs/opencascade: bump to 7.5.1

Closes: https://bugs.gentoo.org/762775
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20443
Signed-off-by: Sam James  gentoo.org>

 sci-libs/opencascade/Manifest  |   1 +
 .../opencascade/files/opencascade-7.4.0.env.in |   6 +-
 1-0001-allow-default-search-path-for-Qt5.patch |  26 
 ...e-7.5.1-0002-remove-unnecessary-Qt5-check.patch |  28 
 ...-7.5.1-0003-add-Gentoo-configuration-type.patch |  26 
 ...04-fix-installation-of-cmake-config-files.patch |  40 +
 ...5.1-0005-fix-write-permissions-on-scripts.patch |  43 ++
 ...5.1-0006-fix-creation-of-custom.sh-script.patch |  34 +
 ...cascade-7.4.0.env.in => opencascade-7.5.env.in} |  35 +++--
 sci-libs/opencascade/metadata.xml  |  10 +-
 sci-libs/opencascade/opencascade-7.5.1.ebuild  | 167 +
 11 files changed, 392 insertions(+), 24 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 3c6a4c44796..77c4e42f391 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1 +1,2 @@
 DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B 
c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f
 SHA512 
eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
+DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B 
b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a
 SHA512 
ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a4621c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f

diff --git a/sci-libs/opencascade/files/opencascade-7.4.0.env.in 
b/sci-libs/opencascade/files/opencascade-7.4.0.env.in
index 2eefe188c1a..cf7cc6a724d 100644
--- a/sci-libs/opencascade/files/opencascade-7.4.0.env.in
+++ b/sci-libs/opencascade/files/opencascade-7.4.0.env.in
@@ -76,7 +76,7 @@ LDPATH=VAR_CASROOT/lib
 # CSF_EXCEPTION_PROMPT (default: 1) optional
 #   not documented upstream (maybe a flag indicating whether the user shall
 #   be prompted in the case of exceptions)
-CSF_EXCEPTION_PROMPT=1
+#CSF_EXCEPTION_PROMPT=1
 
 # The following CSF_* variables define various directories and files where
 # OCCT is looking for resources.
@@ -93,8 +93,8 @@ 
CSF_IGESDefaults=VAR_CASROOT/share/opencascade/resources/XSTEPResource
 CSF_ShadersDirectory=VAR_CASROOT/share/opencascade/resources/Shaders
 CSF_SHMessage=VAR_CASROOT/share/opencascade/resources/SHMessage
 CSF_STEPDefaults=VAR_CASROOT/share/opencascade/resources/XSTEPResource
-CSF_UnitsDefinition=/usr/lib64/opencascade-7.3.0/ros/share/opencascade/resources/UnitsAPI/Units.dat
-CSF_XSMessage=/usr/lib64/opencascade-7.3.0/ros/share/opencascade/resources/XSMessage
+CSF_UnitsDefinition=VAR_CASROOT/share/opencascade/resources/UnitsAPI/Units.dat
+CSF_XSMessage=VAR_CASROOT/share/opencascade/resources/XSMessage
 
 # TODO: check those
 # they were defined in the original ebuild but the directories and files

diff --git 
a/sci-libs/opencascade/files/opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch
 
b/sci-libs/opencascade/files/opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch
new file mode 100644
index 000..68be3e1c880
--- /dev/null
+++ 
b/sci-libs/opencascade/files/opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch
@@ -0,0 +1,26 @@
+From c7d8a7374284186136d72fc285f9e55045b306fb Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Wed, 3 Feb 2021 23:31:23 +0100
+Subject: [PATCH] allow default search path for Qt5
+
+Signed-off-by: Bernd Waibel 
+---
+ adm/cmake/qt.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/adm/cmake/qt.cmake b/adm/cmake/qt.cmake
+index 535e6a20..6c2141dd 100644
+--- a/adm/cmake/qt.cmake
 b/adm/cmake/qt.cmake
+@@ -24,7 +24,7 @@ set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
+ 
+ # Now we can apply standard CMake finder for Qt5. We do this mostly
+ # to have qt5_wrap_cpp() function available and Qt5_FOUND variable filled
+-find_package(Qt5 QUIET COMPONENTS Widgets Quick Xml PATHS ${3RDPARTY_QT_DIR} 
NO_DEFAULT_PATH)
++find_package(Qt5 COMPONENTS Widgets Quick Xml REQUIRED)
+ if (NOT ${Qt5_FOUND})
+   # Now we can apply standard CMake finder for Qt. We do this mostly
+   # to have qt4_wrap_cpp() function available
+-- 
+2.30.0
+

diff --git 
a/sci-libs/opencascade/files/opencascade-7.5.1-0002-remove-unnecessary-Qt5-check.patch

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2021-03-01 Thread Joonas Niilola 
commit: a05456f36a8e1c4c3c37695f3e9a621fccb4e801
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Feb 24 21:07:32 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Mar  1 08:25:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a05456f3

sci-libs/opencascade: fix flow control

dev-util/cmake >= 3.20.0_rc1 has restricted flow control
checks. This patch fixes an issue with these new version
on unbalanced flow control statements.

Closes: https://bugs.gentoo.org/771300
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 ...pencascade-7.4.0-fix-flow-control-nesting.patch | 31 ++
 sci-libs/opencascade/opencascade-7.4.0-r4.ebuild   |  1 +
 2 files changed, 32 insertions(+)

diff --git 
a/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch 
b/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch
new file mode 100644
index 000..7e2bb1d7b2a
--- /dev/null
+++ 
b/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch
@@ -0,0 +1,31 @@
+From e69c42386239bcc08143607df12b8bb3f1ff14ba Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Wed, 24 Feb 2021 20:06:02 +0100
+Subject: [PATCH] adm/cmake/vtk.cmake: fix flow control nesting
+
+Fix an unbalanced nesting of flow control statements
+for >=cmake-3.20.0
+
+Signed-off-by: Bernd Waibel 
+---
+ adm/cmake/vtk.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake
+index c5692fd6..00b7ff4a 100644
+--- a/adm/cmake/vtk.cmake
 b/adm/cmake/vtk.cmake
+@@ -156,8 +156,8 @@ if (VTK_FOUND)
+ endif()
+   endif()
+ endif()
+-  endif()
+-endforeach()
++  endforeach()
++endif()
+   endif()
+ 
+   if (3RDPARTY_VTK_INCLUDE_DIRS)
+-- 
+2.30.1
+

diff --git a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild 
b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
index d46a66fe600..4b7371a287c 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
@@ -75,6 +75,7 @@ PATCHES=(
"${FILESDIR}/${P}-fix-install.patch"
"${FILESDIR}/${P}-fix-issue-with-cmake-path-variables.patch"
"${FILESDIR}/${P}-Gentoo-specific-avoid-pre-stripping-files.patch"
+   "${FILESDIR}/${P}-fix-flow-control-nesting.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2020-04-01 Thread Joonas Niilola 
commit: c2f3367d854b4fb511750932e9f3424d68da7202
Author: Bernd Waibel  gmail  com>
AuthorDate: Fri Mar 27 16:21:41 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Apr  1 14:37:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2f3367d

sci-libs/opencascade: drop old

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Bernd Waibel  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15140
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/opencascade/Manifest  |   1 -
 .../files/opencascade-7.3.0-ffmpeg4.patch  |  38 --
 .../files/opencascade-7.3.0-fixed-DESTDIR.patch|  31 -
 .../files/opencascade-7.3.0-vtk-compat.patch   |  13 --
 sci-libs/opencascade/metadata.xml  |   3 -
 sci-libs/opencascade/opencascade-7.3.0.ebuild  | 141 -
 6 files changed, 227 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index d999b843d5d..3c6a4c44796 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,2 +1 @@
-DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B 
bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6
 SHA512 
17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da
 DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B 
c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f
 SHA512 
eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a

diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch 
b/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch
deleted file mode 100644
index fc572a4f5bc..000
--- a/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Author: jbeich
-Date: Wed May  2 13:25:55 UTC 2018
-New revision: 468831
-
-src/Image/Image_VideoRecorder.cxx:279:25: error: use of undeclared identifier 
'CODEC_FLAG_GLOBAL_HEADER'
-aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-^
-src/Image/Image_VideoRecorder.cxx:452:38: error: use of undeclared identifier 
'AVFMT_RAWPICTURE'
-  if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0
- ^
-
 a/src/Image/Image_VideoRecorder.cxx2017-08-30 13:28:21 UTC
-+++ b/src/Image/Image_VideoRecorder.cxx
-@@ -276,7 +276,7 @@ Standard_Boolean Image_VideoRecorder::addVideoStream (
-   // some formats want stream headers to be separate
-   if (myAVContext->oformat->flags & AVFMT_GLOBALHEADER)
-   {
--aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+aCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-   }
-   return Standard_True;
- #else
-@@ -449,6 +449,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame 
-   AVPacket aPacket;
-   memset (, 0, sizeof(aPacket));
-   av_init_packet ();
-+#ifdef AVFMT_RAWPICTURE
-   if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0
-&& !theToFlush)
-   {
-@@ -461,6 +462,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame 
- aResAv = av_interleaved_write_frame (myAVContext, );
-   }
-   else
-+#endif
-   {
- // encode the image
- myFrame->pts = myFrameCount;

diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch 
b/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch
deleted file mode 100644
index c0a6363e19f..000
--- a/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch
+++ /dev/null
@@ -1,31 +0,0 @@
 a/CMakeLists.txt   2016-11-25 11:50:18.0 +0100
-+++ b/CMakeLists.txt   2017-03-18 08:44:10.406668714 +0100
-@@ -885,7 +885,7 @@ if (EXISTS 
"${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
- 
-   set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
- 
--  file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" 
"${CUSTOM_CONTENT}")
-+  file (WRITE 
\"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}\" 
"${CUSTOM_CONTENT}")
- else()
-   OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" 
"custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
- endif()
-@@ -906,7 +906,7 @@
- endforeach()
- # install OpenCASCADE config file with compile definitions and C/C++ flags 
ONLY for current configuration
- install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" 
CMAKE_INSTALL_CONFIG_NAME_LOWER)")
--install (CODE 
"configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\"
 
\"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\"
 COPYONLY)")
-+install (CODE

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2019-11-16 Thread Joonas Niilola 
commit: 4909a322be06b7abd27e2954ea5f89e5c3ffc46b
Author: Bernd Waibel  gmail  com>
AuthorDate: Sat Oct 19 09:17:54 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Nov 17 07:45:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4909a322

sci-libs/opencascade: bump to version 7.4.0

Closes: https://bugs.gentoo.org/696596
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Bernd Waibel  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13596
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/opencascade/Manifest  |   1 +
 .../files/opencascade-7.4.0-find-qt.patch  |  85 +
 .../files/opencascade-7.4.0-fix-install.patch  | 133 
 .../opencascade/files/opencascade-7.4.0.env.in | 103 +++
 sci-libs/opencascade/metadata.xml  |  27 +++-
 sci-libs/opencascade/opencascade-7.4.0.ebuild  | 140 +
 6 files changed, 484 insertions(+), 5 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 52dffdbc97c..d999b843d5d 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1 +1,2 @@
 DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B 
bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6
 SHA512 
17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da
+DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B 
c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f
 SHA512 
eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a

diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch 
b/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch
new file mode 100644
index 000..1ebc1106a31
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch
@@ -0,0 +1,85 @@
+From 7304c888e57a581e9dc8ef2005e960ec579d58f4 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sat, 9 Nov 2019 17:15:27 +0100
+Subject: [PATCH] Gentoo-specific: disable internal 3RDPARTY_QT_DIR
+
+The patch disables searching for internal 3rd-party Qt. Instead
+system installed Qt is used. The call to find_package uses REQUIRED
+flag for this.
+
+Signed-off-by: Bernd Waibel 
+---
+ adm/cmake/qt.cmake   | 24 
+ adm/cmake/qt_macro.cmake |  6 +++---
+ 2 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/adm/cmake/qt.cmake b/adm/cmake/qt.cmake
+index 6958bab5..b6a9b794 100644
+--- a/adm/cmake/qt.cmake
 b/adm/cmake/qt.cmake
+@@ -3,27 +3,27 @@
+ # Qt is searched manually first (just determine root)
+ message (STATUS "Processing Qt 3-rd party")
+ 
+-if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "")
+-  FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME)
++#if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "")
++#  FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME)
+ 
+-  if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} 
STREQUAL "")
+-message (FATAL_ERROR "... Qt root directory was not found")
+-  endif()
++#  if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} 
STREQUAL "")
++#message (FATAL_ERROR "... Qt root directory was not found")
++#  endif()
+ 
+   # Combine directory name with absolute path and show in GUI
+-  set (3RDPARTY_QT_DIR "${3RDPARTY_DIR}/${3RDPARTY_QT_DIR_NAME}" CACHE PATH 
"The directory containing Qt" FORCE)
+-  message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")
+-endif()
++#  set (3RDPARTY_QT_DIR "${3RDPARTY_DIR}/${3RDPARTY_QT_DIR_NAME}" CACHE PATH 
"The directory containing Qt" FORCE)
++#  message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")
++#endif()
+ 
+-set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
++#set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
+ 
+ # Now set CMAKE_PREFIX_PATH to point to local Qt installation.
+ # Without this setting find_package() will not work
+-set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
++#set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
+ 
+ # Now we can apply standard CMake finder for Qt5. We do this mostly
+ # to have qt5_wrap_cpp() function available and Qt5_FOUND variable filled
+-find_package(Qt5 QUIET COMPONENTS Widgets Quick Xml PATHS ${3RDPARTY_QT_DIR} 
NO_DEFAULT_PATH)
++find_package(Qt5 COMPONENTS Widgets Quick Xml REQUIRED)
+ if (NOT ${Qt5_FOUND})
+   # Now we can apply standard CMake finder for Qt. We do this mostly
+   # to have qt4_wrap_cpp() function available
+@@ -31,4 +31,4 @@ if (NOT ${Qt5_FOUND})
+   #message (STATUS "Qt4 cmake configuration")
+ else()
+   #message (STATUS "Qt5 cmake configuration")
+-endif()
+\ No newline at end of file
++endif()
+diff

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2018-11-29 Thread Andreas Sturmlechner 
commit: 19716b32ad42b4dc3a0e7a7b3d8e3a100be84f01
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 29 20:14:09 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 29 20:18:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19716b32

sci-libs/opencascade: Drop 6.9.1-r2

Closes: https://bugs.gentoo.org/651772
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/opencascade/Manifest  |   1 -
 .../files/opencascade-6.8.0-fixed-DESTDIR.patch|  47 --
 .../files/opencascade-6.9.1-vtk-6.3.patch  |  70 
 .../files/opencascade-6.9.1-vtk-8.1.patch  |  48 --
 .../files/opencascade-6.9.1-vtk-configure.patch|  13 --
 sci-libs/opencascade/opencascade-6.9.1-r2.ebuild   | 177 -
 6 files changed, 356 deletions(-)

diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 922670cf0cf..52dffdbc97c 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,2 +1 @@
-DIST opencascade-6.9.1.tgz 209589289 BLAKE2B 
266d68042dbbb8c9bc5f167b9aefaf84b3f1568c25530acb36271443429e67972aae913ebcea09c9ea27164e2e3f007eb287350d7ad69486755cdcb713fdb1af
 SHA512 
92f0fffb110344feebaba9dd4a3427419ea9e6db7b09556b7dcdb1248f2a868e3337587abf9921392435031431f3876cea4d4709fd9926604dcebbd6d26f8963
 DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B 
bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6
 SHA512 
17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da

diff --git a/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch 
b/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch
deleted file mode 100644
index 1f37eace760..000
--- a/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch
+++ /dev/null
@@ -1,47 +0,0 @@
 opencascade-6.8.0/Makefile.am
-+++ opencascade-6.8.0/Makefile.am
-@@ -82,27 +82,27 @@
-   cd $(top_builddir)/adm/lin/amk && $(MAKE) $(AM_MAKEFLAGS) Draw
- 
- install-exec-local:
--  $(INSTALL) -d $(prefix)/$(platform)
--  if [ -e $(prefix)/bin -a ! -e $(prefix)/$(platform)/bin ]; then \
--  cd $(prefix)/$(platform) && ln -s ../bin bin; \
-+  $(INSTALL) -d $(DESTDIR)$(prefix)/$(platform)
-+  if [ -e $(DESTDIR)$(prefix)/bin -a ! -e 
$(DESTDIR)$(prefix)/$(platform)/bin ]; then \
-+  cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../bin bin; \
-   fi
--  if [ -e $(prefix)/lib -a ! -e $(prefix)/$(platform)/lib ]; then \
--  cd $(prefix)/$(platform) && ln -s ../lib lib; \
-+  if [ -e $(DESTDIR)$(prefix)/lib -a ! -e 
$(DESTDIR)$(prefix)/$(platform)/lib ]; then \
-+  cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../lib lib; \
-   fi
--  buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(prefix); 
installd=`pwd`; cd $$buildd; \
-+  buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(DESTDIR)$(prefix); 
installd=`pwd`; cd $$buildd; \
-   if [ "$$installd" != "$$sourced" ]; then \
--  $(INSTALL) -d $(prefix)/inc; \
--  cp -frL $(top_srcdir)/inc $(prefix); \
--  cp -frL $$buildd/config.h $(prefix); \
-+  $(INSTALL) -d $(DESTDIR)$(prefix)/inc; \
-+  cp -frL $(top_srcdir)/inc $(DESTDIR)$(prefix); \
-+  cp -frL $$buildd/config.h $(DESTDIR)$(prefix); \
-   for d in  $(FoundationClasses_DIRS) $(ModelingData_DIRS) 
$(ModelingAlgorithms_DIRS) $(Visualization_DIRS) $(ApplicationFramework_DIRS) 
$(DataExchange_DIRS) $(Draw_DIRS); do \
--  $(INSTALL) -d $(prefix)/src/$$d; \
--  cp -frL $(top_srcdir)/src/$$d $(prefix)/src; \
-+  $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
-+  cp -frL $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
-   done; \
-   fi
--  if [ -e $(prefix)/inc/config.h ]; then \
--  rm -f $(prefix)/inc/config.h; \
-+  if [ -e $(DESTDIR)$(prefix)/inc/config.h ]; then \
-+  rm -f $(DESTDIR)$(prefix)/inc/config.h; \
-   fi
--  cd $(prefix)/inc && ln -s ../config.h config.h
--  cd $(top_srcdir) && cp *.sh $(prefix)
-+  cd $(DESTDIR)$(prefix)/inc && ln -s ../config.h config.h
-+  cd $(top_srcdir) && cp *.sh $(DESTDIR)$(prefix)
- 
--.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization 
ApplicationFramework DataExchange Draw
-\ No newline at end of file
-+.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization 
ApplicationFramework DataExchange Draw

diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch 
b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch
deleted file mode 100644
index 8e1d3361dde..000
---

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2018-11-29 Thread Andreas Sturmlechner 
commit: 22c33947b0ef4c26437b62ebdd76e2ad19fdb8b1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 29 20:02:59 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 29 20:18:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c33947

sci-libs/opencascade: Fix build with ffmpeg-4

Reported-by: Boris Vingradov  gmail.com>
Closes: https://bugs.gentoo.org/672248
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/opencascade-7.3.0-ffmpeg4.patch  | 38 ++
 sci-libs/opencascade/opencascade-7.3.0.ebuild  |  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch 
b/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch
new file mode 100644
index 000..fc572a4f5bc
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch
@@ -0,0 +1,38 @@
+Author: jbeich
+Date: Wed May  2 13:25:55 UTC 2018
+New revision: 468831
+
+src/Image/Image_VideoRecorder.cxx:279:25: error: use of undeclared identifier 
'CODEC_FLAG_GLOBAL_HEADER'
+aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+^
+src/Image/Image_VideoRecorder.cxx:452:38: error: use of undeclared identifier 
'AVFMT_RAWPICTURE'
+  if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0
+ ^
+
+--- a/src/Image/Image_VideoRecorder.cxx2017-08-30 13:28:21 UTC
 b/src/Image/Image_VideoRecorder.cxx
+@@ -276,7 +276,7 @@ Standard_Boolean Image_VideoRecorder::addVideoStream (
+   // some formats want stream headers to be separate
+   if (myAVContext->oformat->flags & AVFMT_GLOBALHEADER)
+   {
+-aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++aCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+   }
+   return Standard_True;
+ #else
+@@ -449,6 +449,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame 
+   AVPacket aPacket;
+   memset (, 0, sizeof(aPacket));
+   av_init_packet ();
++#ifdef AVFMT_RAWPICTURE
+   if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0
+&& !theToFlush)
+   {
+@@ -461,6 +462,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame 
+ aResAv = av_interleaved_write_frame (myAVContext, );
+   }
+   else
++#endif
+   {
+ // encode the image
+ myFrame->pts = myFrameCount;

diff --git a/sci-libs/opencascade/opencascade-7.3.0.ebuild 
b/sci-libs/opencascade/opencascade-7.3.0.ebuild
index 48f4c0775e4..6d40cf35bba 100644
--- a/sci-libs/opencascade/opencascade-7.3.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,6 +50,7 @@ S="${WORKDIR}/occt-V${MY_PV}"
 PATCHES=(
"${FILESDIR}/${P}-vtk-compat.patch"
"${FILESDIR}/${P}-fixed-DESTDIR.patch"
+   "${FILESDIR}/${P}-ffmpeg4.patch" # bug 672248
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2018-04-05 Thread Andreas Sturmlechner 
commit: 34251046e57f6eefc3576839fb1c333c8420a604
Author: switch87  pellin  be>
AuthorDate: Thu Mar 15 21:05:46 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  5 12:24:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34251046

sci-libs/opencascade: Fix build with >=vtk-8.1.0

Closes: https://bugs.gentoo.org/650596
Closes: https://github.com/gentoo/gentoo/pull/7470

 .../files/opencascade-6.9.1-vtk-8.1.patch  | 48 ++
 sci-libs/opencascade/opencascade-6.9.1-r2.ebuild   |  4 +-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch 
b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch
new file mode 100644
index 000..d1f560320c6
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch
@@ -0,0 +1,48 @@
+--- a/src/IVtkVTK/IVtkVTK_ShapeData.cxx
 b/src/IVtkVTK/IVtkVTK_ShapeData.cxx
+@@ -80,9 +80,9 @@ void IVtkVTK_ShapeData::InsertVertex (const IVtk_IdType 
theShapeID,
+   vtkIdType aPointIdVTK = thePointId;
+   myPolyData->InsertNextCell (VTK_VERTEX, 1, );
+   const vtkIdType aShapeIDVTK = theShapeID;
+-  mySubShapeIDs->InsertNextTupleValue ();
++  mySubShapeIDs->InsertNextTypedTuple ();
+   const vtkIdType aType = theMeshType;
+-  myMeshTypes->InsertNextTupleValue ();
++  myMeshTypes->InsertNextTypedTuple ();
+ }
+ 
+ //
+@@ -97,9 +97,9 @@ void IVtkVTK_ShapeData::InsertLine (const IVtk_IdType   
theShapeID,
+   vtkIdType aPoints[2] = { thePointId1, thePointId2 };
+   myPolyData->InsertNextCell (VTK_LINE, 2, aPoints);
+   const vtkIdType aShapeIDVTK = theShapeID;
+-  mySubShapeIDs->InsertNextTupleValue ();
++  mySubShapeIDs->InsertNextTypedTuple ();
+   const vtkIdType aType = theMeshType;
+-  myMeshTypes->InsertNextTupleValue ();
++  myMeshTypes->InsertNextTypedTuple ();
+ }
+ 
+ //
+@@ -124,9 +124,9 @@ void IVtkVTK_ShapeData::InsertLine (const IVtk_IdType  
 theShapeID,
+ 
+ myPolyData->InsertNextCell (VTK_POLY_LINE, anIdList);
+ const vtkIdType aShapeIDVTK = theShapeID;
+-mySubShapeIDs->InsertNextTupleValue ();
++mySubShapeIDs->InsertNextTypedTuple ();
+ const vtkIdType aType = theMeshType;
+-myMeshTypes->InsertNextTupleValue ();
++myMeshTypes->InsertNextTypedTuple ();
+ anIdList->Delete();
+   }
+ }
+@@ -144,7 +144,7 @@ void IVtkVTK_ShapeData::InsertTriangle (const IVtk_IdType  
 theShapeID,
+   vtkIdType aPoints[3] = { thePointId1, thePointId2, thePointId3 };
+   myPolyData->InsertNextCell (VTK_TRIANGLE, 3, aPoints);
+   const vtkIdType aShapeIDVTK = theShapeID;
+-  mySubShapeIDs->InsertNextTupleValue ();
++  mySubShapeIDs->InsertNextTypedTuple ();
+   const vtkIdType aType = theMeshType;
+-  myMeshTypes->InsertNextTupleValue ();
++  myMeshTypes->InsertNextTypedTuple ();
+ }

diff --git a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild 
b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
index 8eff7a5ab1a..bf868ce0ef5 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,13 +31,13 @@ DEPEND="
tbb? ( dev-cpp/tbb )
vtk? ( || ( sci-libs/vtk[imaging] sci-libs/vtk[rendering] 
sci-libs/vtk[views] sci-libs/vtk[all-modules] ) )"
 RDEPEND="${DEPEND}"
-
 CHECKREQS_MEMORY="256M"
 CHECKREQS_DISK_BUILD="3584M"
 
 PATCHES=(
"${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch
"${FILESDIR}"/${PN}-6.9.1-vtk-configure.patch
+   "${FILESDIR}"/${PN}-6.9.1-vtk-8.1.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

2017-06-07 Thread Michael Weber 
commit: 29c93fad765e6a21197b9e8cb6c3b2df2c037ab8
Author: Michael Weber  gentoo  org>
AuthorDate: Wed Jun  7 07:08:05 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Wed Jun  7 07:09:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c93fad

sci-libs/opencascade: Revbump with patches for >=sci-libs/vtk-6.3 (thanks 
Juergen Rose, bug 605304). EAPI 6.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../files/opencascade-6.9.1-vtk-6.3.patch  | 70 ++
 .../files/opencascade-6.9.1-vtk-configure.patch| 13 
 sci-libs/opencascade/opencascade-6.9.1-r1.ebuild   |  9 +--
 ...6.9.1-r1.ebuild => opencascade-6.9.1-r2.ebuild} | 25 +---
 4 files changed, 104 insertions(+), 13 deletions(-)

diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch 
b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch
new file mode 100644
index 000..e6b011b1e03
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch
@@ -0,0 +1,70 @@
+--- work/opencascade-6.9.1/configure.ac
 work/opencascade-6.9.1/configure.ac
+@@ -1044,7 +1044,7 @@
+ fi
+ if test "x$vtk_lib" != "x"; then
+   CSF_VTK_LIB="-L$vtk_lib -lvtkCommonCore -lvtkCommonDataModel 
-lvtkCommonExecutionModel -lvtkCommonMath -lvtkCommonTransforms "
+-  CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore -lvtkRenderingOpenGL  
-lvtkFiltersGeneral -lvtkIOCore -lvtkIOImage -lvtkImagingCore 
-lvtkInteractionStyle "
++  CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore -lvtkRenderingOpenGL2  
-lvtkFiltersGeneral -lvtkIOCore -lvtkIOImage -lvtkImagingCore 
-lvtkInteractionStyle "
+ else
+   HAVE_VTK=no
+ fi
+--- opencascade-6.9.1/src/IVtkVTK/IVtkVTK_View.cxx
 opencascade-6.9.1/src/IVtkVTK/IVtkVTK_View.cxx
+@@ -151,7 +151,7 @@ bool IVtkVTK_View::DisplayToWorld (const gp_XY& 
theDisplayPnt, gp_XYZ& theWorldP
+   myRenderer->SetDisplayPoint (theDisplayPnt.X(), theDisplayPnt.Y(), 0.0);
+   myRenderer->DisplayToWorld();
+ 
+-  vtkFloatingPointType* const aCoords = myRenderer->GetWorldPoint();
++  double* const aCoords = myRenderer->GetWorldPoint();
+   if (aCoords[3] == 0.0) // Point at infinity in homogeneous coordinates
+   {
+ return false;
+--- opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.cxx
 opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.cxx
+@@ -73,15 +73,15 @@ float IVtkTools_ShapePicker::GetTolerance( ) const
+ //  Method: convertDisplayToWorld
+ // Purpose: Convert display coordinates to world coordinates
+ //
+-bool IVtkTools_ShapePicker::convertDisplayToWorld (vtkRenderer 
*theRenderer,
+-   vtkFloatingPointType 
theDisplayCoord[3],
+-   vtkFloatingPointType 
theWorldCoord[3])
++bool IVtkTools_ShapePicker::convertDisplayToWorld (vtkRenderer *theRenderer,
++   double theDisplayCoord[3],
++   double theWorldCoord[3])
+ {
+   // Convert the selection point into world coordinates.
+   theRenderer->SetDisplayPoint (theDisplayCoord[0], theDisplayCoord[1], 
theDisplayCoord[2]);
+   theRenderer->DisplayToWorld();
+ 
+-  vtkFloatingPointType* const aCoords = theRenderer->GetWorldPoint();
++  double* const aCoords = theRenderer->GetWorldPoint();
+   if (aCoords[3] == 0.0)
+   {
+ return false;
+--- opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.hxx
 opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.hxx
+@@ -124,8 +124,8 @@ protected:
+ 
+   //! Convert display coordinates to world coordinates
+   static bool convertDisplayToWorld (vtkRenderer *theRenderer,
+- vtkFloatingPointType theDisplayCoord[3],
+- vtkFloatingPointType theWorldCoord[3] );
++ double theDisplayCoord[3],
++ double theWorldCoord[3] );
+ 
+ private: // not copyable
+   IVtkTools_ShapePicker (const IVtkTools_ShapePicker&);
+--- opencascade-6.9.1/inc/IVtkTools_ShapePicker.hxx
 opencascade-6.9.1/inc/IVtkTools_ShapePicker.hxx
+@@ -124,8 +124,8 @@
+ 
+   //! Convert display coordinates to world coordinates
+   static bool convertDisplayToWorld (vtkRenderer *theRenderer,
+- vtkFloatingPointType theDisplayCoord[3],
+- vtkFloatingPointType theWorldCoord[3] );
++ double theDisplayCoord[3],
++ double theWorldCoord[3] );
+ 
+ private: // not copyable
+   IVtkTools_ShapePicker (const IVtkTools_ShapePicker&);

diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch 
b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch
new file mode