[patch] patch to be applied on the gentoo tree

opencascade-9999_patches_rebase.patch (text/plain), 4.22 KB, created by jospezial on 2024-11-02 21:29:44 UTC

diff --git a/sci-libs/opencascade/files/opencascade-7.8.2-avoid-pre-stripping-binaries.patch b/sci-libs/opencascade/files/opencascade-7.8.2-avoid-pre-stripping-binaries.patch
new file mode 100644
index 0000000000..45cbbee55f
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.8.2-avoid-pre-stripping-binaries.patch
@@ -0,0 +1,27 @@
+diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake
+index 974f9784d..2290554da 100644
+--- a/adm/cmake/occt_defs_flags.cmake
++++ b/adm/cmake/occt_defs_flags.cmake
+@@ -173,22 +173,12 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
+     # CLang can be used with both libstdc++ and libc++, however on OS X libstdc++ is outdated.
+     set (CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}")
+   endif()
+-  # Optimize size of binaries
+-  set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
+ elseif(MINGW)
+   add_definitions(-D_WIN32_WINNT=0x0601)
+   # _WIN32_WINNT=0x0601 (use Windows 7 SDK)
+   #set (CMAKE_SYSTEM_VERSION "6.1")
+   # workaround bugs in mingw with vtable export
+   set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--export-all-symbols")
+-
+-  # Optimize size of binaries
+-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+-  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+-elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
+-  # 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)
diff --git a/sci-libs/opencascade/files/opencascade-7.8.2-jemalloc-lib-type.patch b/sci-libs/opencascade/files/opencascade-7.8.2-jemalloc-lib-type.patch
new file mode 100644
index 0000000000..02b5dfa957
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.8.2-jemalloc-lib-type.patch
@@ -0,0 +1,26 @@
+diff --git a/adm/cmake/jemalloc.cmake b/adm/cmake/jemalloc.cmake
+index 579ed3e15..08917d94c 100644
+--- a/adm/cmake/jemalloc.cmake
++++ b/adm/cmake/jemalloc.cmake
+@@ -67,6 +67,7 @@ macro (JEMALLOC_LIB_SEARCH MMGR_LIB PREFIX)
+ endmacro()
+ 
+ macro (SEARCH_JEMALLOC)
++if(BUILD_LIBRARY_TYPE EQUAL "Static")
+   # find static jemalloc lib
+   SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a")
+   if (WIN32)
+@@ -76,10 +77,13 @@ macro (SEARCH_JEMALLOC)
+     SET(CMAKE_FIND_LIBRARY_SUFFIXES "" "so")
+     JEMALLOC_LIB_SEARCH ("jemalloc.so.2" "SHARED")
+   endif()
++endif()
+   
++if(BUILD_LIBRARY_TYPE EQUAL "Shared")
+   # find shared jemalloc lib
+   SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".so")
+   JEMALLOC_LIB_SEARCH ("jemalloc" "SHARED")
++endif()
+ endmacro()
+ 
+ # Reset CSF variable
diff --git a/sci-libs/opencascade/opencascade-7.8.1.ebuild b/sci-libs/opencascade/opencascade-7.8.1.ebuild
index 30e00b7a18..b0e3a805f4 100644
--- a/sci-libs/opencascade/opencascade-7.8.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.8.1.ebuild
@@ -104,7 +104,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.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"
 	"${FILESDIR}/${PN}-7.7.0-musl.patch"
 	"${FILESDIR}/${PN}-7.7.0-tbb-detection.patch"
 	"${FILESDIR}/${PN}-7.7.0-jemalloc-lib-type.patch"
diff --git a/sci-libs/opencascade/opencascade-9999.ebuild b/sci-libs/opencascade/opencascade-9999.ebuild
index aa6493d1b4..4358439f6e 100644
--- a/sci-libs/opencascade/opencascade-9999.ebuild
+++ b/sci-libs/opencascade/opencascade-9999.ebuild
@@ -101,15 +101,12 @@ BDEPEND="
 
 PATCHES=(
 	"${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"
 	"${FILESDIR}/${PN}-7.7.0-musl.patch"
-	"${FILESDIR}/${PN}-7.7.0-tbb-detection.patch"
-	"${FILESDIR}/${PN}-7.7.0-jemalloc-lib-type.patch"
-	"${FILESDIR}/${PN}-7.8.0-cmake-min-version.patch"
 	"${FILESDIR}/${PN}-7.8.0-tests.patch"
 	"${FILESDIR}/${PN}-7.8.0-jemalloc-noexcept.patch"
 	"${FILESDIR}/${PN}-7.8.1-vtk_components.patch"
+	"${FILESDIR}/${PN}-7.8.2-avoid-pre-stripping-binaries.patch"
+	"${FILESDIR}/${PN}-7.8.2-jemalloc-lib-type.patch"
 )
 
 src_unpack() {