From: Tomasz Pala <gotar@pld-linux.org>
Date: Mon, 5 Jul 2010 10:02:18 +0000 (+0000)
Subject: - update followin Debian: also patch Resource_Manager.cxx,
X-Git-Tag: auto/th/OpenCASCADE-6_3_0-41
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?p=packages%2FOpenCASCADE.git;a=commitdiff_plain;h=24824da0fe044bf57d22641f97b3fffd6e2c5ae5

- update followin Debian: also patch Resource_Manager.cxx,
    this class is used to load various default values.

Changed files:
    OpenCASCADE6.3.0-casroot.patch -> 1.4
---

diff --git a/OpenCASCADE6.3.0-casroot.patch b/OpenCASCADE6.3.0-casroot.patch
index ad97922..d22b3fc 100644
--- a/OpenCASCADE6.3.0-casroot.patch
+++ b/OpenCASCADE6.3.0-casroot.patch
@@ -272,3 +272,39 @@ diff -uNr OpenCASCADE6.3.0-old/ros/src/XmlLDrivers/XmlLDrivers_DocumentStorageDr
    }
    if (!aResourceDir.IsEmpty()) {
      TCollection_AsciiString aResourceFileName =  aResourceDir + "/XmlOcaf.xsd";
+Index: opencascade/ros/src/Resource/Resource_Manager.cxx
+===================================================================
+--- opencascade.orig/ros/src/Resource/Resource_Manager.cxx
++++ opencascade/ros/src/Resource/Resource_Manager.cxx
+@@ -56,10 +56,16 @@
+ {
+   Debug = (getenv("ResourceDebug") != NULL) ;
+ 
+-  TCollection_AsciiString EnvVar, CSF_ = "CSF_" ;
++  TCollection_AsciiString EnvVar, DefaultVar = "/usr/share/OpenCASCADE/src/", CSF_ = "CSF_" ;
++  TCollection_AsciiString Name = aName ;
+   TCollection_AsciiString Directory ;
+   Standard_CString dir ;
+ 
++  if ( Name.IsEqual("STEP") || Name.IsEqual("IGES"))
++    DefaultVar += "XSTEPResource";
++  else
++    DefaultVar += "StdResource";
++
+   if ( getenv ("CSF_ResourceVerbose") != NULL )
+     myVerbose = Standard_True;
+ 
+@@ -69,9 +75,12 @@
+     Load(Directory,myName,myRefMap);
+   }
+   else
++  {
+     if (myVerbose)
+       cout << "Resource Manager Warning: Environment variable \"" << EnvVar
+-	   << "\" not set." << endl;
++	   << "\" not set, using default value \"" << DefaultVar << "\"." << endl;
++    Load(DefaultVar,myName,myRefMap);
++  }
+ 
+   EnvVar = CSF_ + aName + "UserDefaults" ;
+   if ((dir = getenv (EnvVar.ToCString())) != NULL) {