+++ /dev/null
---- OpenCASCADE6.3.0/ros/configure.in~ 2014-06-03 13:19:52.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/configure.in 2014-06-03 13:23:59.627135512 +0200
-@@ -24,7 +24,6 @@
- AM_PROG_LIBTOOL
- AC_PROG_CXX
- AC_PROG_CC_C_O
--AM_C_PROTOTYPES
-
- AC_PROG_AWK
- AC_PROG_INSTALL
---- OpenCASCADE6.3.0/ros/src/OpenGl/OpenGl_degmodel.c~ 2001-09-21 09:57:40.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/OpenGl/OpenGl_degmodel.c 2014-06-03 14:17:23.552574867 +0200
-@@ -101,7 +101,7 @@
-
- } /* end switch */
-
-- fprintf ( stdout, ptr );
-+ fprintf ( stdout, "%s", ptr );
-
- return TSuccess;
-
---- OpenCASCADE6.3.0/ros/src/IFSelect/IFSelect_SessionPilot.cxx~ 2007-09-14 15:28:20.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/IFSelect/IFSelect_SessionPilot.cxx 2014-06-03 14:27:40.856874774 +0200
-@@ -222,7 +222,7 @@
-
- for (;;) {
- char ligne[100];
-- if (!lefic) printf (theprompt.ToCString());
-+ if (!lefic) printf ("%s", theprompt.ToCString());
- ligne[0] = '\0';
- fgets(ligne,100,fic);
- if (feof(fic)) break;
---- OpenCASCADE6.3.0/ros/src/BOPTest/BOPTest_LowCommands.cxx~ 2008-08-15 15:57:31.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/BOPTest/BOPTest_LowCommands.cxx 2014-06-03 14:43:20.658784793 +0200
-@@ -716,24 +716,24 @@
- //
- switch (aState) {
- case TopAbs_IN:
-- sprintf(sbf, sIN.ToCString());
-+ sprintf(sbf, "%s", sIN.ToCString());
- break;
- case TopAbs_OUT:
-- sprintf(sbf, sOUT.ToCString());
-+ sprintf(sbf, "%s", sOUT.ToCString());
- break;
- case TopAbs_ON:
-- sprintf(sbf, sON.ToCString());
-+ sprintf(sbf, "%s", sON.ToCString());
- break;
- case TopAbs_UNKNOWN:
-- sprintf(sbf, sUNKNOWN.ToCString());
-+ sprintf(sbf, "%s", sUNKNOWN.ToCString());
- break;
- default:
-- sprintf(sbf, sUNKNOWN.ToCString());
-+ sprintf(sbf, "%s", sUNKNOWN.ToCString());
- break;
- }
- aDI<<sbf;
- //
-- sprintf(sbf, " shape\n");
-+ sprintf(sbf, "%s", " shape\n");
- aDI<<sbf;
-
- }
--- /dev/null
+--- opencascade-7.5.0/CMakeLists.txt.orig 2020-12-12 09:07:20.515215236 +0100
++++ opencascade-7.5.0/CMakeLists.txt 2020-12-16 19:20:34.123611296 +0100
+@@ -1156,7 +1156,7 @@
+ endforeach()
+ # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
+ install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
+-install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
++install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
+
+ foreach (OCCT_MODULE ${OCCT_MODULES})
+ if (BUILD_MODULE_${OCCT_MODULE})
+--- opencascade-7.5.0/adm/cmake/occt_macros.cmake.orig 2020-11-03 15:49:43.000000000 +0100
++++ opencascade-7.5.0/adm/cmake/occt_macros.cmake 2020-12-30 06:39:51.590760110 +0100
+@@ -592,7 +592,7 @@
+ "cmake_policy(PUSH)
+ cmake_policy(SET CMP0007 NEW)
+ string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
+- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
++ file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
+ foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
+ file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
+ file (REMOVE \"\${TARGET_FILENAME}\")
--- /dev/null
+--- opencascade-7.5.0/tools/TInspectorEXE/TInspectorEXE.cxx.orig 2020-12-29 21:09:40.406098001 +0100
++++ opencascade-7.5.0/tools/TInspectorEXE/TInspectorEXE.cxx 2020-12-29 21:09:43.236082670 +0100
+@@ -41,6 +41,8 @@
+ OSD_Environment anEnvironment (theEnvironmentDir);
+
+ TCollection_AsciiString aFileName = anEnvironment.Value();
++ if (aFileName.IsEmpty())
++ aFileName = "/usr/share/opencascade/data";
+ aFileName += TCollection_AsciiString ("/") + theName;
+
+ return aFileName;
# - MIPS: http://git.debian.org/?p=debian-science/packages/opencascade.git;a=blob;f=debian/patches/fix-asm.patch
# - PPC: http://git.debian.org/?p=debian-science/packages/opencascade.git;a=blob;f=debian/patches/ppc.patch
-# TODO: - separate libs-x (80% of libraries) or even split packages as suggested by Jason Kraftcheck in Debian
-# - check if WOK is working (review wok-install patch), add OCC icons and draw.desktop
+# TODO: - separate libs-x (80% of libraries), follow Fedora split or split packages as suggested by Jason Kraftcheck in Debian
# - consider arch-independent includes: http://git.debian.org/?p=debian-science/packages/opencascade.git;a=blob;f=debian/patches/OCC64.patch
# http://git.debian.org/?p=debian-science/packages/opencascade.git;a=blob;f=debian/patches/drop-config-h.patch
# http://git.debian.org/?p=debian-science/packages/opencascade.git;a=blob;f=debian/patches/multibuf.patch
# and http://git.debian.org/?p=debian-science/packages/opencascade.git;a=blob;f=debian/patches/tcl-cleanup.patch
# - TCL 8.6: http://git.debian.org/?p=debian-science/packages/opencascade.git;a=history;f=debian/patches/fix-tcl8.6.patch
-# - review maint-mode, tkernel-ld and dep-libs patches, as well as hardcoded path in casroot patch
+# - OpenVR?
+
+# Conditional build:
+%bcond_without ffmpeg # FFmpeg support
+%bcond_without freeimage # FreeImage support
+%bcond_without qt # Qt based inspector
+%bcond_without tbb # TBB support
+%bcond_with vtk # VTK toolkit
Summary: OpenCASCADE CAE platform
Summary(pl.UTF-8): Platforma CAE OpenCASCADE
Name: OpenCASCADE
-# The 6.3.1 is a maintenance release, only available for OCC customers
-Version: 6.3.0
-Release: 44
+Version: 7.5.0
+Release: 1
License: LGPL-like, see http://www.opencascade.org/occ/license/
Group: Applications/Engineering
#Source0Download: https://old.opencascade.com/content/latest-release
-Source0: http://files.opencascade.com/OCC_6.3_release/%{name}_src.tgz
-# Source0-md5: 52778127974cb3141c2827f9d40d1f11
-Patch0: %{name}6.3.0-obs-check.patch
-Patch1: %{name}6.3.0-strcmp.patch
-Patch2: %{name}6.3.0-occ6.3.0.patch
-Patch3: %{name}6.3.0-casroot.patch
-Patch4: wokstep_extract.patch
-Patch5: %{name}6.3.0-tkernel-ld.patch
-Patch6: %{name}6.3.0-mft-disable-mmap.patch
-Patch7: %{name}6.3.0-no-bitmaps-icon.patch
-Patch8: %{name}6.3.0-DESTDIR.patch
-Patch9: %{name}6.3.0-maint-mode.patch
-Patch10: %{name}6.3.0-dep-libs.patch
-Patch11: %{name}6.3.0-move-vrml-vis.patch
-Patch12: %{name}6.3.0-make-wok-libs-private.patch
-Patch13: %{name}6.3.0-make-draw-libs-private.patch
-Patch14: %{name}6.3.0-wok-install.patch
-Patch15: %{name}6.3.0-udlist.patch
-Patch16: %{name}6.3.0-WOKUnix_FDescr.patch
-Patch17: fix-tklcaf.patch
-Patch18: %{name}-build.patch
+#Source0: https://old.opencascade.com/sites/default/files/private/occt/OCC_7.5.0_release/opencascade-%{version}.tgz
+# official URL requires login, external archive:
+Source0: https://github.com/tpaviot/oce/releases/download/official-upstream-packages/opencascade-7.5.0.tgz
+# Source0-md5: eb62af12f173b7ce32209701cdd877ea
+Patch0: %{name}-cmake.patch
+Patch1: %{name}-inspector-data.patch
URL: https://www.opencascade.com/open-cascade-technology/
+%{?with_freeimage:BuildRequires: FreeImage-devel}
BuildRequires: OpenGL-GLU-devel
-BuildRequires: autoconf
-BuildRequires: automake
BuildRequires: bison
+BuildRequires: cmake >= 2.8.12
+BuildRequires: doxygen >= 1:1.8.4
+BuildRequires: eigen3
+# avcodec avformat avutil swscale
+%{?with_ffmpeg:BuildRequires: ffmpeg-devel}
BuildRequires: flex
+BuildRequires: freetype-devel >= 2
%ifnarch i386 i486
BuildRequires: jdk
%endif
-BuildRequires: libstdc++-devel
+BuildRequires: libstdc++-devel >= 6:4.7
BuildRequires: libtool
+BuildRequires: rapidjson-devel
BuildRequires: rpmbuild(macros) >= 1.752
+%{?with_tbb:BuildRequires: tbb-devel}
+BuildRequires: tcl-devel
BuildRequires: tk-devel
+%{?with_vtk:BuildRequires: vtk-devel}
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXmu-devel
BuildRequires: xorg-proto-xproto-devel
+%if %{with qt}
+BuildRequires: Qt5Core-devel >= 5
+BuildRequires: Qt5Gui-devel >= 5
+BuildRequires: Qt5Quick-devel >= 5
+BuildRequires: Qt5Widgets-devel >= 5
+BuildRequires: Qt5Xml-devel >= 5
+BuildRequires: qt5-build >= 5
+BuildRequires: qt5-linguist >= 5
+%endif
Requires: %{name}-libs = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define _noautocompressdoc *.chm
+
%description
OpenCASCADE is a suite for 3D surface and solid modeling,
visualization, data exchange and rapid application development. It is
Summary(pl.UTF-8): Pliki programistyczne OpenCASCADE
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
+Requires: libstdc++-devel
+# for CommandWindow.h
+Requires: tcl-devel
%description devel
OpenCASCADE development files.
%description devel -l pl.UTF-8
Pliki programistyczne OpenCASCADE.
+%package inspector
+Summary: OCCT Inspector application
+Summary(pl.UTF-8): Aplikacja OCCT Inspector
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-inspector-libs = %{version}-%{release}
+
+%description inspector
+OCCT Inspector application.
+
+%description inspector -l pl.UTF-8
+Aplikacja OCCT Inspector.
+
+%package inspector-libs
+Summary: OCCT Inspector libraries
+Summary(pl.UTF-8): Biblioteki OCCT Inspector
+Group: X11/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+
+%description inspector-libs
+OCCT Inspector libraries.
+
+%description inspector-libs -l pl.UTF-8
+Biblioteki OCCT Inspector.
+
+%package inspector-devel
+Summary: Header files for OCCT Inspector libraries
+Summary(pl.UTF-8): Pliki nagłówkowe bibliotek OCCT Inspector
+Group: X11/Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-inspector-libs = %{version}-%{release}
+Requires: Qt5Core-devel >= 5
+Requires: Qt5Gui-devel >= 5
+Requires: Qt5Widgets-devel >= 5
+Requires: Qt5Xml-devel >= 5
+
+%description inspector-devel
+Header files for OCCT Inspector libraries.
+
+%description inspector-devel -l pl.UTF-8
+Pliki nagłówkowe bibliotek OCCT Inspector.
+
%package doc
Summary: OpenCASCADE documentation
Summary(pl.UTF-8): Dokumentacja do OpenCASCADE
Przykłady do OpenCASCADE.
%prep
-%setup -q -n %{name}%{version}
+%setup -q -n opencascade-%{version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-cd ros/src/ExprIntrp
-bison -d -p ExprIntrp -o ExprIntrp.tab.c ExprIntrp.yacc
-flex -L -8 -Cf -Cr -P ExprIntrp -o lex.ExprIntrp.c ExprIntrp.lex
-%{__mv} ExprIntrp.tab.h ../../inc/
-cp ExprIntrp.tab.c lex.ExprIntrp.c ../../drv/ExprIntrp/
+
+%{__sed} -i -e '/set (CMAKE_CONFIGURATION_TYPES/ { s/INTERNAL/STRING/;s/ FORCE// }' CMakeLists.txt
%build
-cd ros
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-
-%ifarch x86_64 ppc64
-export CFLAGS="%{rpmcflags} -D_OCC64 -fno-strict-aliasing -DUSE_INTERP_RESULT"
-export CXXFLAGS="%{rpmcflags} -D_OCC64 -fno-strict-aliasing -DUSE_INTERP_RESULT"
-%else
-export CFLAGS="%{rpmcflags} -fno-strict-aliasing -DUSE_INTERP_RESULT"
-export CXXFLAGS="%{rpmcflags} -fno-strict-aliasing -DUSE_INTERP_RESULT"
-%endif
-LDFLAGS=-lpthread \
-%configure \
- %{?debug:--disable-production --enable-debug} \
- %{!?debug:--enable-production --disable-debug} \
- --with-java-include="%{java_home}"/include
+install -d build
+cd build
+%cmake .. \
+ %{?with_qt:-D3RDPARTY_QT_DIR=/usr} \
+ %{?with_qt:-DBUILD_Inspector=ON} \
+ -DBUILD_YACCLEX=ON \
+ -DCMAKE_CONFIGURATION_TYPES=%{?debug:Debug}%{!?debug:PLD} \
+ -DUSE_EIGEN=ON \
+ %{?with_ffmpeg:-DUSE_FFMPEG=ON} \
+ %{?with_freeimage:-DUSE_FREEIMAGE=ON} \
+ %{?with_tbb:-DUSE_TBB=ON} \
+ %{?with_vtk:-DUSE_VTK=ON}
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_includedir}}
-%{__make} -C ros install \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
-cp -a data $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__mv} $RPM_BUILD_ROOT{%{_prefix}/{src,wok,config.h,env_DRAW.sh},%{_datadir}/%{name}}
-%{__mv} $RPM_BUILD_ROOT{%{_prefix}/inc,%{_includedir}/%{name}}
-%{__rm} -r $RPM_BUILD_ROOT%{_prefix}/{Linux,lin}
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{DRAWEXE-%{version},DRAWEXE}
+%if %{with qt}
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{TInspectorEXE-%{version},TInspectorEXE}
+%endif
+
+# names are too common to keep in %{_bindir}
+# also, the files are to be sourced, not executed
+install -d $RPM_BUILD_ROOT%{_libdir}/opencascade
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{env,custom*}.sh $RPM_BUILD_ROOT%{_libdir}/opencascade
+%{__sed} -i -e 's,\${CASROOT}/bin/custom.sh,${aScriptPath}/custom.sh,' $RPM_BUILD_ROOT%{_libdir}/opencascade/env.sh
+# adjust paths
+%{__sed} -i -e 's,^aScriptPath=.*,aScriptPath=%{_libdir}/opencascade,' \
+ $RPM_BUILD_ROOT%{_bindir}/draw.sh \
+ %{?with_qt:$RPM_BUILD_ROOT%{_bindir}/inspector.sh}
-install -d $RPM_BUILD_ROOT/usr/src
-for i in doc samples; do
-install -d ${i}-i
-[ -d $i ] && %{__mv} $i ${i}-i/%{name}-%{version} || :
-done
-ln -s %{_builddir}/%{name}%{version}/doc-i $RPM_BUILD_ROOT%{_defaultdocdir}
-ln -s %{_builddir}/%{name}%{version}/samples-i $RPM_BUILD_ROOT%{_examplesdir}
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -pr samples/{OCCTOverview,glfw,ocafsamples,qt,tcl,webgl,xaml} $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}{/opencas,}/*.la
+# just LGPL v2.1 copy
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/opencascade/LICENSE_LGPL_21.txt
+# packaged as %doc
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/opencascade/OCCT_LGPL_EXCEPTION.txt
%clean
rm -rf $RPM_BUILD_ROOT
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
+%post inspector-libs -p /sbin/ldconfig
+%postun inspector-libs -p /sbin/ldconfig
+
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/DRAWEXE
-%attr(755,root,root) %{_bindir}/wokprocess
-%attr(755,root,root) %{_bindir}/woksh
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/config.h
-%{_datadir}/%{name}/data
-%attr(755,root,root) %{_datadir}/%{name}/env_DRAW.sh
-%dir %{_datadir}/%{name}/src
-%dir %{_datadir}/%{name}/src/UnitsAPI
-%{_datadir}/%{name}/src/UnitsAPI/*.dat
-%{_datadir}/%{name}/wok
-%attr(755,root,root) %{_libdir}/opencas/lib*.so*
+%attr(755,root,root) %{_bindir}/draw.sh
+%dir %{_datadir}/opencascade
+%{_datadir}/opencascade/data
+%{_datadir}/opencascade/resources
%files libs
%defattr(644,root,root,755)
-%doc LICENSE ros/README.txt
-%attr(755,root,root) %{_libdir}/libBin*Plugin.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libBin*Plugin.so.0
-%attr(755,root,root) %{_libdir}/libTWOSPlugin.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libTWOSPlugin.so.0
-%attr(755,root,root) %{_libdir}/libPTKernel.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libPTKernel.so.0
-%attr(755,root,root) %{_libdir}/libStd*Plugin.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libStd*Plugin.so.0
-%attr(755,root,root) %{_libdir}/libTK*.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libTK*.so.0
-%attr(755,root,root) %{_libdir}/libXCAFPlugin.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libXCAFPlugin.so.0
-%attr(755,root,root) %{_libdir}/libXml*Plugin.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libXml*Plugin.so.0
-%dir %{_libdir}/opencas
+%doc OCCT_LGPL_EXCEPTION.txt README.txt
+# R: libTKBRep libTKG2d libTKG3d libTKGeomAlgo libTKGeomBase libTKMath libTKPrim libTKShHealing libTKTopAlgo libTKernel
+%attr(755,root,root) %{_libdir}/libTKBO.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKBO.so.7
+# R: libTKG2d libTKG3d libTKGeomBase libTKMath libTKernel
+%attr(755,root,root) %{_libdir}/libTKBRep.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKBRep.so.7
+# R: libTKBRep libTKBinL libTKCAF libTKCDF libTKLCAF libTKMath libTKernel
+%attr(755,root,root) %{_libdir}/libTKBin.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKBin.so.7
+# R: libTKCDF libTKLCAF libTKernel
+%attr(755,root,root) %{_libdir}/libTKBinL.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKBinL.so.7
+# R: libTKBinL libTKCDF libTKLCAF libTKTObj libTKernel
+%attr(755,root,root) %{_libdir}/libTKBinTObj.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKBinTObj.so.7
+# R: libTKBRep libTKBin libTKBinL libTKCAF libTKCDF libTKLCAF libTKMath libTKService libTKXCAF libTKernel
+%attr(755,root,root) %{_libdir}/libTKBinXCAF.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKBinXCAF.so.7
+# R: libTKBO libTKBRep libTKG2d libTKG3d libTKGeomAlgo libTKGeomBase libTKMath libTKPrim libTKShHealing libTKTopAlgo libTKernel
+%attr(755,root,root) %{_libdir}/libTKBool.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKBool.so.7
+# R: libGKBO libTKBRep libTKCDF libTKG3d libTKGeomBase libTKLCAF libTKMath libTKTopAlgo libTKernel
+%attr(755,root,root) %{_libdir}/libTKCAF.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKCAF.so.7
+# R: libTKernel
+%attr(755,root,root) %{_libdir}/libTKCDF.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKCDF.so.7
+# R: libTKBO libTKBRep libTKBin libTKBinL libTKBool libTKCAF libTKCDF libTKDraw libTKFillet libTKG2d libTKG3d libTKGeomAlgo libTKGeomBase libTKLCAF libTKMath libTKPrim libTKStd libTKStdL libTKTopAlgo libTKV3d libTKVCAF libTKViewerTest libTKXml libTKXmlL libTKernel
+%attr(755,root,root) %{_libdir}/libTKDCAF.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKDCAF.so.7
+# R: libTKBRep libTKG2d libTKG3d libTKGeomAlgo libTKGeomBase libTKHLR libGKMath libTKMesh libTKService libTKTopAlgo libTKernel libX11 tcl tk
+%attr(755,root,root) %{_libdir}/libTKDraw.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKDraw.so.7
+# R: libTKBO libTKBRep libTKBool libTKG2d libTKG3d libTKGeomAlgo libTKGeomBase libTKMath libTKPrim libTKShHealing libTKTopAlgo libTKernel
+%attr(755,root,root) %{_libdir}/libTKFeat.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKFeat.so.7
+# R: libTKBO libTKBRep libTKBool libTKG2d libTKG3d libTKGeomAlgo libTKGeomBase libTKMath libTKShHealing libTKTopAlgo libTKernel
+%attr(755,root,root) %{_libdir}/libTKFillet.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKFillet.so.7
+# R: libTKMath libTKernel
+%attr(755,root,root) %{_libdir}/libTKG2d.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKG2d.so.7
+# R: libTKG2d libTKMath libTKernel
+%attr(755,root,root) %{_libdir}/libTKG3d.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKG3d.so.7
+# R: libTKBRep libTKG2d libTKG3d libTKGeomBase libTKMath libTKernel
+%attr(755,root,root) %{_libdir}/libTKGeomAlgo.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKGeomAlgo.so.7
+# R: libTKG2d libTKG3d libTKMath libTKernel
+%attr(755,root,root) %{_libdir}/libTKGeomBase.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKGeomBase.so.7
+# R: libTKBRep libTKG2d libTKG3d libTKGeomAlgo libTKGeomBase libTKMath libTKTopAlgo libTKernel
+%attr(755,root,root) %{_libdir}/libTKHLR.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKHLR.so.7
+# R: libTKBRep libTKBool libTKG2d libTKG3d libTKGeomAlgo libTKGeomBase libTKMath libTKPrim libTKShHealing libTKTopAlgo libTKXSBase libTKernel
+%attr(755,root,root) %{_libdir}/libTKIGES.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKIGES.so.7
+# R: libTKCDF libTKernel
+%attr(755,root,root) %{_libdir}/libTKLCAF.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKLCAF.so.7
+# R: libTKernel
+%attr(755,root,root) %{_libdir}/libTKMath.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKMath.so.7
+# R: libTKBrep libTKG2d libTKG3d libTKGeomBase libTKMath libTKShHealing libTKTopAlgo libTKernel
+%attr(755,root,root) %{_libdir}/libTKMesh.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKMesh.so.7
+# R: libTKMath libTKService libTKV3d libTKernel
+%attr(755,root,root) %{_libdir}/libTKMeshVS.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKMeshVS.so.7
+# R: libTKBO libTKBRep libTKBool libTKFillet libTKG2d libTKG3d libTKGeomAlgo libTKGeomBase libTKMath libTKPrim libTKShHealing libTKTopAlgo libTKernel
+%attr(755,root,root) %{_libdir}/libTKOffset.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKOffset.so.7
+# R: libTKMath libTKService libTKernel libGL libX11
+%attr(755,root,root) %{_libdir}/libTKOpenGl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKOpenGl.so.7
+# R: libTKBRep libTKG2d libTKG3d libTKGeomBase libTKMath libTKTopAlgo libTKernel
+%attr(755,root,root) %{_libdir}/libTKPrim.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKPrim.so.7
+# R: libTKBO libTKBRep libTKBin libTKBinL libTKBinXCAF libTKBool libTKCAF libTKCDF libTKDCAF libTKDraw libTKFeat libTKFillet libTKG2d libTKG3d libTKGeomAlgo libTKGeomBase libTKHLR libTKIGES libTKLCAF libTKMath libTKMesh libTKOffset libTKPrim libTKService libTKShHealing libTKStd libTKStdL libTKTObj libTKTopAlgo libTKV3d libTKVCAF libTKViewerTest libTKXCAF libTKXDESTEP libTKXSBase libTKXml libTKXmlL libTKernel
+%attr(755,root,root) %{_libdir}/libTKQADraw.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKQADraw.so.7
+# R: libTKBRep libTKG3d liBTKLCAF libTKMath libTKMesh libTKService libTKXCAF libTKernel
+%attr(755,root,root) %{_libdir}/libTKRWMesh.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKRWMesh.so.7
+# R: libTKBRep libTKG2d libTKG3d libTKGeomBase libTKMath libTKSTEP209 libTKSTEPAttr libTKSTEPBase libTKShHealing libTKTopAlgo libTKXSBase libTKernel
+%attr(755,root,root) %{_libdir}/libTKSTEP.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKSTEP.so.7
+# R: libTKSTEPBase libTKXSBase libTKernel
+%attr(755,root,root) %{_libdir}/libTKSTEP209.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKSTEP209.so.7
+# R: libTKSTEPBase libTKXSBase libTKernel
+%attr(755,root,root) %{_libdir}/libTKSTEPAttr.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKSTEPAttr.so.7
+# R: libTKXSBase libTKernel
+%attr(755,root,root) %{_libdir}/libTKSTEPBase.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKSTEPBase.so.7
+# R: libTKBRep libTKMath libTKTopAlgo libTKernel
+%attr(755,root,root) %{_libdir}/libTKSTL.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKSTL.so.7
+# R: libTKMath libTKernel libGL libX11 fontconfig freetype %{?with_ffmpeg:ffmpeg-libs} %{?with_freeimage:FreeImage}
+%attr(755,root,root) %{_libdir}/libTKService.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKService.so.7
+# R: libTKBrep libTKG2d libTKG3d libTKGeomAlgo libTKGeomBase libTKMath libTKTopAlgo libTKernel
+%attr(755,root,root) %{_libdir}/libTKShHealing.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKShHealing.so.7
+# R: libTKBRep libTKCAF libTKCDF libTKG2d libG3d libGKLCAF libTKMath libTKStdL libTKernel
+%attr(755,root,root) %{_libdir}/libTKStd.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKStd.so.7
+# R: libTKCDF libTKLCAF libTKernel
+%attr(755,root,root) %{_libdir}/libTKStdL.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKStdL.so.7
+# R: libTKCDF libTKLCAF libTKernel
+%attr(755,root,root) %{_libdir}/libTKTObj.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKTObj.so.7
+# R: libTKBinTObj libTKDCAF libTKDraw libTKLCAF libTKTObj libTKXmlTObj libTKernel
+%attr(755,root,root) %{_libdir}/libTKTObjDRAW.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKTObjDRAW.so.7
+# R: libTKBRep libTKG2d libTKG3d libTKGeomAlgo libTKGeomBase libTKMath libTKernel
+%attr(755,root,root) %{_libdir}/libTKTopAlgo.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKTopAlgo.so.7
+# R: libTKBO libTKBRep libTKBool libTKDraw libTKFeat libTKFillet libTKG2d libTKG3d libTKGeomAlgo libTKGeomBase libTKHLR libTKMath libTKMesh libTKOffset libTKPrim libTKShHealing libTKTopAlgo libTKernel
+%attr(755,root,root) %{_libdir}/libTKTopTest.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKTopTest.so.7
+# R: libTKBRep liBTKG2d libTKG3d libTKGeomAlgo libTKGeomBase libTKHLR libTKMath libTKMesh libTKService libTKTopAlgo libTKernel
+%attr(755,root,root) %{_libdir}/libTKV3d.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKV3d.so.7
+# R: libTKBRep libTKCAF libTKG3d libTKGeomBase libTKLCAF libTKMath libTKService libTKTopAlgo libTKV3d libTKernel
+%attr(755,root,root) %{_libdir}/libTKVCAF.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKVCAF.so.7
+# R: libTKBRep libTKG2d libTKG3d libTKGeomAlgo libTKGeomBase libTKHLR libTKLCAF libTKMath libTKPrim libTKTopAlgo libTKV3d libTKXCAF libTKernel
+%attr(755,root,root) %{_libdir}/libTKVRML.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKVRML.so.7
+# R: libGKBRep libTKBool libTKDraw libTKFillet libTKG2d libTKG3d libTKGeomAlgo libTKGeomBase libTKHLR libTKMath libTKOffset libTKOpenGl libTKService libTKTopAlgo libTKV3d libTKernel libGL libX11 tcl
+%attr(755,root,root) %{_libdir}/libTKViewerTest.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKViewerTest.so.7
+# R: libTKBRep libTKCAF libTKCDF libTKG3d libTKLCAF libTKMath libTKService libTKTopAlgo libTKVCAF libTKernel
+%attr(755,root,root) %{_libdir}/libTKXCAF.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKXCAF.so.7
+# R: libTKBRep libTKBinXCAF libTKCAF libTKCDF libTKDCAF libTKDraw libTKG3d libTKIGES libTKLCAF libTKMath libTKMesh libTKSTEP libTKService libTKTopAlgo libTKV3d libTKVCAF libTKVRML libTKViewerTest libTKXCAF libTKXDEIGES libTKXDESTEP libTKXSBase libTKXSDRAW libTKXmlXCAF libTKernel
+%attr(755,root,root) %{_libdir}/libTKXDEDRAW.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKXDEDRAW.so.7
+# R: libTKBRep libTKIGES libTKLCAF libTKMath libTKXCAF libTKXSBase libTKernel
+%attr(755,root,root) %{_libdir}/libTKXDEIGES.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKXDEIGES.so.7
+# R: libTKBRep libTKCAF libTKG3d libTKLCAF libTKMath libTKSTEP libTKSTEPAttr libTKSTEPBase libTKShHealing libTKTopAlgo libTKXCAF libTKXSBase libTKernel
+%attr(755,root,root) %{_libdir}/libTKXDESTEP.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKXDESTEP.so.7
+# R: libTKMath libTKMesh libTKernel
+%attr(755,root,root) %{_libdir}/libTKXMesh.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKXMesh.so.7
+# R: libTKBRep libTKG2d libTKG3d libTKGeomBase libTKMath libTKShHealing libTKTopAlgo libTKernel
+%attr(755,root,root) %{_libdir}/libTKXSBase.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKXSBase.so.7
+# R: libTKBRep libTKDCAF libTKDraw libTKG2d libTKG3d libTKIGES libTKLCAF libTKMath libTKMeshVS libTKRWMesh libTKSTEP libTKSTEPBase libTKSTL libTKService libTKV3d libTKVRML libTKViewerTest libTKXCAF libTKXSBase libTKernel
+%attr(755,root,root) %{_libdir}/libTKXSDRAW.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKXSDRAW.so.7
+# R: libTKBRep libTKCAF libTKCDF libTKLCAF libTKMath libTKXmlL libTKernel
+%attr(755,root,root) %{_libdir}/libTKXml.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKXml.so.7
+# R: libTKCDF libTKLCAF libTKMath libTKernel
+%attr(755,root,root) %{_libdir}/libTKXmlL.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKXmlL.so.7
+# R: R: libTKCDF libTKLCAF libTKTObj libTKXmlL libTKernel
+%attr(755,root,root) %{_libdir}/libTKXmlTObj.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKXmlTObj.so.7
+# R: libTKBRep libTKCAF libTKCDF libTKLCAF libTKMath libTKService libTKXCAF libTKXml libTKXmlL libTKernel
+%attr(755,root,root) %{_libdir}/libTKXmlXCAF.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKXmlXCAF.so.7
+# R: (libstdc++) %{?with_tbb:tbb}
+%attr(755,root,root) %{_libdir}/libTKernel.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKernel.so.7
+%dir %{_libdir}/opencascade
+%{_libdir}/opencascade/custom*.sh
+%{_libdir}/opencascade/env.sh
%files devel
%defattr(644,root,root,755)
-%{_includedir}/%{name}
-%attr(755,root,root) %{_libdir}/libBin*Plugin.so
-%attr(755,root,root) %{_libdir}/libTWOSPlugin.so
-%attr(755,root,root) %{_libdir}/libPTKernel.so
-%attr(755,root,root) %{_libdir}/libStd*Plugin.so
-%attr(755,root,root) %{_libdir}/libTK*.so
-%attr(755,root,root) %{_libdir}/libXCAFPlugin.so
-%attr(755,root,root) %{_libdir}/libXml*Plugin.so
-%{_datadir}/%{name}/src/*
-%exclude %{_datadir}/%{name}/src/UnitsAPI/*.dat
+%attr(755,root,root) %{_libdir}/libTKBO.so
+%attr(755,root,root) %{_libdir}/libTKBRep.so
+%attr(755,root,root) %{_libdir}/libTKBin.so
+%attr(755,root,root) %{_libdir}/libTKBinL.so
+%attr(755,root,root) %{_libdir}/libTKBinTObj.so
+%attr(755,root,root) %{_libdir}/libTKBinXCAF.so
+%attr(755,root,root) %{_libdir}/libTKBool.so
+%attr(755,root,root) %{_libdir}/libTKCAF.so
+%attr(755,root,root) %{_libdir}/libTKCDF.so
+%attr(755,root,root) %{_libdir}/libTKDCAF.so
+%attr(755,root,root) %{_libdir}/libTKDraw.so
+%attr(755,root,root) %{_libdir}/libTKFeat.so
+%attr(755,root,root) %{_libdir}/libTKFillet.so
+%attr(755,root,root) %{_libdir}/libTKG2d.so
+%attr(755,root,root) %{_libdir}/libTKG3d.so
+%attr(755,root,root) %{_libdir}/libTKGeomAlgo.so
+%attr(755,root,root) %{_libdir}/libTKGeomBase.so
+%attr(755,root,root) %{_libdir}/libTKHLR.so
+%attr(755,root,root) %{_libdir}/libTKIGES.so
+%attr(755,root,root) %{_libdir}/libTKLCAF.so
+%attr(755,root,root) %{_libdir}/libTKMath.so
+%attr(755,root,root) %{_libdir}/libTKMesh.so
+%attr(755,root,root) %{_libdir}/libTKMeshVS.so
+%attr(755,root,root) %{_libdir}/libTKOffset.so
+%attr(755,root,root) %{_libdir}/libTKOpenGl.so
+%attr(755,root,root) %{_libdir}/libTKPrim.so
+%attr(755,root,root) %{_libdir}/libTKQADraw.so
+%attr(755,root,root) %{_libdir}/libTKRWMesh.so
+%attr(755,root,root) %{_libdir}/libTKSTEP.so
+%attr(755,root,root) %{_libdir}/libTKSTEP209.so
+%attr(755,root,root) %{_libdir}/libTKSTEPAttr.so
+%attr(755,root,root) %{_libdir}/libTKSTEPBase.so
+%attr(755,root,root) %{_libdir}/libTKSTL.so
+%attr(755,root,root) %{_libdir}/libTKService.so
+%attr(755,root,root) %{_libdir}/libTKShHealing.so
+%attr(755,root,root) %{_libdir}/libTKStd.so
+%attr(755,root,root) %{_libdir}/libTKStdL.so
+%attr(755,root,root) %{_libdir}/libTKTObj.so
+%attr(755,root,root) %{_libdir}/libTKTObjDRAW.so
+%attr(755,root,root) %{_libdir}/libTKTopAlgo.so
+%attr(755,root,root) %{_libdir}/libTKTopTest.so
+%attr(755,root,root) %{_libdir}/libTKV3d.so
+%attr(755,root,root) %{_libdir}/libTKVCAF.so
+%attr(755,root,root) %{_libdir}/libTKVRML.so
+%attr(755,root,root) %{_libdir}/libTKViewerTest.so
+%attr(755,root,root) %{_libdir}/libTKXCAF.so
+%attr(755,root,root) %{_libdir}/libTKXDEDRAW.so
+%attr(755,root,root) %{_libdir}/libTKXDEIGES.so
+%attr(755,root,root) %{_libdir}/libTKXDESTEP.so
+%attr(755,root,root) %{_libdir}/libTKXMesh.so
+%attr(755,root,root) %{_libdir}/libTKXSBase.so
+%attr(755,root,root) %{_libdir}/libTKXSDRAW.so
+%attr(755,root,root) %{_libdir}/libTKXml.so
+%attr(755,root,root) %{_libdir}/libTKXmlL.so
+%attr(755,root,root) %{_libdir}/libTKXmlTObj.so
+%attr(755,root,root) %{_libdir}/libTKXmlXCAF.so
+%attr(755,root,root) %{_libdir}/libTKernel.so
+%dir %{_includedir}/opencascade
+%{_includedir}/opencascade/*.gxx
+%{_includedir}/opencascade/*.h
+%{_includedir}/opencascade/*.hxx
+%{_includedir}/opencascade/*.lxx
+%{_libdir}/cmake/opencascade
+%{_datadir}/opencascade/samples
+
+%files inspector
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/TInspectorEXE
+%attr(755,root,root) %{_bindir}/inspector.sh
+
+%files inspector-libs
+%defattr(644,root,root,755)
+# R: libTKBRep libTKBin libTKBinL libTKBinXCAF libTKCAF libTKCDF libTKG3d libTKLCAF libTKMath libTKService libTKStd libTKStdL libTKTInspectorAPI libTKTreeModel libTKV3d libTKVCAF libTKView libTKXCAF libTKXDESTEP libTKXml libTKXmlL libTKXmlXCAF libTKernel Qt5Core Qt5Gui Qt5Widgets
+%attr(755,root,root) %{_libdir}/libTKDFBrowser.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKDFBrowser.so.7
+# R: libTKBRep libTKG3d libTKMath libTKTInspecorAPI libTKTreeModel libTKV3d libTKView libTKernel Qt5Core Qt5Gui Qt5Widgets
+%attr(755,root,root) %{_libdir}/libTKShapeView.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKShapeView.so.7
+# R: libTKTInspectorAPI libTKTreeModel libTKernel Qt5Core Qt5Gui Qt5Widgets Qt5Xml
+%attr(755,root,root) %{_libdir}/libTKTInspector.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKTInspector.so.7
+# R: libTKBRep libTKG3d libTKMath libTKPrim libTKTopAlgo libTKV3d libTKernel Qt5Core
+%attr(755,root,root) %{_libdir}/libTKTInspectorAPI.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKTInspectorAPI.so.7
+# R: libTKCAF libTKDraw libTKTInspector liBTKTInspectorAPI libTKViewerTest libTKernel Qt5Core
+%attr(755,root,root) %{_libdir}/libTKToolsDraw.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKToolsDraw.so.7
+# R: libTKTInspectorAPI libTKernel Qt5Core Qt5Gui Qt5Widgets
+%attr(755,root,root) %{_libdir}/libTKTreeModel.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKTreeModel.so.7
+# R: libTKG3d libTKMath libTKTInspectorAPI libTKTopAlgo libTKTreeModel libTKV3d libTKView libTKernel Qt5Core Qt5Gui Qt5Widgets
+%attr(755,root,root) %{_libdir}/libTKVInspector.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKVInspector.so.7
+# R: libTKBRep libTKG3d libTKMath libTKOpenGl libTKService libTKV3d libTKernel Qt5Core Qt5Gui Qt5Widgets
+%attr(755,root,root) %{_libdir}/libTKView.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libTKView.so.7
+
+%files inspector-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libTKDFBrowser.so
+%attr(755,root,root) %{_libdir}/libTKShapeView.so
+%attr(755,root,root) %{_libdir}/libTKTInspector.so
+%attr(755,root,root) %{_libdir}/libTKTInspectorAPI.so
+%attr(755,root,root) %{_libdir}/libTKToolsDraw.so
+%attr(755,root,root) %{_libdir}/libTKTreeModel.so
+%attr(755,root,root) %{_libdir}/libTKVInspector.so
+%attr(755,root,root) %{_libdir}/libTKView.so
+%{_includedir}/opencascade/inspector
%files doc
%defattr(644,root,root,755)
-%{_docdir}/%{name}-%{version}
+%doc doc/*
%files samples
%defattr(644,root,root,755)
+++ /dev/null
-diff -uNr old-OpenCASCADE6.3.0/ros/Makefile.am OpenCASCADE6.3.0/ros/Makefile.am
---- old-OpenCASCADE6.3.0/ros/Makefile.am 2008-09-09 17:49:10.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/Makefile.am 2008-10-01 19:19:50.000000000 +0200
-@@ -108,126 +108,126 @@
- dir_SunOS=sun
-
- install-exec-local:
-- $(INSTALL) -d $(prefix)/$(platform)
-- if [ -e $(prefix)/bin -a ! -e $(prefix)/$(platform)/bin ]; then \
-- cd $(prefix)/$(platform) && ln -s ../bin bin; \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/$(platform)
-+ if [ -e $(DESTDIR)$(prefix)/bin -a ! -e $(DESTDIR)$(prefix)/$(platform)/bin ]; then \
-+ cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../bin bin; \
- fi
-- if [ -e $(prefix)/lib -a ! -e $(prefix)/$(platform)/lib ]; then \
-- cd $(prefix)/$(platform) && ln -s ../lib lib; \
-+ if [ -e $(DESTDIR)$(prefix)/lib -a ! -e $(DESTDIR)$(prefix)/$(platform)/lib ]; then \
-+ cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../lib lib; \
- fi
-- $(INSTALL) -d $(prefix)/$(dir_$(platform))
-- if [ -e $(prefix)/bin -a ! -e $(prefix)/$(dir_$(platform))/bin ]; then \
-- cd $(prefix)/$(dir_$(platform)) && ln -s ../bin bin; \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/$(dir_$(platform))
-+ if [ -e $(DESTDIR)$(prefix)/bin -a ! -e $(DESTDIR)$(prefix)/$(dir_$(platform))/bin ]; then \
-+ cd $(DESTDIR)$(prefix)/$(dir_$(platform)) && ln -s ../bin bin; \
- fi
-- if [ -e $(prefix)/lib -a ! -e $(prefix)/$(dir_$(platform))/lib ]; then \
-- cd $(prefix)/$(dir_$(platform)) && ln -s ../lib lib; \
-+ if [ -e $(DESTDIR)$(prefix)/lib -a ! -e $(DESTDIR)$(prefix)/$(dir_$(platform))/lib ]; then \
-+ cd $(DESTDIR)$(prefix)/$(dir_$(platform)) && ln -s ../lib lib; \
- fi
-- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
-+ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
- if [ "$$pd" != "$$sd" ]; then \
-- $(INSTALL) -d $(prefix)/inc; \
-- cp -fr$(CP_$(platform)) $(top_srcdir)/inc $(prefix); \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/inc; \
-+ cp -fr$(CP_$(platform)) $(top_srcdir)/inc $(DESTDIR)$(prefix); \
- fi; \
- if [ "$$pd" != "$$bd" ]; then \
-- cp -fr$(CP_$(platform)) $$bd/config.h $(prefix); \
-+ cp -fr$(CP_$(platform)) $$bd/config.h $(DESTDIR)$(prefix); \
- fi
-- if [ -e $(prefix)/inc/config.h ]; then \
-- unlink $(prefix)/inc/config.h; \
-+ if [ -e $(DESTDIR)$(prefix)/inc/config.h ]; then \
-+ unlink $(DESTDIR)$(prefix)/inc/config.h; \
- fi
-- cd $(prefix)/inc && ln -s ../config.h config.h
-- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
-+ cd $(DESTDIR)$(prefix)/inc && ln -s ../config.h config.h
-+ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
- if [ "$$pd" != "$$sd" -a -d $(top_srcdir)/src/UnitsAPI ]; then \
-- $(INSTALL) -d $(prefix)/src; \
-- $(INSTALL) -d $(prefix)/src/UnitsAPI; \
-- cp -fr$(CP_$(platform)) $(top_srcdir)/src/UnitsAPI $(prefix)/src; \
-- cp -f$(CP_$(platform)) $(top_srcdir)/env_DRAW.sh $(prefix); \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/src; \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/src/UnitsAPI; \
-+ cp -fr$(CP_$(platform)) $(top_srcdir)/src/UnitsAPI $(DESTDIR)$(prefix)/src; \
-+ cp -f$(CP_$(platform)) $(top_srcdir)/env_DRAW.sh $(DESTDIR)$(prefix); \
- fi
-- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
-+ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
- if [ "$$pd" != "$$sd" ]; then \
- inst_dirs="$(FoundationClasses_DIRS)"; \
- if test "x$(FoundationClasses_DIRS)" != "x"; then \
- for d in $$inst_dirs; do \
-- $(INSTALL) -d $(prefix)/src/$$d; \
-- cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
-+ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
- done; \
- fi; \
- fi
-- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
-+ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
- if [ "$$pd" != "$$sd" ]; then \
- inst_dirs="$(ModelingData_DIRS)"; \
- if test "x$(ModelingData_DIRS)" != "x"; then \
- for d in $$inst_dirs; do \
-- $(INSTALL) -d $(prefix)/src/$$d; \
-- cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
-+ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
- done; \
- fi; \
- fi
-- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
-+ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
- if [ "$$pd" != "$$sd" ]; then \
- inst_dirs="$(ModelingAlgorithms_DIRS)"; \
- if test "x$(ModelingAlgorithms_DIRS)" != "x"; then \
- for d in $$inst_dirs; do \
-- $(INSTALL) -d $(prefix)/src/$$d; \
-- cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
-+ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
- done; \
- fi; \
- fi
-- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
-+ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
- if [ "$$pd" != "$$sd" ]; then \
- inst_dirs="$(Visualization_DIRS)"; \
- if test "x$(Visualization_DIRS)" != "x"; then \
- for d in $$inst_dirs; do \
-- $(INSTALL) -d $(prefix)/src/$$d; \
-- cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
-+ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
- done; \
- fi; \
- fi
-- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
-+ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
- if [ "$$pd" != "$$sd" ]; then \
- inst_dirs="$(ApplicationFramework_DIRS)"; \
- if test "x$(ApplicationFramework_DIRS)" != "x"; then \
- for d in $$inst_dirs; do \
-- $(INSTALL) -d $(prefix)/src/$$d; \
-- cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
-+ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
- done; \
- fi; \
- fi
-- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
-+ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
- if [ "$$pd" != "$$sd" ]; then \
- inst_dirs="$(DataExchange_DIRS)"; \
- if test "x$(DataExchange_DIRS)" != "x"; then \
- for d in $$inst_dirs; do \
-- $(INSTALL) -d $(prefix)/src/$$d; \
-- cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
-+ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
- done; \
- fi; \
- fi
-- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
-+ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
- if [ "$$pd" != "$$sd" ]; then \
- inst_dirs="$(Draw_DIRS)"; \
- if test "x$(Draw_DIRS)" != "x"; then \
- for d in $$inst_dirs; do \
-- $(INSTALL) -d $(prefix)/src/$$d; \
-- cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
-+ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
- done; \
- fi; \
- fi
-- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
-+ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
- if [ "$$pd" != "$$sd" ]; then \
- inst_dirs="$(WOK_DIRS)"; \
- if test "x$(WOK_DIRS)" != "x"; then \
- for d in $$inst_dirs; do \
-- $(INSTALL) -d $(prefix)/src/$$d; \
-- cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
-+ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
- done; \
- fi; \
- fi
-- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
-+ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \
- if [ "$$pd" != "$$sd" ]; then \
- inst_dirs="$(Wrappers_DIRS)"; \
- if test "x$(Wrappers_DIRS)" != "x"; then \
- for d in $$inst_dirs; do \
-- $(INSTALL) -d $(prefix)/src/$$d; \
-- cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
-+ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
- done; \
- fi; \
- fi
+++ /dev/null
-diff -uNr OpenCASCADE6.3.0-old/ros/src/WOKUnix/WOKUnix_FDescr.cxx OpenCASCADE6.3.0/ros/src/WOKUnix/WOKUnix_FDescr.cxx
---- OpenCASCADE6.3.0-old/ros/src/WOKUnix/WOKUnix_FDescr.cxx 2008-05-08 15:11:16.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/WOKUnix/WOKUnix_FDescr.cxx 2008-10-02 22:53:09.000000000 +0200
-@@ -202,7 +202,7 @@
- if(mknod(apath.ToCString(), 0700 | S_IFIFO, 0))
- { perror(apath.ToCString());}
-
-- myFileChannel = open(apath.ToCString(), O_RDONLY | O_NDELAY | O_CREAT);
-+ myFileChannel = open(apath.ToCString(), O_RDONLY | O_NDELAY | O_CREAT, S_IRUSR);
- SetUnBuffered();
-
- // write end of pipe is unbuffered also
+++ /dev/null
-diff -uNr OpenCASCADE6.3.0-old/ros/src/Aspect/Aspect_Driver.cxx OpenCASCADE6.3.0/ros/src/Aspect/Aspect_Driver.cxx
---- OpenCASCADE6.3.0-old/ros/src/Aspect/Aspect_Driver.cxx 2001-11-15 18:01:55.000000000 +0100
-+++ OpenCASCADE6.3.0/ros/src/Aspect/Aspect_Driver.cxx 2008-10-02 23:38:50.000000000 +0200
-@@ -35,14 +35,12 @@
- fontdir = getenv("CSF_MDTVFontDirectory" );
- if ( !fontdir) {
- casroot = getenv("CASROOT");
-- if ( casroot ) {
-- TCollection_AsciiString CasRootString (casroot);
-- CasRootString += "/src/FontMFT" ;
-- CSF_MDTVFontDirectory = OSD_Environment(CasRootString.ToCString());
-- } else {
-- cout << " CASROOT or CSF_MDTVFontDirectory are mandatory to use this fonctionnality " << endl;
-- Standard_Failure::Raise ( "CSF_MDTVTexturesDirectory and CASROOT not setted " );
-+ if ( !casroot ) {
-+ casroot = "/usr/share/OpenCASCADE";
- }
-+ TCollection_AsciiString CasRootString (casroot);
-+ CasRootString += "/src/FontMFT" ;
-+ CSF_MDTVFontDirectory = OSD_Environment(CasRootString.ToCString());
- } else {
- CSF_MDTVFontDirectory = OSD_Environment("CSF_MDTVFontDirectory");
- }
-diff -uNr OpenCASCADE6.3.0-old/ros/src/DPrsStd/DPrsStd.cxx OpenCASCADE6.3.0/ros/src/DPrsStd/DPrsStd.cxx
---- OpenCASCADE6.3.0-old/ros/src/DPrsStd/DPrsStd.cxx 2005-07-08 15:51:41.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/DPrsStd/DPrsStd.cxx 2008-10-02 23:38:50.000000000 +0200
-@@ -59,11 +59,12 @@
- Standard_Boolean hasPlugin = Standard_False;
- TCollection_AsciiString PluginName ;
- if ( !plugin ) {
-- if ( casroot ) {
-- PluginName = TCollection_AsciiString (casroot);
-- PluginName+="/src/StdResource" ;
-- hasPlugin = Standard_True ;
-+ if ( !casroot ) {
-+ casroot = "/usr/share/OpenCASCADE";
- }
-+ PluginName = TCollection_AsciiString (casroot);
-+ PluginName+="/src/StdResource" ;
-+ hasPlugin = Standard_True ;
- } else {
- PluginName = TCollection_AsciiString (plugin);
- hasPlugin = Standard_True ;
-diff -uNr OpenCASCADE6.3.0-old/ros/src/Draw/Draw.cxx OpenCASCADE6.3.0/ros/src/Draw/Draw.cxx
---- OpenCASCADE6.3.0-old/ros/src/Draw/Draw.cxx 2008-07-25 16:03:00.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/Draw/Draw.cxx 2008-10-02 23:38:50.000000000 +0200
-@@ -253,8 +253,7 @@
- #ifdef WNT
- ReadInitFile("ddefault");
- #else
-- cout << " the CASROOT variable is mandatory to Run OpenCascade "<<endl;
-- cout << "No default file" << endl;
-+ ReadInitFile("/usr/share/OpenCASCADE/src/DrawResources/DrawDefault");
- #endif
- } else {
-
-diff -uNr OpenCASCADE6.3.0-old/ros/src/Draw/Draw_PloadCommands.cxx OpenCASCADE6.3.0/ros/src/Draw/Draw_PloadCommands.cxx
---- OpenCASCADE6.3.0-old/ros/src/Draw/Draw_PloadCommands.cxx 2008-08-15 15:57:21.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/Draw/Draw_PloadCommands.cxx 2008-10-02 23:38:50.000000000 +0200
-@@ -54,13 +54,11 @@
- // now try by CASROOT
- aPluginDir = getenv("CASROOT");
-
-- if ( !aPluginDir.IsEmpty() ) {
-- aPluginDir +="/src/DrawResources" ;
-- aToSetCSFVariable = Standard_True; //CSF variable to be set later
-- } else {
-- aResult = aDirFound = Standard_False;
-- cout << FAILSTR "Neither " << aCSFVariable.ToCString() << ", nor CASROOT variables have been set" << endl;
-+ if ( aPluginDir.IsEmpty() ) {
-+ aPluginDir = "/usr/share/OpenCASCADE";
- }
-+ aPluginDir +="/src/DrawResources" ;
-+ aToSetCSFVariable = Standard_True; //CSF variable to be set later
- }
-
- if (aDirFound) {
-diff -uNr OpenCASCADE6.3.0-old/ros/src/DrawResources/DrawDefault OpenCASCADE6.3.0/ros/src/DrawResources/DrawDefault
---- OpenCASCADE6.3.0-old/ros/src/DrawResources/DrawDefault 2003-10-03 19:01:22.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/DrawResources/DrawDefault 2008-10-02 23:38:50.000000000 +0200
-@@ -8,11 +8,10 @@
- if { [info exists env(DRAWHOME) ] } {
- set dir $env(DRAWHOME)
- } else {
-- if { [info exists env(CASROOT) ] } {
-- set dir [file join $env(CASROOT) src DrawResources]
-- } else {
-- puts " CASROOT is Mandatory to Run OpenCascade"
-+ if { ![info exists env(CASROOT) ] } {
-+ set env(CASROOT) "/usr/share/OpenCASCADE"
- }
-+ set dir [file join $env(CASROOT) src DrawResources]
- }
-
- # san - 02/08/2002 - In Tcl8.3 it is no longer necessary to load Tix explicitly on WNT
-diff -uNr OpenCASCADE6.3.0-old/ros/src/Graphic3d/Graphic3d_GraphicDevice.cxx OpenCASCADE6.3.0/ros/src/Graphic3d/Graphic3d_GraphicDevice.cxx
---- OpenCASCADE6.3.0-old/ros/src/Graphic3d/Graphic3d_GraphicDevice.cxx 2008-07-04 17:36:54.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/Graphic3d/Graphic3d_GraphicDevice.cxx 2008-10-02 23:38:50.000000000 +0200
-@@ -204,29 +204,8 @@
-
- if (! BAD(glso)) {
- glshr = getenv("CSF_GraphicShr");
-- } else if (! BAD(casroot)) {
-- glshr = (char *) malloc (128);
-- /* Pour faire plaisir a Purify */
-- glshr[0] = '\0';
-- strcat(glshr, casroot);
-- struct utsname info;
-- uname (&info);
-- strcat(glshr,"/");
-- strcat(glshr,info.sysname);
--#if defined(__hpux) || defined(HPUX)
-- strcat (glshr, "/lib/libTKOpenGl.sl");
--#elif defined(WNT)
-- strcat (glshr, "/TKOpenGl.dll");
--#elif defined(__APPLE__)
-- strcat (glshr, "/lib/libTKOpenGl.dylib");
--#else
-- strcat (glshr, "/lib/libTKOpenGl.so");
--#endif
--// printf("You have not defined CSF_GraphicShr, defaulting to %s",glshr);
- } else {
-- aShr = NULL;
-- printf("You have not defined CSF_GraphicShr or CASROOT, aborting...");
-- return Standard_False;
-+ glshr = "/usr/lib/libTKOpenGl.so";
- }
-
- aShr = glshr;
-diff -uNr OpenCASCADE6.3.0-old/ros/src/Graphic3d/Graphic3d_Texture1D.cxx OpenCASCADE6.3.0/ros/src/Graphic3d/Graphic3d_Texture1D.cxx
---- OpenCASCADE6.3.0-old/ros/src/Graphic3d/Graphic3d_Texture1D.cxx 2008-07-04 17:39:03.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/Graphic3d/Graphic3d_Texture1D.cxx 2008-10-02 23:38:50.000000000 +0200
-@@ -32,11 +32,12 @@
- Standard_Boolean HasDefinition = Standard_False ;
- if ( !envir ) {
- casroot = getenv("CASROOT");
-- if ( casroot ) {
-- VarName = TCollection_AsciiString (casroot);
-- VarName += "/src/Textures" ;
-- HasDefinition = Standard_True ;
-+ if ( !casroot ) {
-+ casroot = "/usr/share/OpenCASCADE";
- }
-+ VarName = TCollection_AsciiString (casroot);
-+ VarName += "/src/Textures" ;
-+ HasDefinition = Standard_True ;
- } else {
- VarName = TCollection_AsciiString (envir);
- HasDefinition = Standard_True ;
-diff -uNr OpenCASCADE6.3.0-old/ros/src/Graphic3d/Graphic3d_Texture2D.cxx OpenCASCADE6.3.0/ros/src/Graphic3d/Graphic3d_Texture2D.cxx
---- OpenCASCADE6.3.0-old/ros/src/Graphic3d/Graphic3d_Texture2D.cxx 2008-07-04 17:39:03.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/Graphic3d/Graphic3d_Texture2D.cxx 2008-10-02 23:38:50.000000000 +0200
-@@ -28,11 +28,12 @@
- Standard_Boolean HasDefinition = Standard_False ;
- if ( !envir ) {
- casroot = getenv("CASROOT");
-- if ( casroot ) {
-- VarName = TCollection_AsciiString (casroot);
-- VarName += "/src/Textures" ;
-- HasDefinition = Standard_True ;
-+ if ( !casroot ) {
-+ casroot = "/usr/share/OpenCASCADE";
- }
-+ VarName = TCollection_AsciiString (casroot);
-+ VarName += "/src/Textures" ;
-+ HasDefinition = Standard_True ;
- } else {
- VarName = TCollection_AsciiString (envir);
- HasDefinition = Standard_True ;
-diff -uNr OpenCASCADE6.3.0-old/ros/src/Graphic3d/Graphic3d_TextureEnv.cxx OpenCASCADE6.3.0/ros/src/Graphic3d/Graphic3d_TextureEnv.cxx
---- OpenCASCADE6.3.0-old/ros/src/Graphic3d/Graphic3d_TextureEnv.cxx 2008-07-04 17:39:03.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/Graphic3d/Graphic3d_TextureEnv.cxx 2008-10-02 23:38:50.000000000 +0200
-@@ -29,11 +29,12 @@
- Standard_Boolean HasDefinition = Standard_False ;
- if ( !envir ) {
- casroot = getenv("CASROOT");
-- if ( casroot ) {
-- VarName = TCollection_AsciiString (casroot);
-- VarName += "/src/Textures" ;
-- HasDefinition = Standard_True ;
-+ if ( !casroot ) {
-+ casroot = "/usr/share/OpenCASCADE";
- }
-+ VarName = TCollection_AsciiString (casroot);
-+ VarName += "/src/Textures" ;
-+ HasDefinition = Standard_True ;
- } else {
- VarName = TCollection_AsciiString (envir);
- HasDefinition = Standard_True ;
-diff -uNr OpenCASCADE6.3.0-old/ros/src/UnitsAPI/UnitsAPI.cxx OpenCASCADE6.3.0/ros/src/UnitsAPI/UnitsAPI.cxx
---- OpenCASCADE6.3.0-old/ros/src/UnitsAPI/UnitsAPI.cxx 2006-08-04 19:03:13.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/UnitsAPI/UnitsAPI.cxx 2008-10-02 23:38:50.000000000 +0200
-@@ -35,13 +35,11 @@
- else {
- OSD_Environment CasRootEnv("CASROOT");
- TCollection_AsciiString CasRootString(CasRootEnv.Value());
-- if (CasRootString.Length() > 0 ) {
-- CasRootString += "/src/UnitsAPI/Lexi_Expr.dat" ;
-- Units::LexiconFile(CasRootString.ToCString());
-- }
-- else {
-- Standard_NoSuchObject::Raise("environment variable CSF_UnitsLexicon undefined");
-+ if (CasRootString.Length() == 0 ) {
-+ CasRootString = "/usr/share/OpenCASCADE";
- }
-+ CasRootString += "/src/UnitsAPI/Lexi_Expr.dat" ;
-+ Units::LexiconFile(CasRootString.ToCString());
- }
- TCollection_AsciiString sunitsfile(env2.Value());
- if( sunitsfile.Length() > 0 )
-@@ -49,13 +47,11 @@
- else {
- OSD_Environment CasRootEnv("CASROOT");
- TCollection_AsciiString CasRootString(CasRootEnv.Value());
-- if (CasRootString.Length() > 0 ) {
-- CasRootString += "/src/UnitsAPI/Units.dat";
-- Units::UnitsFile(CasRootString.ToCString());
-- }
-- else {
-- Standard_NoSuchObject::Raise("environment variable CSF_UnitsDefinition undefined");
-+ if (CasRootString.Length() == 0 ) {
-+ CasRootString = "/usr/share/OpenCASCADE";
- }
-+ CasRootString += "/src/UnitsAPI/Units.dat";
-+ Units::UnitsFile(CasRootString.ToCString());
- }
- switch (aSystemUnits) {
- case UnitsAPI_DEFAULT :
-diff -uNr OpenCASCADE6.3.0-old/ros/src/ViewerTest/ViewerTest.cxx OpenCASCADE6.3.0/ros/src/ViewerTest/ViewerTest.cxx
---- OpenCASCADE6.3.0-old/ros/src/ViewerTest/ViewerTest.cxx 2008-08-15 15:57:34.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/ViewerTest/ViewerTest.cxx 2008-10-02 23:38:50.000000000 +0200
-@@ -1566,11 +1566,12 @@
- Standard_Boolean HasDefinition = Standard_False ;
- if ( !envir ) {
- casroot = getenv("CASROOT");
-- if ( casroot ) {
-- VarName = TCollection_AsciiString (casroot);
-- VarName += "/src/Textures" ;
-- HasDefinition = Standard_True ;
-+ if ( !casroot ) {
-+ casroot = "/usr/share/OpenCASCADE";
- }
-+ VarName = TCollection_AsciiString (casroot);
-+ VarName += "/src/Textures" ;
-+ HasDefinition = Standard_True ;
- } else {
- VarName = TCollection_AsciiString (envir);
- HasDefinition = Standard_True ;
-diff -uNr OpenCASCADE6.3.0-old/ros/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx OpenCASCADE6.3.0/ros/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx
---- OpenCASCADE6.3.0-old/ros/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx 2008-07-04 17:39:02.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx 2008-10-02 23:38:50.000000000 +0200
-@@ -183,18 +183,11 @@
- if (aResourceDir.IsEmpty()) {
- // now try by CASROOT
- aResourceDir = getenv (aCSFVariable[1]);
-- if ( !aResourceDir.IsEmpty() ) {
-- aResourceDir += "/src/XmlOcafResource" ;
-- aToSetCSFVariable = Standard_True; //CSF variable to be set later
-+ if ( aResourceDir.IsEmpty() ) {
-+ aResourceDir = "/usr/share/OpenCASCADE";
- }
--#ifdef DEB
-- else {
-- TCollection_ExtendedString aWarn = FAILSTR "Neither ";
-- aWarn = (aWarn + aCSFVariable[0] + ", nor " + aCSFVariable[1]
-- + " variables have been set");
-- aMessageDriver->Write (aWarn.ToExtString());
-- }
--#endif
-+ aResourceDir += "/src/XmlOcafResource" ;
-+ aToSetCSFVariable = Standard_True; //CSF variable to be set later
- }
- 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) {
+++ /dev/null
-diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKDraw/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKDraw/Makefile.am
---- OpenCASCADE6.3.0-old/ros/adm/make/TKDraw/Makefile.am 2008-10-02 23:54:48.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/adm/make/TKDraw/Makefile.am 2008-10-02 23:55:58.000000000 +0200
-@@ -33,7 +33,7 @@ libTKDraw_la_LIBADD = \
- ../TKGeomBase/libTKGeomBase.la \
- ../TKHLR/libTKHLR.la \
- ../TKGeomAlgo/libTKGeomAlgo.la \
--$(STLPort_LIB) $(CSF_TclLibs_LIB) $(CSF_TclTkLibs_LIB) $(CSF_gdi32_LIB) $(CSF_advapi32_LIB) $(CSF_user32_LIB)
-+$(STLPort_LIB) $(CSF_TclLibs_LIB) $(CSF_TclTkLibs_LIB) $(CSF_XwLibs_LIB) $(CSF_gdi32_LIB) $(CSF_advapi32_LIB) $(CSF_user32_LIB)
-
- libTKDraw_la_SOURCES = \
- @top_srcdir@/drv/DBRep/DBRep_ListIteratorOfListOfEdge_0.cxx \
-diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKNIS/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKNIS/Makefile.am
---- OpenCASCADE6.3.0-old/ros/adm/make/TKNIS/Makefile.am 2008-10-02 23:54:48.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/adm/make/TKNIS/Makefile.am 2008-10-02 23:55:58.000000000 +0200
-@@ -26,7 +26,7 @@
- ../TKBRep/libTKBRep.la \
- ../TKG3d/libTKG3d.la \
- ../TKV3d/libTKV3d.la \
--$(STLPort_LIB)
-+$(STLPort_LIB) $(CSF_OpenGlLibs_LIB)
-
- libTKNIS_la_SOURCES = \
- @top_srcdir@/src/NIS/NIS_DrawList.cxx \
-diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKService/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKService/Makefile.am
---- OpenCASCADE6.3.0-old/ros/adm/make/TKService/Makefile.am 2008-10-02 23:54:49.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/adm/make/TKService/Makefile.am 2008-10-02 23:55:58.000000000 +0200
-@@ -45,7 +45,7 @@
- libTKService_la_LIBADD = \
- ../TKernel/libTKernel.la \
- ../TKMath/libTKMath.la \
--$(STLPort_LIB) $(CSF_XwLibs_LIB) $(CSF_dpsLibs_LIB) $(CSF_XmuLibs_LIB)
-+$(STLPort_LIB) $(CSF_XwLibs_LIB) $(CSF_dpsLibs_LIB) $(CSF_XmuLibs_LIB) -lXext
-
- libTKService_la_SOURCES = \
- @top_srcdir@/drv/Aspect/Aspect_Array1OfEdge_0.cxx \
-diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKViewerTest/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKViewerTest/Makefile.am
---- OpenCASCADE6.3.0-old/ros/adm/make/TKViewerTest/Makefile.am 2008-10-02 23:54:48.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/adm/make/TKViewerTest/Makefile.am 2008-10-02 23:55:58.000000000 +0200
-@@ -40,7 +40,7 @@ libTKViewerTest_la_LIBADD = \
- ../TKHLR/libTKHLR.la \
- ../TKDraw/libTKDraw.la \
- ../TKNIS/libTKNIS.la \
--$(STLPort_LIB) $(CSF_TclLibs_LIB) $(CSF_TclTkLibs_LIB) $(CSF_user32_LIB) $(CSF_gdi32_LIB)
-+$(STLPort_LIB) $(CSF_TclLibs_LIB) $(CSF_TclTkLibs_LIB) $(CSF_XwLibs_LIB) $(CSF_user32_LIB) $(CSF_gdi32_LIB)
-
- libTKViewerTest_la_SOURCES = \
- @top_srcdir@/drv/Viewer2dTest/Viewer2dTest_DataMapIteratorOfDataMapOfText_0.cxx \
+++ /dev/null
-diff -uNr OpenCASCADE6.3.0-old/ros/configure.in OpenCASCADE6.3.0/ros/configure.in
---- OpenCASCADE6.3.0-old/ros/configure.in 2008-10-02 23:51:27.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/configure.in 2008-10-02 23:55:10.000000000 +0200
-@@ -12,7 +12,7 @@
-
- AM_CONFIG_HEADER(config.h)
-
--dnl AM_MAINTAINER_MODE
-+AM_MAINTAINER_MODE
-
- AC_AIX
- AC_ISC_POSIX
+++ /dev/null
-diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/DRAWEXE/Makefile.am OpenCASCADE6.3.0/ros/adm/make/DRAWEXE/Makefile.am
---- OpenCASCADE6.3.0-old/ros/adm/make/DRAWEXE/Makefile.am 2008-10-02 23:57:07.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/adm/make/DRAWEXE/Makefile.am 2008-10-02 23:58:25.000000000 +0200
-@@ -23,3 +23,4 @@
- ../TKG3d/libTKG3d.la \
- ../TKernel/libTKernel.la \
- $(STLPort_LIB) $(CSF_TclLibs_LIB) $(CSF_TclTkLibs_LIB) $(CSF_gdi32_LIB) $(CSF_advapi32_LIB) $(CSF_user32_LIB) $(CSF_SOCKETLibs_LIB) $(CSF_FPELibs_LIB) $(CSF_ThreadLibs_LIB) $(CSF_kernel32_LIB)
-+ DRAWEXE_LDFLAGS = -rpath /usr/lib/opencas
-diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKDCAF/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKDCAF/Makefile.am
---- OpenCASCADE6.3.0-old/ros/adm/make/TKDCAF/Makefile.am 2008-10-02 23:57:07.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/adm/make/TKDCAF/Makefile.am 2008-10-02 23:58:25.000000000 +0200
-@@ -26,7 +26,7 @@
- -I@top_srcdir@/drv/DrawDim -I@top_srcdir@/src/DrawDim
-
-
--lib_LTLIBRARIES=libTKDCAF.la
-+pkglib_LTLIBRARIES=libTKDCAF.la
-
- libTKDCAF_la_LIBADD = \
- ../TKernel/libTKernel.la \
-diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKDraw/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKDraw/Makefile.am
---- OpenCASCADE6.3.0-old/ros/adm/make/TKDraw/Makefile.am 2008-10-02 23:57:07.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/adm/make/TKDraw/Makefile.am 2008-10-02 23:58:25.000000000 +0200
-@@ -20,7 +20,7 @@
- -I@top_srcdir@/drv/DrawTrSurf -I@top_srcdir@/src/DrawTrSurf
-
-
--lib_LTLIBRARIES=libTKDraw.la
-+pkglib_LTLIBRARIES=libTKDraw.la
-
- libTKDraw_la_LIBADD = \
- ../TKernel/libTKernel.la \
-diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKTObjDRAW/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKTObjDRAW/Makefile.am
---- OpenCASCADE6.3.0-old/ros/adm/make/TKTObjDRAW/Makefile.am 2008-10-02 23:57:07.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/adm/make/TKTObjDRAW/Makefile.am 2008-10-02 23:58:25.000000000 +0200
-@@ -16,7 +16,7 @@
- -I@top_srcdir@/drv/TObjDRAW -I@top_srcdir@/src/TObjDRAW
-
-
--lib_LTLIBRARIES=libTKTObjDRAW.la
-+pkglib_LTLIBRARIES=libTKTObjDRAW.la
-
- libTKTObjDRAW_la_LIBADD = \
- ../TKTObj/libTKTObj.la \
-diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKTopTest/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKTopTest/Makefile.am
---- OpenCASCADE6.3.0-old/ros/adm/make/TKTopTest/Makefile.am 2008-10-02 23:57:07.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/adm/make/TKTopTest/Makefile.am 2008-10-02 23:58:25.000000000 +0200
-@@ -34,7 +34,7 @@
- -I@top_srcdir@/drv/BOPTest -I@top_srcdir@/src/BOPTest
-
-
--lib_LTLIBRARIES=libTKTopTest.la
-+pkglib_LTLIBRARIES=libTKTopTest.la
-
- libTKTopTest_la_LIBADD = \
- ../TKernel/libTKernel.la \
-diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKViewerTest/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKViewerTest/Makefile.am
---- OpenCASCADE6.3.0-old/ros/adm/make/TKViewerTest/Makefile.am 2008-10-02 23:57:07.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/adm/make/TKViewerTest/Makefile.am 2008-10-02 23:58:25.000000000 +0200
-@@ -18,7 +18,7 @@
- -I@top_srcdir@/drv/ViewerTest -I@top_srcdir@/src/ViewerTest
-
-
--lib_LTLIBRARIES=libTKViewerTest.la
-+pkglib_LTLIBRARIES=libTKViewerTest.la
-
- libTKViewerTest_la_LIBADD = \
- ../TKernel/libTKernel.la \
-diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKXDEDRAW/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKXDEDRAW/Makefile.am
---- OpenCASCADE6.3.0-old/ros/adm/make/TKXDEDRAW/Makefile.am 2008-10-02 23:57:08.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/adm/make/TKXDEDRAW/Makefile.am 2008-10-02 23:58:25.000000000 +0200
-@@ -16,7 +16,7 @@
- -I@top_srcdir@/drv/XDEDRAW -I@top_srcdir@/src/XDEDRAW
-
-
--lib_LTLIBRARIES=libTKXDEDRAW.la
-+pkglib_LTLIBRARIES=libTKXDEDRAW.la
-
- libTKXDEDRAW_la_LIBADD = \
- ../TKernel/libTKernel.la \
-diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKXSDRAW/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKXSDRAW/Makefile.am
---- OpenCASCADE6.3.0-old/ros/adm/make/TKXSDRAW/Makefile.am 2008-10-02 23:57:08.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/adm/make/TKXSDRAW/Makefile.am 2008-10-02 23:58:25.000000000 +0200
-@@ -24,7 +24,7 @@
- -I@top_srcdir@/drv/XSDRAWSTLVRML -I@top_srcdir@/src/XSDRAWSTLVRML
-
-
--lib_LTLIBRARIES=libTKXSDRAW.la
-+pkglib_LTLIBRARIES=libTKXSDRAW.la
-
- libTKXSDRAW_la_LIBADD = \
- ../TKernel/libTKernel.la \
+++ /dev/null
-diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/WOKLibs/Makefile.am OpenCASCADE6.3.0/ros/adm/make/WOKLibs/Makefile.am
---- OpenCASCADE6.3.0-old/ros/adm/make/WOKLibs/Makefile.am 2008-10-02 23:56:22.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/adm/make/WOKLibs/Makefile.am 2008-10-02 23:57:31.000000000 +0200
-@@ -9,7 +9,7 @@
- -I@top_srcdir@/src/WOKLibs
-
-
--lib_LTLIBRARIES= libwokcmd.la libwoktoolscmd.la libwokutilscmd.la libwoksteps.la libwokobjssteps.la libwokdfltsteps.la libwokdeliverysteps.la libwokorbixsteps.la libmscmd.la
-+pkglib_LTLIBRARIES= libwokcmd.la libwoktoolscmd.la libwokutilscmd.la libwoksteps.la libwokobjssteps.la libwokdfltsteps.la libwokdeliverysteps.la libwokorbixsteps.la libmscmd.la
- libwokcmd_la_SOURCES = @top_srcdir@/src/WOKLibs/wokcmd.cxx
- libwoktoolscmd_la_SOURCES = @top_srcdir@/src/WOKLibs/woktoolscmd.cxx
- libwokutilscmd_la_SOURCES = @top_srcdir@/src/WOKLibs/wokutilscmd.cxx
+++ /dev/null
-diff -uNr OpenCASCADE6.3.0-old/ros/inc/MFT_FileRecord.hxx OpenCASCADE6.3.0/ros/inc/MFT_FileRecord.hxx
---- OpenCASCADE6.3.0-old/ros/inc/MFT_FileRecord.hxx 2008-10-02 23:41:46.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/inc/MFT_FileRecord.hxx 2008-10-02 23:49:44.000000000 +0200
-@@ -19,6 +19,7 @@
- */
- #endif //WNT
-
-+#if 0
- #if defined ( __hpux ) || defined ( HPUX )
- #include <sys/mman.h>
- #define MAP_FAILED -1
-@@ -55,6 +56,7 @@
- #define MUNMAP(mmap_addr,mmap_size) \
- munmap((caddr_t) mmap_addr,(size_t) mmap_size)
- #endif // __alpha
-+#endif
-
- #ifndef MMAP
- // #error *** MMAP is not used on your system by MFT fonts ***
+++ /dev/null
-diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/Makefile.am OpenCASCADE6.3.0/ros/adm/make/Makefile.am
---- OpenCASCADE6.3.0-old/ros/adm/make/Makefile.am 2008-10-02 23:55:31.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/adm/make/Makefile.am 2008-10-02 23:56:45.000000000 +0200
-@@ -19,7 +19,7 @@
- ModelingAlgorithms_DIRS =
- endif
-
--Visualization_PKGS = TKService TKV2d TKV3d TKOpenGl TKMeshVS TKNIS
-+Visualization_PKGS = TKService TKV2d TKV3d TKOpenGl TKMeshVS TKNIS TKVRML
-
- if ENABLE_VIS
- Visualization_DIRS = $(Visualization_PKGS)
-@@ -35,7 +35,7 @@
- ApplicationFramework_DIRS =
- endif
-
--DataExchange_PKGS = TKVRML TKXCAF TKSTL TKXSBase TKXCAFSchema TKXmlXCAF TKBinXCAF TKSTEPBase TKIGES TKSTEPAttr TKSTEP209 TKXDEIGES TKSTEP TKXDESTEP XCAFPlugin XmlXCAFPlugin BinXCAFPlugin
-+DataExchange_PKGS = TKXCAF TKSTL TKXSBase TKXCAFSchema TKXmlXCAF TKBinXCAF TKSTEPBase TKIGES TKSTEPAttr TKSTEP209 TKXDEIGES TKSTEP TKXDESTEP XCAFPlugin XmlXCAFPlugin BinXCAFPlugin
-
- if ENABLE_DE
- DataExchange_DIRS = $(DataExchange_PKGS)
+++ /dev/null
-diff -uNr OpenCASCADE6.3.0-old/ros/inc/InterfaceGraphic_X11.hxx OpenCASCADE6.3.0/ros/inc/InterfaceGraphic_X11.hxx
---- OpenCASCADE6.3.0-old/ros/inc/InterfaceGraphic_X11.hxx 2008-10-02 23:49:55.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/inc/InterfaceGraphic_X11.hxx 2008-10-02 23:51:19.000000000 +0200
-@@ -26,6 +26,7 @@
- # include <X11/Xutil.h>
- # include <X11/Xatom.h>
-
-+#if 0
- # if defined (sun) || defined (SUNOS) || defined (__alpha) || defined (DECOSF1) || defined (sgi) || defined (IRIX) || defined (__hpux)|| defined (HPUX)
- # ifndef icon_width
- # include <X11/bitmaps/icon>
-@@ -46,6 +47,7 @@
- # endif
-
- # endif /* ULTRIX */
-+#endif
- # define WINDOW Window
- # ifndef EXPORT
- # define EXPORT
-diff -uNr OpenCASCADE6.3.0-old/ros/src/InterfaceGraphic/InterfaceGraphic_X11.hxx OpenCASCADE6.3.0/ros/src/InterfaceGraphic/InterfaceGraphic_X11.hxx
---- OpenCASCADE6.3.0-old/ros/src/InterfaceGraphic/InterfaceGraphic_X11.hxx 2008-10-02 23:50:04.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/InterfaceGraphic/InterfaceGraphic_X11.hxx 2008-10-02 23:51:19.000000000 +0200
-@@ -26,6 +26,7 @@
- # include <X11/Xutil.h>
- # include <X11/Xatom.h>
-
-+#if 0
- # if defined (sun) || defined (SUNOS) || defined (__alpha) || defined (DECOSF1) || defined (sgi) || defined (IRIX) || defined (__hpux)|| defined (HPUX)
- # ifndef icon_width
- # include <X11/bitmaps/icon>
-@@ -46,6 +47,7 @@
- # endif
-
- # endif /* ULTRIX */
-+#endif
- # define WINDOW Window
- # ifndef EXPORT
- # define EXPORT
+++ /dev/null
-diff -uNr old-OpenCASCADE6.3.0/ros/src/ExprIntrp/ExprIntrp.yacc OpenCASCADE6.3.0/ros/src/ExprIntrp/ExprIntrp.yacc
---- old-OpenCASCADE6.3.0/ros/src/ExprIntrp/ExprIntrp.yacc 2001-09-21 09:50:48.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/ExprIntrp/ExprIntrp.yacc 2008-10-10 23:36:36.000000000 +0200
-@@ -42,6 +42,10 @@
- extern void ExprIntrp_VariableIdentifier();
- extern void ExprIntrp_Productor();
- extern void ExprIntrp_EndOfEqual();
-+
-+int yylex(void);
-+void yyerror(char const *s);
-+
- %}
-
- %token SUMOP MINUSOP DIVIDEOP EXPOP MULTOP PARENTHESIS BRACKET ENDPARENTHESIS ENDBRACKET VALUE IDENTIFIER COMMA DIFFERENTIAL DERIVATE DERIVKEY ASSIGNOP DEASSIGNKEY EQUALOP RELSEPARATOR CONSTKEY SUMKEY PRODKEY
-diff -uNr old-OpenCASCADE6.3.0/ros/src/OpenGl/OpenGl_telem_util.h OpenCASCADE6.3.0/ros/src/OpenGl/OpenGl_telem_util.h
---- old-OpenCASCADE6.3.0/ros/src/OpenGl/OpenGl_telem_util.h 2008-06-27 17:50:06.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/OpenGl/OpenGl_telem_util.h 2008-10-10 23:39:33.000000000 +0200
-@@ -155,6 +155,9 @@
- Tfloat *xr, Tfloat *yr);
- extern TStatus TelUnProjectionRaster( Tint ws, Tint xr, Tint yr,
- Tfloat *x, Tfloat *y, Tfloat *z);
-+extern TStatus TelUnProjectionRasterWithRay( Tint ws, Tint xr, Tint yr,
-+ Tfloat *x, Tfloat *y, Tfloat *z,
-+ Tfloat *dx, Tfloat *dy, Tfloat *dz)
- extern Tint TelBackBufferRestored(void);
- extern void TelSetBackBufferRestored( Tint );
- extern void TelEnable( Tint );
-diff -uNr old-OpenCASCADE6.3.0/ros/src/OpenGl/OpenGl_tXfm.c OpenCASCADE6.3.0/ros/src/OpenGl/OpenGl_tXfm.c
---- old-OpenCASCADE6.3.0/ros/src/OpenGl/OpenGl_tXfm.c 2008-08-15 15:54:07.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/OpenGl/OpenGl_tXfm.c 2008-10-10 23:38:25.000000000 +0200
-@@ -64,6 +64,7 @@
- #include <X11/keysym.h>
-
- #include <GL/glx.h>
-+#include <GL/glu.h>
-
- #include <OpenGl_tgl_all.h>
- #include <OpenGl_tXfm.h>
-@@ -79,6 +80,7 @@
- #include <OpenGl_cmn_varargs.h>
- #include <OpenGl_tsm.h>
- #include <OpenGl_tgl_funcs.h>
-+#include <OpenGl_telem_attri.h>
- /*----------------------------------------------------------------------*/
- /*
- * Constantes
+++ /dev/null
-diff -uNr OpenCASCADE6.3.0-old/ros/configure.in OpenCASCADE6.3.0/ros/configure.in
---- OpenCASCADE6.3.0-old/ros/configure.in 2008-10-02 23:27:17.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/configure.in 2008-10-02 23:36:00.000000000 +0200
-@@ -127,8 +127,8 @@
- def_ios_ok,
- [AC_LANG([C++])
- AC_TRY_COMPILE([#include <stream.h>
--static const int input = (ios::in) | (ios::nocreate);
--static const int output= (ios::out);],
-+static const int input = (std::ios::in) | (std::ios::nocreate);
-+static const int output= (std::ios::out);],
- [return 0;],
- def_ios_ok=yes, def_ios_ok=no)
- ])
-@@ -141,7 +141,7 @@
- ostream_form_ok,
- [AC_LANG([C++])
- AC_TRY_COMPILE([#include <iostream.h>],
--[cout << cout.form("%9.3e", 3.14159627e-4) << endl;
-+[std::cout << std::cout.form("%9.3e", 3.14159627e-4) << std::endl;
- return 0;],
- ostream_form_ok=yes, ostream_form_ok=no)
- ])
-diff -uNr OpenCASCADE6.3.0-old/ros/inc/Standard_Stream.hxx OpenCASCADE6.3.0/ros/inc/Standard_Stream.hxx
---- OpenCASCADE6.3.0-old/ros/inc/Standard_Stream.hxx 2007-10-09 16:04:46.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/inc/Standard_Stream.hxx 2008-10-02 23:36:00.000000000 +0200
-@@ -24,26 +24,12 @@
- // Unix variant
- #ifndef WNT
-
--#ifdef HAVE_IOSTREAM
- #include <iostream>
- #define USE_STL_STREAM
--#elif defined (HAVE_IOSTREAM_H)
-- #include <iostream.h>
--#else
-- #error "check config.h file or compilation options: either HAVE_IOSTREAM or HAVE_IOSTREAM_H should be defined"
--#endif
-
--#ifdef HAVE_IOMANIP
- #include <iomanip>
--#elif defined (HAVE_IOMANIP_H)
-- #include <iomanip.h>
--#endif
-
--#ifdef HAVE_FSTREAM
- #include <fstream>
--#elif defined (HAVE_FSTREAM_H)
-- #include <fstream.h>
--#endif
-
- // Windows variant
- #else /* WNT */
-diff -uNr OpenCASCADE6.3.0-old/ros/inc/Standard_values.h OpenCASCADE6.3.0/ros/inc/Standard_values.h
---- OpenCASCADE6.3.0-old/ros/inc/Standard_values.h 2005-04-21 16:32:46.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/inc/Standard_values.h 2008-10-02 23:36:00.000000000 +0200
-@@ -23,17 +23,7 @@
- #endif
-
- #ifndef WNT
--#ifdef HAVE_CONFIG_H
--# include <config.h>
--#endif
--
--#ifdef HAVE_LIMITS
--# include <limits>
--#elif defined (HAVE_LIMITS_H)
- # include <limits.h>
--#else
--#error "check config.h file or compilation options: either HAVE_LIMITS or HAVE_LIMITS_H should be defined"
--#endif
- #endif
-
-
+++ /dev/null
-diff -uNr OpenCASCADE6.3.0-old/ros/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx OpenCASCADE6.3.0/ros/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx
---- OpenCASCADE6.3.0-old/ros/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx 2008-08-15 15:57:20.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx 2008-10-06 22:18:11.000000000 +0200
-@@ -98,21 +98,21 @@
- }
- else if(a[iloc][j] == 'c') {
- col=Standard_True;
-- if(a[iloc+1] == "blanc") Color = Draw_blanc;
-- else if (a[iloc+1] == "rouge") Color = Draw_rouge;
-- else if (a[iloc+1] == "vert") Color = Draw_vert;
-- else if (a[iloc+1] == "bleu") Color = Draw_bleu;
-- else if (a[iloc+1] == "cyan") Color = Draw_cyan;
-- else if (a[iloc+1] == "or") Color = Draw_or;
-- else if (a[iloc+1] == "magenta") Color = Draw_magenta;
-- else if (a[iloc+1] == "marron") Color = Draw_marron;
-- else if (a[iloc+1] == "orange") Color = Draw_orange;
-- else if (a[iloc+1] == "rose") Color = Draw_rose;
-- else if (a[iloc+1] == "saumon") Color = Draw_saumon;
-- else if (a[iloc+1] == "violet") Color = Draw_violet;
-- else if (a[iloc+1] == "jaune") Color = Draw_jaune;
-- else if (a[iloc+1] == "kaki") Color = Draw_kaki;
-- else if (a[iloc+1] == "corail") Color = Draw_corail;
-+ if(strcmp(a[iloc+1], "blanc") == 0) Color = Draw_blanc;
-+ else if(strcmp(a[iloc+1], "rouge") == 0) Color = Draw_rouge;
-+ else if(strcmp(a[iloc+1], "vert") == 0) Color = Draw_vert;
-+ else if(strcmp(a[iloc+1], "bleu") == 0) Color = Draw_bleu;
-+ else if(strcmp(a[iloc+1], "cyan") == 0) Color = Draw_cyan;
-+ else if(strcmp(a[iloc+1], "or") == 0) Color = Draw_or;
-+ else if(strcmp(a[iloc+1], "magenta") == 0) Color = Draw_magenta;
-+ else if(strcmp(a[iloc+1], "marron") == 0) Color = Draw_marron;
-+ else if(strcmp(a[iloc+1], "orange") == 0) Color = Draw_orange;
-+ else if(strcmp(a[iloc+1], "rose") == 0) Color = Draw_rose;
-+ else if(strcmp(a[iloc+1], "saumon") == 0) Color = Draw_saumon;
-+ else if(strcmp(a[iloc+1], "violet") == 0) Color = Draw_violet;
-+ else if(strcmp(a[iloc+1], "jaune") == 0) Color = Draw_jaune;
-+ else if(strcmp(a[iloc+1], "kaki") == 0) Color = Draw_kaki;
-+ else if(strcmp(a[iloc+1], "corail") == 0) Color = Draw_corail;
- decal++;dloc++;
- }
- }
+++ /dev/null
-diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKernel/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKernel/Makefile.am
---- OpenCASCADE6.3.0-old/ros/adm/make/TKernel/Makefile.am 2008-10-02 23:40:38.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/adm/make/TKernel/Makefile.am 2008-10-02 23:43:05.000000000 +0200
-@@ -55,7 +55,7 @@
- lib_LTLIBRARIES=libTKernel.la
-
- libTKernel_la_LIBADD = \
--$(STLPort_LIB) $(CSF_SOCKETLibs_LIB) $(CSF_FPELibs_LIB) $(CSF_ThreadLibs_LIB) $(CSF_advapi32_LIB) $(CSF_gdi32_LIB) $(CSF_user32_LIB) $(CSF_kernel32_LIB)
-+$(STLPort_LIB) $(CSF_SOCKETLibs_LIB) $(CSF_FPELibs_LIB) $(CSF_ThreadLibs_LIB) $(CSF_advapi32_LIB) $(CSF_gdi32_LIB) $(CSF_user32_LIB) $(CSF_kernel32_LIB) -ldl
-
- libTKernel_la_SOURCES = \
- @top_srcdir@/drv/Dico/Dico_DictionaryOfInteger_0.cxx \
+++ /dev/null
-diff -uNr OpenCASCADE6.3.0-old/ros/adm/UDLIST OpenCASCADE6.3.0/ros/adm/UDLIST
---- OpenCASCADE6.3.0-old/ros/adm/UDLIST 1970-01-01 01:00:00.000000000 +0100
-+++ OpenCASCADE6.3.0/ros/adm/UDLIST 2008-10-03 00:00:00.000000000 +0200
-@@ -0,0 +1,547 @@
-+n IncludeLibrary
-+n NCollection
-+p BSplCLib
-+p BSplSLib
-+p Bnd
-+p CSLib
-+p Convert
-+p Dico
-+p Dynamic
-+p ElCLib
-+p ElSLib
-+p Expr
-+p ExprIntrp
-+p FSD
-+p GeomAbs
-+p GraphDS
-+p GraphTools
-+p MMgt
-+p Materials
-+p Message
-+p OSD
-+p PLib
-+p Plugin
-+p Poly
-+p Precision
-+p Quantity
-+p Resource
-+p SortTools
-+p Standard
-+p StdFail
-+p Storage
-+p TColStd
-+p TColgp
-+p TCollection
-+p TShort
-+p TopLoc
-+p Units
-+p UnitsAPI
-+p gp
-+p math
-+r OS
-+t TKAdvTools
-+t TKMath
-+t TKernel
-+p Adaptor2d
-+p Adaptor3d
-+p AdvApp2Var
-+p AdvApprox
-+p AppCont
-+p AppDef
-+p AppParCurves
-+p Approx
-+p BRep
-+p BRepAdaptor
-+p BRepLProp
-+p BRepTools
-+p BndLib
-+p CPnts
-+p Extrema
-+p FEmTool
-+p GC
-+p GCE2d
-+p GCPnts
-+p GProp
-+p Geom
-+p Geom2d
-+p Geom2dAdaptor
-+p Geom2dConvert
-+p Geom2dLProp
-+p GeomAdaptor
-+p GeomConvert
-+p GeomLProp
-+p GeomLib
-+p GeomProjLib
-+p GeomTools
-+p Hermit
-+p IntAna
-+p IntAna2d
-+p LProp
-+p LProp3d
-+p ProjLib
-+p TColGeom
-+p TColGeom2d
-+p TopAbs
-+p TopExp
-+p TopTools
-+p TopoDS
-+p gce
-+t TKBRep
-+t TKG2d
-+t TKG3d
-+t TKGeomBase
-+n Triangle
-+p AppBlend
-+p ApproxInt
-+p BOP
-+p BOPTColStd
-+p BOPTools
-+p BRepAlgo
-+p BRepAlgoAPI
-+p BRepApprox
-+p BRepBlend
-+p BRepBndLib
-+p BRepBuilderAPI
-+p BRepCheck
-+p BRepClass
-+p BRepClass3d
-+p BRepExtrema
-+p BRepFeat
-+p BRepFill
-+p BRepFilletAPI
-+p BRepGProp
-+p BRepIntCurveSurface
-+p BRepLib
-+p BRepMAT2d
-+p BRepMesh
-+p BRepOffset
-+p BRepOffsetAPI
-+p BRepPrim
-+p BRepPrimAPI
-+p BRepProj
-+p BRepSweep
-+p BRepTopAdaptor
-+p BiTgte
-+p Bisector
-+p Blend
-+p BlendFunc
-+p BooleanOperations
-+p ChFi2d
-+p ChFi3d
-+p ChFiDS
-+p ChFiKPart
-+p Contap
-+p Draft
-+p FairCurve
-+p FilletSurf
-+p GccAna
-+p GccEnt
-+p GccGeo
-+p GccInt
-+p GccIter
-+p Geom2dAPI
-+p Geom2dGcc
-+p Geom2dHatch
-+p Geom2dInt
-+p GeomAPI
-+p GeomFill
-+p GeomInt
-+p GeomPlate
-+p HLRAlgo
-+p HLRBRep
-+p HLRTopoBRep
-+p Hatch
-+p HatchGen
-+p IntCurve
-+p IntCurveSurface
-+p IntCurvesFace
-+p IntImp
-+p IntImpParGen
-+p IntPatch
-+p IntPoly
-+p IntPolyh
-+p IntRes2d
-+p IntStart
-+p IntSurf
-+p IntTools
-+p IntWalk
-+p Intf
-+p Intrv
-+p Law
-+p LocOpe
-+p LocalAnalysis
-+p MAT
-+p MAT2d
-+p MeshAlgo
-+p MeshDS
-+p MeshShape
-+p NLPlate
-+p Plate
-+p Primitives
-+p ShapeAlgo
-+p ShapeAnalysis
-+p ShapeBuild
-+p ShapeConstruct
-+p ShapeCustom
-+p ShapeExtend
-+p ShapeFix
-+p ShapeProcess
-+p ShapeProcessAPI
-+p ShapeUpgrade
-+p Sweep
-+p TopBas
-+p TopClass
-+p TopCnx
-+p TopOpeBRep
-+p TopOpeBRepBuild
-+p TopOpeBRepDS
-+p TopOpeBRepTool
-+p TopTrans
-+p XBRepMesh
-+t TKBO
-+t TKBool
-+t TKFeat
-+t TKFillet
-+t TKGeomAlgo
-+t TKHLR
-+t TKMesh
-+t TKOffset
-+t TKPrim
-+t TKShHealing
-+t TKTopAlgo
-+t TKXMesh
-+n InterfaceGraphic
-+p AIS
-+p AIS2D
-+p AlienImage
-+p Aspect
-+p CGM
-+p DsgPrs
-+p GGraphic2d
-+p Graphic2d
-+p Graphic3d
-+p Image
-+p ImageUtility
-+p MFT
-+p MeshVS
-+p NIS
-+p OpenGl
-+p PS
-+p PlotMgt
-+p Prs2d
-+p Prs3d
-+p PrsMgr
-+p Select2D
-+p Select3D
-+p SelectBasics
-+p SelectMgr
-+p StdPrs
-+p StdSelect
-+p TColQuantity
-+p V2d
-+p V3d
-+p Viewer
-+p Visual3d
-+p Voxel
-+p WNT
-+p Xw
-+r FontMFT
-+r Textures
-+t TKMeshVS
-+t TKNIS
-+t TKOpenGl
-+t TKService
-+t TKV2d
-+t TKV3d
-+n BinTObjDrivers
-+n LDOM
-+n TObj
-+n XmlTObjDrivers
-+p AppStd
-+p AppStdL
-+p BinDrivers
-+p BinLDrivers
-+p BinMDF
-+p BinMDataStd
-+p BinMDocStd
-+p BinMFunction
-+p BinMNaming
-+p BinMPrsStd
-+p BinObjMgt
-+p BinTools
-+p CDF
-+p CDM
-+p DBC
-+p FWOSDriver
-+p MDF
-+p MDataStd
-+p MDocStd
-+p MFunction
-+p MNaming
-+p MPrsStd
-+p MgtBRep
-+p MgtGeom
-+p MgtGeom2d
-+p MgtPoly
-+p MgtTopLoc
-+p MgtTopoDS
-+p ObjMgt
-+p PBRep
-+p PCDM
-+p PCDMShape
-+p PColPGeom
-+p PColPGeom2d
-+p PColStd
-+p PColgp
-+p PCollection
-+p PDF
-+p PDataStd
-+p PDocStd
-+p PFunction
-+p PGeom
-+p PGeom2d
-+p PMMgt
-+p PNaming
-+p PPoly
-+p PPrsStd
-+p PShort
-+p PStandard
-+p PTColStd
-+p PTopLoc
-+p PTopoDS
-+p StdDrivers
-+p StdLDrivers
-+p TDF
-+p TDataStd
-+p TDocStd
-+p TFunction
-+p TNaming
-+p TPrsStd
-+p UTL
-+p XmlDrivers
-+p XmlLDrivers
-+p XmlMDF
-+p XmlMDataStd
-+p XmlMDocStd
-+p XmlMFunction
-+p XmlMNaming
-+p XmlMPrsStd
-+p XmlObjMgt
-+r StdResource
-+r XmlOcafResource
-+s ShapeSchema
-+s StdLSchema
-+s StdSchema
-+t FWOSPlugin
-+t PTKernel
-+t TKBin
-+t TKBinL
-+t TKBinTObj
-+t TKCAF
-+t TKCDF
-+t TKLCAF
-+t TKPCAF
-+t TKPLCAF
-+t TKPShape
-+t TKShapeSchema
-+t TKStdLSchema
-+t TKStdSchema
-+t TKTObj
-+t TKXml
-+t TKXmlL
-+t TKXmlTObj
-+x BinLPlugin
-+x BinPlugin
-+x BinTObjPlugin
-+x StdLPlugin
-+x StdPlugin
-+x XmlLPlugin
-+x XmlPlugin
-+x XmlTObjPlugin
-+n IGESFile
-+n StepFile
-+p APIHeaderSection
-+p BRepToIGES
-+p BRepToIGESBRep
-+p BinMXCAFDoc
-+p BinXCAFDrivers
-+p Geom2dToIGES
-+p GeomToIGES
-+p GeomToStep
-+p HeaderSection
-+p IFGraph
-+p IFSelect
-+p IGESAppli
-+p IGESBasic
-+p IGESCAFControl
-+p IGESControl
-+p IGESConvGeom
-+p IGESData
-+p IGESDefs
-+p IGESDimen
-+p IGESDraw
-+p IGESGeom
-+p IGESGraph
-+p IGESSelect
-+p IGESSolid
-+p IGESToBRep
-+p Interface
-+p LibCtl
-+p MXCAFDoc
-+p MoniTool
-+p PXCAFDoc
-+p RWHeaderSection
-+p RWStepAP203
-+p RWStepAP214
-+p RWStepBasic
-+p RWStepDimTol
-+p RWStepElement
-+p RWStepFEA
-+p RWStepGeom
-+p RWStepRepr
-+p RWStepShape
-+p RWStepVisual
-+p RWStl
-+p STEPCAFControl
-+p STEPConstruct
-+p STEPControl
-+p STEPEdit
-+p STEPSelections
-+p StepAP203
-+p StepAP209
-+p StepAP214
-+p StepBasic
-+p StepData
-+p StepDimTol
-+p StepElement
-+p StepFEA
-+p StepGeom
-+p StepRepr
-+p StepSelect
-+p StepShape
-+p StepToGeom
-+p StepToTopoDS
-+p StepVisual
-+p StlAPI
-+p StlMesh
-+p StlTransfer
-+p TopoDSToStep
-+p Transfer
-+p TransferBRep
-+p UnitsMethods
-+p Vrml
-+p VrmlAPI
-+p VrmlConverter
-+p VrmlData
-+p XCAFApp
-+p XCAFDoc
-+p XCAFDrivers
-+p XCAFPrs
-+p XSAlgo
-+p XSControl
-+p XmlMXCAFDoc
-+p XmlXCAFDrivers
-+r SHMessage
-+r XSMessage
-+r XSTEPResource
-+s XCAFSchema
-+t TKBinXCAF
-+t TKIGES
-+t TKSTEP
-+t TKSTEP209
-+t TKSTEPAttr
-+t TKSTEPBase
-+t TKSTL
-+t TKVRML
-+t TKXCAF
-+t TKXCAFSchema
-+t TKXDEIGES
-+t TKXDESTEP
-+t TKXSBase
-+t TKXmlXCAF
-+x BinXCAFPlugin
-+x XCAFPlugin
-+x XmlXCAFPlugin
-+p BOPTest
-+p BRepTest
-+p DBRep
-+p DDF
-+p DDataStd
-+p DDocStd
-+p DNaming
-+p DPrsStd
-+p Draw
-+p DrawDim
-+p DrawFairCurve
-+p DrawTrSurf
-+p GeometryTest
-+p GeomliteTest
-+p HLRTest
-+p MeshTest
-+p SWDRAW
-+p TObjDRAW
-+p TestTopOpe
-+p TestTopOpeDraw
-+p TestTopOpeTools
-+p Viewer2dTest
-+p ViewerTest
-+p XDEDRAW
-+p XSDRAW
-+p XSDRAWIGES
-+p XSDRAWSTEP
-+p XSDRAWSTLVRML
-+r DrawResources
-+t TKDCAF
-+t TKDraw
-+t TKTObjDRAW
-+t TKTopTest
-+t TKViewerTest
-+t TKXDEDRAW
-+t TKXSDRAW
-+x DRAWEXE
-+n CDLFront
-+n CPPClient
-+n CPPExt
-+n CPPIntExt
-+n CSFDBSchema
-+n IDLFront
-+n TCPPExt
-+p CPPJini
-+p EDL
-+p MS
-+p MSAPI
-+p WOKAPI
-+p WOKBuilder
-+p WOKDFLT
-+p WOKDeliv
-+p WOKMake
-+p WOKNT
-+p WOKOBJS
-+p WOKOrbix
-+p WOKStep
-+p WOKTCL
-+p WOKTclTools
-+p WOKTclUtils
-+p WOKTools
-+p WOKUnix
-+p WOKUtils
-+p WOKernel
-+r WOKBuilderDef
-+r WOKEntityDef
-+r WOKStepsDef
-+r WOKTclLib
-+r WOKsite
-+t TKCDLFront
-+t TKCPPClient
-+t TKCPPExt
-+t TKCPPIntExt
-+t TKCPPJini
-+t TKCSFDBSchema
-+t TKIDLFront
-+t TKTCPPExt
-+t TKWOK
-+t TKWOKTcl
-+x WOKLibs
-+x WOKSH
-+p jcas
-+t TKjcas
+++ /dev/null
-diff -uNr OpenCASCADE6.3.0-old/ros/Makefile.am OpenCASCADE6.3.0/ros/Makefile.am
---- OpenCASCADE6.3.0-old/ros/Makefile.am 2008-10-02 23:57:41.000000000 +0200
-+++ OpenCASCADE6.3.0/ros/Makefile.am 2008-10-02 23:59:13.000000000 +0200
-@@ -82,8 +82,10 @@
- WOK_PKGS = WOKBuilderDef WOKEntityDef WOKStepsDef WOKTclLib WOKsite
- if ENABLE_WOK
- WOK_DIRS = $(WOK_PKGS)
-+ WOK_EXTRA_FILES = CPPClient/CPPClient_General.edl CPPClient/CPPClient_Template.edl CPPExt/CPPExt_Standard.edl CPPExt/CPPExt_TemplateCSFDB.edl CPPExt/CPPExt_Template.edl CPPExt/CPPExt_TemplateOBJS.edl CPPExt/CPPExt_TemplateOBJY.edl CPPJini/CPPJini_General.edl CPPJini/CPPJini_Template.edl CSFDBSchema/CSFDBSchema_Template.edl CPPIntExt/Engine_Template.edl WOKTclTools/ENV.edl WOKOrbix/*.edl WOKOrbix/*.tcl CPPIntExt/Interface_Template.edl WOKOBJS/*.edl TCPPExt/TCPPExt_MethodTemplate.edl WOKUtils/EDL.edl WOKDeliv/WOKDeliv_FRONTALSCRIPT.edl WOKDeliv/WOKDeliv_LDSCRIPT.edl WOKDeliv/WOKDeliv_DelivExecSource.tcl WOKStep/*.tcl
- else
- WOK_DIRS =
-+ WOK_EXTRA_FILES =
- endif
-
-
-@@ -215,9 +217,21 @@
- if [ "$$pd" != "$$sd" ]; then \
- inst_dirs="$(WOK_DIRS)"; \
- if test "x$(WOK_DIRS)" != "x"; then \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/wok/lib; \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/wok/site; \
- for d in $$inst_dirs; do \
-- $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
-- cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
-+ if test "$$d" = WOKsite; then \
-+ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d/* $(DESTDIR)$(prefix)/wok/site; \
-+ else \
-+ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d/* $(DESTDIR)$(prefix)/wok/lib; \
-+ fi; \
-+ done; \
-+ fi; \
-+ inst_files="$(WOK_EXTRA_FILES)"; \
-+ if test "x$(WOK_EXTRA_FILES)" != "x"; then \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/wok/lib; \
-+ for f in $$inst_files; do \
-+ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$f $(DESTDIR)$(prefix)/wok/lib; \
- done; \
- fi; \
- fi
+++ /dev/null
-Fix TKLCAF library (= instead of == in if-condition)
-
-Submitted upstream: http://www.opencascade.org/org/forum/thread_18622/
-
-From: Michael Wild <themiwi@users.sourceforge.net>
-
-Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
----
- ros/src/TDataStd/TDataStd_Constraint.cxx | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/ros/src/TDataStd/TDataStd_Constraint.cxx b/ros/src/TDataStd/TDataStd_Constraint.cxx
-index c164aea..4966d39 100644
---- a/ros/src/TDataStd/TDataStd_Constraint.cxx
-+++ b/ros/src/TDataStd/TDataStd_Constraint.cxx
-@@ -213,7 +213,7 @@ const Handle(TNaming_NamedShape)& TDataStd_Constraint::GetPlane() const
- void TDataStd_Constraint::SetType (const TDataStd_ConstraintEnum CTR)
- {
- // OCC2932 correction
-- if(myType = CTR) return;
-+ if(myType == CTR) return;
-
- Backup();
- myType = CTR;
+++ /dev/null
-Fix WOKStep_Extract::Execute
-
-This step did put garbage into generated file, because a pointer was used
-after it has been freed.
-Closes: #501352
-
-diff --git a/ros/src/CPPExt/CPPExt.cxx b/ros/src/CPPExt/CPPExt.cxx
-index 4d96c47..a651607 100644
---- a/ros/src/CPPExt/CPPExt.cxx
-+++ b/ros/src/CPPExt/CPPExt.cxx
-@@ -397,7 +397,8 @@ void CPP_BuildMethod(const Handle(MS_MetaSchema)& aMeta,
- const Handle(TCollection_HAsciiString)& aTypeName=retType->TypeName();
- pTypeName=(char *)aTypeName->ToCString();
- //
-- pTypeRet=(char *)CPP_BuildType(aMeta,aTypeName)->ToCString();
-+ const Handle(TCollection_HAsciiString)& aTypeRet=CPP_BuildType(aMeta,aTypeName);
-+ pTypeRet=(char *)aTypeRet->ToCString();
- //
- //modified by NIZNHY-PKV Mon May 5 15:10:12 2008f
- if (m->IsPtrReturn()) {
-diff --git a/ros/src/WOKUnix/WOKUnix_Process.cxx b/ros/src/WOKUnix/WOKUnix_Process.cxx
-index dd6caf6..fa649c7 100644
---- a/ros/src/WOKUnix/WOKUnix_Process.cxx
-+++ b/ros/src/WOKUnix/WOKUnix_Process.cxx
-@@ -373,6 +373,6 @@ void WOKUnix_Process::Kill()
- void WOKUnix_Process::Destroy()
- {
- Kill();
-- delete myargv;
-+ delete [] myargv;
- }
- #endif
projects / packages / OpenCASCADE.git / commitdiff