packages: OpenCASCADE/OpenCASCADE6.3.0-casroot.patch - update followin Debi...

[gotar]

Author: gotar                        Date: Mon Jul  5 10:02:26 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update followin Debian: also patch Resource_Manager.cxx,
    this class is used to load various default values.

---- Files affected:
packages/OpenCASCADE:
   OpenCASCADE6.3.0-casroot.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/OpenCASCADE/OpenCASCADE6.3.0-casroot.patch
diff -u packages/OpenCASCADE/OpenCASCADE6.3.0-casroot.patch:1.3 packages/OpenCASCADE/OpenCASCADE6.3.0-casroot.patch:1.4
--- packages/OpenCASCADE/OpenCASCADE6.3.0-casroot.patch:1.3	Sun Jul  4 21:47:53 2010
+++ packages/OpenCASCADE/OpenCASCADE6.3.0-casroot.patch	Mon Jul  5 12:02:18 2010
@@ -272,3 +272,39 @@
    }
    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) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/OpenCASCADE/OpenCASCADE6.3.0-casroot.patch?r1=1.3&r2=1.4&f=u