diff options
author | Michael Mair-Keimberger <mmk@levelnine.at> | 2024-04-18 20:09:06 +0200 |
---|---|---|
committer | Conrad Kostecki <conikost@gentoo.org> | 2024-04-18 21:31:46 +0200 |
commit | bf464abcf4c1b867f3894abe0f5f5a17708a0987 (patch) | |
tree | 20ab477df37d5ef0ef349b3bf9b4f6a08c08704e /media-gfx/freecad | |
parent | kde-apps/krdc: remove unused patch(es) (diff) | |
download | gentoo-bf464abcf4c1b867f3894abe0f5f5a17708a0987.tar.gz gentoo-bf464abcf4c1b867f3894abe0f5f5a17708a0987.tar.bz2 gentoo-bf464abcf4c1b867f3894abe0f5f5a17708a0987.zip |
media-gfx/freecad: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'media-gfx/freecad')
5 files changed, 0 insertions, 182 deletions
diff --git a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch deleted file mode 100644 index 8e875c1811f5..000000000000 --- a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 74664bf8c9142320be335ab91dca53cb1a1187a2 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Fri, 12 Mar 2021 23:55:09 +0100 -Subject: [PATCH] [Gentoo specific] Remove ccache usage - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,11 +8,6 @@ if (POLICY CMP0072) - cmake_policy(SET CMP0072 OLD) - endif(POLICY CMP0072) - --find_program(CCACHE_PROGRAM ccache) #This check should occur before project() --if(CCACHE_PROGRAM) -- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") --endif() -- - project(FreeCAD) - - set(PACKAGE_VERSION_NAME "Vulcan") --- -2.30.1 - diff --git a/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch deleted file mode 100644 index 62ae92392adf..000000000000 --- a/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 60ba533d21302b8a4c11ac06adb53b4041754b02 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Tue, 1 Mar 2022 18:22:00 +0100 -Subject: [PATCH] [Gentoo specific] don't check vcs - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/src/Tools/SubWCRev.py -+++ b/src/Tools/SubWCRev.py -@@ -455,7 +455,7 @@ def main(): - if o in ("-b", "--bindir"): - bindir = a - -- vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), MercurialControl(), DebianChangelog(), UnknownControl()] -+ vcs=[UnknownControl()] - for i in vcs: - if i.extractInfo(srcdir, bindir): - # Open the template file and the version file --- -2.35.1 - diff --git a/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch b/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch deleted file mode 100644 index 44d49ca3bf94..000000000000 --- a/media-gfx/freecad/files/freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/FreeCAD/FreeCAD/commit/c7a21ecbeecefe7c2dfc9e950b3d6bb42351d476 - -From c7a21ecbeecefe7c2dfc9e950b3d6bb42351d476 Mon Sep 17 00:00:00 2001 -From: wmayer <wmayer@users.sourceforge.net> -Date: Sat, 11 Feb 2023 17:47:49 +0100 -Subject: [PATCH 02/51] Fixes #8206: FreeCAD segfaults being run with - parameters (e.g .desktop file has /usr/bin/freecad --single-instance) - ---- a/src/Base/Interpreter.cpp -+++ b/src/Base/Interpreter.cpp -@@ -563,7 +563,7 @@ void initInterpreter(int argc,char *argv[]) - { - PyStatus status; - PyConfig config; -- PyConfig_InitPythonConfig(&config); -+ PyConfig_InitIsolatedConfig(&config); - - status = PyConfig_SetBytesArgv(&config, argc, argv); - if (PyStatus_Exception(status)) { --- -2.39.1 - diff --git a/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch b/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch deleted file mode 100644 index 402c84ee4d28..000000000000 --- a/media-gfx/freecad/files/freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch +++ /dev/null @@ -1,93 +0,0 @@ -https://github.com/FreeCAD/FreeCAD/commit/8b056f156fd087b3df36a5223fc5ca6900649a83 - -From 8b056f156fd087b3df36a5223fc5ca6900649a83 Mon Sep 17 00:00:00 2001 -From: Uwe <donovaly@users.noreply.github.com> -Date: Wed, 17 Aug 2022 12:32:02 +0200 -Subject: [PATCH 0008/1678] [Netgen] add headers to support recent Netgen - -- as reported here: https://forum.freecadweb.org/viewtopic.php?p=618174#p618174 -- also fix compiler warnings about unsafe bool handling ---- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp -+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp -@@ -50,7 +50,9 @@ - - #include <utilities.h> - -+#include <BRepBndLib.hxx> - #include <BRepBuilderAPI_Copy.hxx> -+#include <BRepMesh_IncrementalMesh.hxx> - #include <BRep_Tool.hxx> - #include <Bnd_B3d.hxx> - #include <NCollection_Map.hxx> -@@ -66,6 +68,7 @@ - #include <TopTools_DataMapOfShapeShape.hxx> - #include <TopTools_MapOfShape.hxx> - #include <TopoDS.hxx> -+#include <TopoDS_Solid.hxx> - - #ifdef _MSC_VER - #pragma warning(disable : 4067) -@@ -3027,7 +3030,7 @@ bool NETGENPlugin_Mesher::Compute() - } - } - } -- if (!err && mparams.secondorder > 0) -+ if (!err && mparams.secondorder) - { - try - { -@@ -3302,7 +3305,7 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& aResMap) - // calculate total nb of segments and length of edges - double fullLen = 0.0; - int fullNbSeg = 0; -- int entity = mparams.secondorder > 0 ? SMDSEntity_Quad_Edge : SMDSEntity_Edge; -+ int entity = mparams.secondorder ? SMDSEntity_Quad_Edge : SMDSEntity_Edge; - TopTools_DataMapOfShapeInteger Edge2NbSeg; - for (TopExp_Explorer exp(_shape, TopAbs_EDGE); exp.More(); exp.Next()) - { -@@ -3340,7 +3343,7 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& aResMap) - { - vector<int>& aVec = aResMap[_mesh->GetSubMesh(Edge2NbSegIt.Key())]; - if ( aVec[ entity ] > 1 && aVec[ SMDSEntity_Node ] == 0 ) -- aVec[SMDSEntity_Node] = mparams.secondorder > 0 ? 2*aVec[ entity ]-1 : aVec[ entity ]-1; -+ aVec[SMDSEntity_Node] = mparams.secondorder ? 2*aVec[ entity ]-1 : aVec[ entity ]-1; - - fullNbSeg += aVec[ entity ]; - Edge2NbSeg( Edge2NbSegIt.Key() ) = aVec[ entity ]; -@@ -3386,7 +3389,7 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& aResMap) - int nbNodes = tooManyElems ? hugeNb : (( nbFaces*3 - (nb1d-1)*2 ) / 6 + 1 ); - - vector<int> aVec(SMDSEntity_Last, 0); -- if( mparams.secondorder > 0 ) { -+ if (mparams.secondorder) { - int nb1d_in = (nbFaces*3 - nb1d) / 2; - aVec[SMDSEntity_Node] = nbNodes + nb1d_in; - aVec[SMDSEntity_Quad_Triangle] = nbFaces; -@@ -3428,11 +3431,11 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& aResMap) - if ( tooManyElems ) // avoid FPE - { - aVec[SMDSEntity_Node] = hugeNb; -- aVec[ mparams.secondorder > 0 ? SMDSEntity_Quad_Tetra : SMDSEntity_Tetra] = hugeNb; -+ aVec[ mparams.secondorder ? SMDSEntity_Quad_Tetra : SMDSEntity_Tetra] = hugeNb; - } - else - { -- if( mparams.secondorder > 0 ) { -+ if (mparams.secondorder) { - aVec[SMDSEntity_Node] = nb1d_in/3 + 1 + nb1d_in; - aVec[SMDSEntity_Quad_Tetra] = nbVols; - } ---- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp -+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp -@@ -39,6 +39,8 @@ - #include <StdMeshers_MaxElementArea.hxx> - #include <StdMeshers_QuadranglePreference.hxx> - #include <StdMeshers_ViscousLayers2D.hxx> -+#include <TopExp.hxx> -+#include <TopExp_Explorer.hxx> - - #include <Precision.hxx> - #include <Standard_ErrorHandler.hxx> --- -2.39.1 - diff --git a/media-gfx/freecad/files/freecad-0.20.2-libE57Format-fix-compile-using-gcc13.patch b/media-gfx/freecad/files/freecad-0.20.2-libE57Format-fix-compile-using-gcc13.patch deleted file mode 100644 index c26c8db4e867..000000000000 --- a/media-gfx/freecad/files/freecad-0.20.2-libE57Format-fix-compile-using-gcc13.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/FreeCAD/FreeCAD/commit/f91ad00ed23e92c81fff2bd0073c662291efad32 -https://bugs.gentoo.org/905451 - -From f91ad00ed23e92c81fff2bd0073c662291efad32 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de> -Date: Mon, 27 Mar 2023 11:45:20 +0200 -Subject: [PATCH 011/420] libE57Format: fix compile using gcc13 - -Adding missing header file. Also submitted this upstream here: - -https://github.com/asmaloney/libE57Format/pull/243 ---- a/src/3rdParty/libE57Format/include/E57Format.h -+++ b/src/3rdParty/libE57Format/include/E57Format.h -@@ -33,6 +33,7 @@ - - #include <cfloat> - #include <memory> -+#include <cstdint> - #include <vector> - - #include "E57Exception.h" --- -2.40.1 - |