From: vsr <vsr@opencascade.com>
Date: Fri, 23 Nov 2012 12:40:52 +0000 (+0000)
Subject: Minor fix - remove obsolete patch
X-Git-Tag: V6_6_0~12
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1e9122c80af9d20e6661beb8d05b4062f43b46ea;p=tools%2Finstall.git

Minor fix - remove obsolete patch
---

diff --git a/config_files/med.sh b/config_files/med.sh
index 49fae34..5bff322 100755
--- a/config_files/med.sh
+++ b/config_files/med.sh
@@ -108,8 +108,11 @@ check_job ${PRODUCT_DIR}/INSTALL.LOG make install
 cd ${PRODUCT_DIR}/lib
 
 ### patch badly created libmedimport.la
-### this pb should be fixed in med 3.0.5 or newer version
-sed -i "s%\(.*\)\([[:space:]].*-L../../src/\)\(.*\)%\1\3%g" libmedimport.la
+### fixed in med 3.0.6
+need_patch_la=0
+if [ "${need_patch_la}" = "1" ] ; then
+    sed -i "s%\(.*\)\([[:space:]].*-L../../src/\)\(.*\)%\1\3%g" libmedimport.la
+fi
 
 cd ${PRODUCT_DIR};
 
diff --git a/config_files/patches/OCCT-6.5.3.patch b/config_files/patches/OCCT-6.5.3.patch
deleted file mode 100644
index a22ac33..0000000
--- a/config_files/patches/OCCT-6.5.3.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -Naur --exclude=CVS OCCT-6.5.3_SRC_orig/inc/ApproxInt_PrmPrmSvSurfaces.gxx OCCT-6.5.3_SRC_patch/inc/ApproxInt_PrmPrmSvSurfaces.gxx
---- OCCT-6.5.3_SRC_orig/inc/ApproxInt_PrmPrmSvSurfaces.gxx	2012-04-13 16:38:37.000000000 +0400
-+++ OCCT-6.5.3_SRC_patch/inc/ApproxInt_PrmPrmSvSurfaces.gxx	2012-05-18 12:29:02.000000000 +0400
-@@ -24,6 +24,7 @@
- 
- #include <TColStd_Array1OfReal.hxx>
- #include <math_FunctionSetRoot.hxx>
-+#include <Precision.hxx>
- 
- #define Debug(expr)  cout<<" expr :"<<expr;
- #define MySurf1 MyIntersectionOn2S.Function().AuxillarSurface1()
-@@ -173,7 +174,12 @@
-   TgTU = Tg.Dot(TU);
-   TgTV = Tg.Dot(TV);
-   DIS  = TUTU * TVTV - TUTV * TUTV;
--  
-+  if(fabs(DIS)<Precision::Angular()) { 
-+    MyIsTangent=Standard_False;
-+    MyHasBeenComputed = MyHasBeenComputedbis = Standard_False;
-+    return(Standard_False); 
-+  }
-+
-   DeltaU = (TgTU * TVTV - TgTV * TUTV ) / DIS ; 
-   DeltaV = (TgTV * TUTU - TgTU * TUTV ) / DIS ;
- 
-@@ -189,7 +195,12 @@
-   TUTV = TU.Dot(TV);
-   TgTU = Tg.Dot(TU);
-   TgTV = Tg.Dot(TV);
--  DIS  = TUTU * TVTV - TUTV * TUTV;
-+  DIS  = TUTU * TVTV - TUTV * TUTV; 
-+  if(fabs(DIS)<Precision::Angular()) { 
-+    MyIsTangent=Standard_False;
-+    MyHasBeenComputed = MyHasBeenComputedbis = Standard_False;
-+    return(Standard_False); 
-+  }
- 
-   DeltaU = (TgTU * TVTV - TgTV * TUTV ) / DIS ; 
-   DeltaV = (TgTV * TUTU - TgTU * TUTV ) / DIS ;
-diff -Naur --exclude=CVS OCCT-6.5.3_SRC_orig/src/ApproxInt/ApproxInt_PrmPrmSvSurfaces.gxx OCCT-6.5.3_SRC_patch/src/ApproxInt/ApproxInt_PrmPrmSvSurfaces.gxx
---- OCCT-6.5.3_SRC_orig/src/ApproxInt/ApproxInt_PrmPrmSvSurfaces.gxx	2012-04-13 16:38:37.000000000 +0400
-+++ OCCT-6.5.3_SRC_patch/src/ApproxInt/ApproxInt_PrmPrmSvSurfaces.gxx	2012-05-18 12:29:02.000000000 +0400
-@@ -24,6 +24,7 @@
- 
- #include <TColStd_Array1OfReal.hxx>
- #include <math_FunctionSetRoot.hxx>
-+#include <Precision.hxx>
- 
- #define Debug(expr)  cout<<" expr :"<<expr;
- #define MySurf1 MyIntersectionOn2S.Function().AuxillarSurface1()
-@@ -173,7 +174,12 @@
-   TgTU = Tg.Dot(TU);
-   TgTV = Tg.Dot(TV);
-   DIS  = TUTU * TVTV - TUTV * TUTV;
--  
-+  if(fabs(DIS)<Precision::Angular()) { 
-+    MyIsTangent=Standard_False;
-+    MyHasBeenComputed = MyHasBeenComputedbis = Standard_False;
-+    return(Standard_False); 
-+  }
-+
-   DeltaU = (TgTU * TVTV - TgTV * TUTV ) / DIS ; 
-   DeltaV = (TgTV * TUTU - TgTU * TUTV ) / DIS ;
- 
-@@ -189,7 +195,12 @@
-   TUTV = TU.Dot(TV);
-   TgTU = Tg.Dot(TU);
-   TgTV = Tg.Dot(TV);
--  DIS  = TUTU * TVTV - TUTV * TUTV;
-+  DIS  = TUTU * TVTV - TUTV * TUTV; 
-+  if(fabs(DIS)<Precision::Angular()) { 
-+    MyIsTangent=Standard_False;
-+    MyHasBeenComputed = MyHasBeenComputedbis = Standard_False;
-+    return(Standard_False); 
-+  }
- 
-   DeltaU = (TgTU * TVTV - TgTV * TUTV ) / DIS ; 
-   DeltaV = (TgTV * TUTU - TgTU * TUTV ) / DIS ;