diff options
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/Manifest.gz | bin | 43149 -> 43147 bytes | |||
-rw-r--r-- | sci-libs/opencascade/Manifest | 8 | ||||
-rw-r--r-- | sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch | 36 | ||||
-rw-r--r-- | sci-libs/opencascade/files/opencascade-7.8.1-freetype-const.patch | 21 | ||||
-rw-r--r-- | sci-libs/opencascade/files/opencascade-7.8.2-avoid-pre-stripping-binaries.patch | 25 | ||||
-rw-r--r-- | sci-libs/opencascade/files/opencascade-7.8.2-jemalloc-lib-type.patch | 26 | ||||
-rw-r--r-- | sci-libs/opencascade/opencascade-7.8.1.ebuild | 2 | ||||
-rw-r--r-- | sci-libs/opencascade/opencascade-9999.ebuild | 7 |
8 files changed, 80 insertions, 45 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex c1fbbd0ed3b4..9698cd291055 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest index e11a388ce8f7..55edc74bd2da 100644 --- a/sci-libs/opencascade/Manifest +++ b/sci-libs/opencascade/Manifest @@ -1,7 +1,6 @@ AUX opencascade-7.5.1-0005-fix-write-permissions-on-scripts.patch 2453 BLAKE2B 01b0ec99fb9ad032d6a90cceabb50900528abd0528b53e976484bf02f04eac9bc02b063bce5c221ae88782a126103e8077db9e90aa7f64f4f187dad00354d4d2 SHA512 fb3c374fe8aff8d2bac039a0eef754f2e823a97bfd7860bdd7e047c1b357202abfca0e37b46afc32220c7e354b5edb54805fbbbffde015bb4be2d7f4ded4a8da AUX opencascade-7.5.1-0006-fix-creation-of-custom.sh-script.patch 1245 BLAKE2B 1972c41e264a86761f8b3a3a649e67211776d0a4791b7e0f3adc859833e1d62e3a1d964484b2c53a516f5a33680ab2f32ad2010bf3fd531fca36373435307b68 SHA512 a2ffef88cb87acbc8215a7d1d7fe69ee17210392d39a64535d1538b2c08e43f5918c5b5e4a7540e8d636b1ba0df51670013e9d49f205bfc93a1e0d10a04388a7 AUX opencascade-7.7.0-avoid-pre-stripping-binaries.patch 1357 BLAKE2B 2f26c4a4e4737971b0bf14828acc7c6049ad75920853f565705699ab58bf60d6e4aa5473114c6224938870e19439b569ce2112af2e9b0742c361cc54a68421ae SHA512 202994e6a0b42c2469f8fc11ace7364ce41056192393bd2930fba1468809ce8992169a6ccbe909930ad181d9c633fc9f6169f7ef72ef071c0186ae7f2ecdb456 -AUX opencascade-7.7.0-build-against-vtk-9.2.patch 1360 BLAKE2B 39bcae904286687ff2aca6662f18d67e72a341e98281b0b04b7b302ad9d0adfa576ad82ce3cfa646e1b9f4107580231bf8613d0cdb72791fda478485c8072827 SHA512 3afb471767b78b4096e00a8eab4c71a90944c70945a16f45ac372ab824c4c6a140c165882e7cb15c95c95d70ae4c9298cc03fc7cd4ebe920bb7ed4eb38aba0a5 AUX opencascade-7.7.0-fix-installation-of-cmake-config-files.patch 1823 BLAKE2B e84bb8627ba5cee166c483631511d150ef9af2c1aa966d7154926600da0674214b3fce8363dcff7d94204c36a92f236ede0f7849039a3bd4509d04d91444204f SHA512 242604d59b3596644b1efa95ce9d7b3d30dbb1bd49f79e28a4ea66ac9b6d4728a32cf31ceb9078875a39bb7b8775ba3ce685560045684b803037a61e2f37d2a4 AUX opencascade-7.7.0-jemalloc-lib-type.patch 783 BLAKE2B baa529cd277dac5e97fc77b30a8a5b2349364a60948abbb56d754dcb1a1bfd4fc76745798b4163d1b5d76752e3ff61b121323cf4a15195b4bab0e4ad5dd56fd1 SHA512 1ac1a56cec067184ced6cf632d4b18c50bbbc7380f397f55dd4be5003938aaa4899d857f6a1c14f342550c1fdd43e23829a9a174042cbf8d76e2844d740aa20c AUX opencascade-7.7.0-musl.patch 3095 BLAKE2B ad17417a93f42b4871c469cd7a50c48ed987f9333c626ca103fedabd49b84b7061de8eefbe834ead65325d606f2ea7f89210156364b55de75336d6493ff483c1 SHA512 6fb94bd075448d4ede48df918d070eda4607956d7a66b01f8b8b3621c0dc57348daa120661c5f1fe6ba7b818fec5737936b2620d62bfd0a7a224d03cbdd3ffc6 @@ -9,10 +8,13 @@ AUX opencascade-7.7.0-tbb-detection.patch 2449 BLAKE2B c12e976a0fb69ca0d23c87a4c AUX opencascade-7.8.0-cmake-min-version.patch 388 BLAKE2B ebeda19b2bb855a1b01bafb0a69e4bac51b95a84ca1d2fdfb58bfb4af007ba11efb4452812bd51060be5d45233258aabac305bb4048364fb0663c42cabe60d1f SHA512 025611176fdb894e53e413a5de32aabf7822743393dd847e01d650f3fdf00f56fc73b22c1faae97b94b2120d016055f0fd23a2d47c6211e49d2097fe6d510e99 AUX opencascade-7.8.0-jemalloc-noexcept.patch 529 BLAKE2B 7882379259c483625e8b83d9736cd42385b795552038ae0170e1fb98ffffac537a8eda11b6b1afa50b6bd4da31b7ac9474f75c0406dd1f014a021256e9345908 SHA512 d615f26e28a388e8cb79150321f3a6899990460a601742e5deddaeededd44bb70f59e44e2dc078968186924d888e141d322a5e69bb29efb66b04226e762df157 AUX opencascade-7.8.0-tests.patch 539 BLAKE2B 519e97a2881da6d437c4b54beaeb5e77883669ff8d16b491bc6859db6c02e807dc4ceffa1052ece9a8ec56ba9024c5abb61caca1a1efa7847efbe3bce7d5ef95 SHA512 4ba8fcf8277b4dda3ceb84010299b925ccb561e9bb3d1097dc41c437be6be9499160ac1c3f36d63ca6f4fa9f9f9d012f787125c0bd693b44028c50b9c858bd8a +AUX opencascade-7.8.1-freetype-const.patch 1032 BLAKE2B 2ea03045e9bacbd5066e4161b876db83c5a52818ff006bd8421a61fe6359a7a71af2e3bb995ce7db2629bd309baf111dcd1845515230c6c2804c2f13d9dcc8bc SHA512 25e215b850863977cd791a9bd9feade2796a0c8130c1481a1d890bea27e88dbaba725e4e35d7abb7cf4ecf374b66ca41ab460d2f8191720f5d37269ce71e65f5 AUX opencascade-7.8.1-vtk_components.patch 603 BLAKE2B cfe4b19b53a63df593fb64e86ba2a4b31d9346a06fa7666cf29ca6b17aa18bbacf806828a3402395032cdece8ea36a672b27fdc9433fd56b3282173a0fa92310 SHA512 5f63bf223c29a8f2492484364b1ab097bb7c9f5a1ab064c0cff9a593836b2f4fff20de1d677cf81d51f0e68ddfc8b1466a5c1dcffdcd10bea58e6c2501f2b776 +AUX opencascade-7.8.2-avoid-pre-stripping-binaries.patch 1093 BLAKE2B 921bd4b508c458d91d299cadb42556083ca4420369c9c1d62d617ca6e849f2eb06fec6208217b4176acbdb25d273d8615f40b184b4507e33389f946d595385e6 SHA512 760ec9e6c1ce844a6ff6adfab5ca88cfa50a0c8b66f2d3d14c947b025e8101d39a67885a8b3285d744320d8367589f8cfaa178e1e07f4544e352585bdd64a5c0 +AUX opencascade-7.8.2-jemalloc-lib-type.patch 767 BLAKE2B 98bc44176570eb6cd1f99dfccb344ffe418ea2ae8509ad755fe52d13732abc10e7f145bb8b698c6b20c5d288c0b0f563db21f23d829c7d158a20d27ab65aeae6 SHA512 ae148b5b013c5d18e6a4bf53228a8d9fe77960f099e5e490d163edff2117db8d446cb5edeb45109cd75cd908f16cb85a5589d12d49b37a832bdb518492c767fe AUX opencascade.env.in 4571 BLAKE2B 81780f83a476ba5a2691c003c7fde48fec14be4e355480080749800602307d64b88f779cde09aa94a7bb815849d669b054d5ca00908199d1a9857b07518b4f0d SHA512 98e6861469725f6880e38a2d7389f7bc748bcbdf54930aa3fe05ab6a5e1fab5249c4ffed4f45b6ef982325acece0d5acb7ffd8d92adac9be2db9a41ee5356019 DIST opencascade-7.8.1.tar.gz 48432051 BLAKE2B de7a40b8e6612642a1567d2cf3e6b471c9edeadbc7f686bc8648502165c8d824b3574259874ecb1775c856703fd8df7481c9bc07a66a3a321a83e699e6802052 SHA512 807c1f8732926cfdabcfbdf8d6a0e76b8dba1a1e614afe084a467ffb4cfd80623f5e3afa7e9905b1ac96667c93e01b5f98ceaa8948a576a1093d98df98cc8f81 DIST opencascade-dataset-7.8.0.tar.xz 97049756 BLAKE2B aae5f076d9fc8a0d8a05028b0d9ffb527978e7acfdf5ecbc7e71c5ee3d6060cd7db9e56dba5b94a445bf5cf208126711cda70306607bdc5cd5e8b68df8fc150c SHA512 9b4c91d7b4743c47f2cf8d9a3b6ded73409a13133013424150ee9bdb61fd771c0b8799c7f31b459a7d2ba140399b9c0c972e2d0476188006361b4fb04042d990 -EBUILD opencascade-7.8.1.ebuild 9790 BLAKE2B b5a409776b201debb6e2668832a9039f44fb2395a780fb750758f3670c21336f89d4f699594c52c87fba502c4686d193bcf92039fb351067813eb4fd0ac4e1b0 SHA512 43ef5730e5d26936215dcea8df5095eddd94bbe925817e645ec7f41ad28928cc99848656aa9dd78926f159521928f616bf9be310910deb35a8ec0f847b0d8e11 -EBUILD opencascade-9999.ebuild 9649 BLAKE2B 4dee7cb6a3ff5f6d59e58338f4b6a2309c7bdbfc63d63a8cc3671f8929a29bf79187785f4ba8b7f9d21abd863da517819f3f749f3aac4adf9035b19c42cae5e0 SHA512 befee43a568193cad25fd3d889d6a1e29fc87e7838545f0b6aa9bfb92e0e0c534056f4a24c4b609e1622d313fab5077af4dec4e4cb8861f3bae52f74072aad5d +EBUILD opencascade-7.8.1.ebuild 9783 BLAKE2B 665f4769bdef1813e06f1cf5d63ea9376921c62a0d7c026c9e715dd729e07023e5ffd42660b7a347379ec39521c9f73367f941d56ac6eb8cd193bb85d44eb06c SHA512 4e34648d4d219d70768480a1e49fd901520c8e51a40ee6880fb02781c8e5fc4e619abaab4baee152bb62fe119edd3a639899b563f18f5d5f06b0bdab7fedccc0 +EBUILD opencascade-9999.ebuild 9496 BLAKE2B 4de09ab98997e2d1bf6838abc4cecce860bd76a9e16c3139273cd25042c5b9bbe17709d53211f04d35507180e9816a6a3bf0c083649f32cc2cbb4659299392d8 SHA512 930fd9dcfaab6d89cb2c7c0ac6deb787ca2025de4eff2d08a4a1a3121bb2b913a21773e0623a518d6ca3fb8d272e523f94ef7d84591e63cf0731ddae3140014d MISC metadata.xml 1416 BLAKE2B d28651c4dd23df684c014535cab0a2b13ae7441d13fb8433780fc99e271f992345b462d18761819c775ca0838903c6b7cc91033afd25cd1bbb7b7b7d3e8b9cde SHA512 894763fe5d16810624767e36987b845cd00c1999be670210fc01a46a3fb8ead951acb199cc54e2a6978a923f6c27652ac86a5b8ba04c6900c26a1f9436bb101e 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 deleted file mode 100644 index 7e744189a8d2..000000000000 --- a/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=7f523af8e8a63ee17d8fc26f107c191cd51dcd44;hp=0b4962a7f04caef12d090d087b7196cefde0703c - -From: Aiden Grossman <agrossman154@yahoo.com> -Date: Mon, 10 Oct 2022 18:25:13 +0000 (-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 <vtkXRenderWindowInteractor.h> - #include <vtkXOpenGLRenderWindow.h> - #endif diff --git a/sci-libs/opencascade/files/opencascade-7.8.1-freetype-const.patch b/sci-libs/opencascade/files/opencascade-7.8.1-freetype-const.patch new file mode 100644 index 000000000000..63ac571a407d --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.8.1-freetype-const.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/939996 +https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6 + +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 +--- 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; 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 000000000000..cd7ebdeeaac3 --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.8.2-avoid-pre-stripping-binaries.patch @@ -0,0 +1,25 @@ +diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake +index ec31fdd80..26411ba6a 100644 +--- a/adm/cmake/occt_defs_flags.cmake ++++ b/adm/cmake/occt_defs_flags.cmake +@@ -173,8 +173,6 @@ 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}") + endif() + if(MINGW) + add_definitions(-D_WIN32_WINNT=0x0601) +@@ -183,11 +181,6 @@ if(MINGW) + # workaround bugs in mingw with vtable export + set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--export-all-symbols") + endif() +-if (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) + set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception") 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 000000000000..02b5dfa9579b --- /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 3dd89af46c7c..39b6c68f9c12 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" @@ -112,6 +111,7 @@ PATCHES=( "${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.1-freetype-const.patch" ) src_unpack() { diff --git a/sci-libs/opencascade/opencascade-9999.ebuild b/sci-libs/opencascade/opencascade-9999.ebuild index aa6493d1b426..4358439f6e95 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() { |