From: Tomasz Pala Date: Sat, 5 Jun 2010 22:04:44 +0000 (+0000) Subject: - fixed after OpenCASCADE6.3.0-lib-release.patch removal X-Git-Tag: auto/th/OpenCASCADE-6_3_0-41~29 X-Git-Url: http://git.pld-linux.org/?p=packages%2FOpenCASCADE.git;a=commitdiff_plain;h=c2bef94e8b5644df82b8bdb0ae3a29e780800589 - fixed after OpenCASCADE6.3.0-lib-release.patch removal Changed files: OpenCASCADE6.3.0-dep-libs.patch -> 1.2 OpenCASCADE6.3.0-tkernel-ld.patch -> 1.2 --- diff --git a/OpenCASCADE6.3.0-dep-libs.patch b/OpenCASCADE6.3.0-dep-libs.patch index dbd40d5..d89bb34 100644 --- a/OpenCASCADE6.3.0-dep-libs.patch +++ b/OpenCASCADE6.3.0-dep-libs.patch @@ -1,15 +1,15 @@ 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 @@ +@@ -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_LDFLAGS = -release 6.3.0 ++$(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 @@ -19,9 +19,9 @@ diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKNIS/Makefile.am OpenCASCADE6.3.0/r ../TKV3d/libTKV3d.la \ -$(STLPort_LIB) +$(STLPort_LIB) $(CSF_OpenGlLibs_LIB) - libTKNIS_la_LDFLAGS = -release 6.3.0 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 @@ -31,18 +31,18 @@ diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKService/Makefile.am OpenCASCADE6.3 ../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_LDFLAGS = -release 6.3.0 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 @@ +@@ -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_LDFLAGS = -release 6.3.0 libTKViewerTest_la_SOURCES = \ + @top_srcdir@/drv/Viewer2dTest/Viewer2dTest_DataMapIteratorOfDataMapOfText_0.cxx \ diff --git a/OpenCASCADE6.3.0-tkernel-ld.patch b/OpenCASCADE6.3.0-tkernel-ld.patch index 67338c0..dba771e 100644 --- a/OpenCASCADE6.3.0-tkernel-ld.patch +++ b/OpenCASCADE6.3.0-tkernel-ld.patch @@ -7,6 +7,6 @@ diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKernel/Makefile.am OpenCASCADE6.3.0 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_LDFLAGS = -release 6.3.0 libTKernel_la_SOURCES = \ + @top_srcdir@/drv/Dico/Dico_DictionaryOfInteger_0.cxx \