Author: xnox Date: 2013-07-18 12:35:42 +0000 (Thu, 18 Jul 2013) New Revision: 14178
Added: trunk/packages/sofa-framework/trunk/debian/patches/fix-undefined-symbol.patch trunk/packages/sofa-framework/trunk/debian/patches/sofa-framework-1.0~beta4.libpng15.patch Modified: trunk/packages/sofa-framework/trunk/debian/changelog trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff trunk/packages/sofa-framework/trunk/debian/patches/series Log: * Team upload. * Drop "-mt" suffix from boost lib, in the 50_all_changes.diff (Closes: #701288) * Add missing include which causes undefined symbols (Closes: #560104) (Closes: #701360) Modified: trunk/packages/sofa-framework/trunk/debian/changelog =================================================================== --- trunk/packages/sofa-framework/trunk/debian/changelog 2013-07-18 09:08:32 UTC (rev 14177) +++ trunk/packages/sofa-framework/trunk/debian/changelog 2013-07-18 12:35:42 UTC (rev 14178) @@ -1,3 +1,11 @@ +sofa-framework (1.0~beta4-8) unstable; urgency=low + + * Team upload. + * Drop "-mt" suffix from boost lib, in the 50_all_changes.diff (Closes: #701288) + * Add missing include which causes undefined symbols (Closes: #560104) (Closes: #701360) + + -- Dmitrijs Ledkovs <[email protected]> Wed, 10 Jul 2013 00:56:09 +0100 + sofa-framework (1.0~beta4-7.1) unstable; urgency=low * Non-maintainer upload. Modified: trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff =================================================================== --- trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff 2013-07-18 09:08:32 UTC (rev 14177) +++ trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff 2013-07-18 12:35:42 UTC (rev 14178) @@ -6,10 +6,8 @@ ## DP: Use OGRE >= 1.6.0 if switched on. @DPATCH@ -Index: sofa-framework-1.0~beta4/Sofa.pro -=================================================================== ---- sofa-framework-1.0~beta4.orig/Sofa.pro 2009-03-20 18:41:25.000000000 -0400 -+++ sofa-framework-1.0~beta4/Sofa.pro 2010-03-16 20:02:03.000000000 -0400 +--- a/Sofa.pro ++++ b/Sofa.pro @@ -3,13 +3,13 @@ include($${SOFA_DIR}/sofa.cfg) @@ -45,10 +43,8 @@ } # PML -Index: sofa-framework-1.0~beta4/framework/sofa/helper/gl/DrawManager.cpp -=================================================================== ---- sofa-framework-1.0~beta4.orig/framework/sofa/helper/gl/DrawManager.cpp 2009-03-20 18:40:53.000000000 -0400 -+++ sofa-framework-1.0~beta4/framework/sofa/helper/gl/DrawManager.cpp 2010-03-16 20:02:03.000000000 -0400 +--- a/framework/sofa/helper/gl/DrawManager.cpp ++++ b/framework/sofa/helper/gl/DrawManager.cpp @@ -517,7 +517,7 @@ node->scale(radius/50.0,radius/50.0,radius/50.0); node->translate(p[0],p[1],p[2]); @@ -58,10 +54,8 @@ break; #endif } -Index: sofa-framework-1.0~beta4/sofa-default.cfg -=================================================================== ---- sofa-framework-1.0~beta4.orig/sofa-default.cfg 2009-03-20 18:41:25.000000000 -0400 -+++ sofa-framework-1.0~beta4/sofa-default.cfg 2010-03-16 20:02:03.000000000 -0400 +--- a/sofa-default.cfg ++++ b/sofa-default.cfg @@ -47,7 +47,7 @@ # DEFINES += SOFA_HAVE_FLOWVR @@ -93,20 +87,17 @@ # Uncomment if you want to have the possibility to trave the visitor execution DEFINES += DUMP_VISITOR_INFO -@@ -110,6 +110,9 @@ +@@ -110,6 +110,8 @@ # Choose if you want to compile the debug or release version #CONFIG = debug CONFIG = release -+QMAKE_CXXFLAGS_RELEASE += -O1 +QMAKE_CXXFLAGS += -W +QMAKE_CFLAGS += -W # Uncomment if you want debug symbols even in release build # QMAKE_CXXFLAGS += -g -Index: sofa-framework-1.0~beta4/sofa.cfg -=================================================================== ---- sofa-framework-1.0~beta4.orig/sofa.cfg 2009-03-20 18:41:25.000000000 -0400 -+++ sofa-framework-1.0~beta4/sofa.cfg 2010-03-16 20:02:03.000000000 -0400 +--- a/sofa.cfg ++++ b/sofa.cfg @@ -19,7 +19,8 @@ # Auto-detect Qt 4.x @@ -143,15 +134,6 @@ DEPENDPATH *= \ $$SOFA_DIR/framework \ -@@ -241,7 +244,7 @@ - # BOOST - ######################################################################## - contains(DEFINES,SOFA_HAVE_BOOST){ -- SOFA_EXT_LIBS *= -lboost_thread -+ SOFA_EXT_LIBS *= -lboost_thread-mt - }else{ - # use miniBoost headers included in extlibs - INCLUDEPATH *= $$SOFA_DIR/extlibs/miniBoost @@ -251,9 +254,9 @@ # CSPARSE ######################################################################## @@ -240,10 +222,8 @@ SOFA_GUI_LIBS += $${SOFA_GUI_EXT_LIBS} -Index: sofa-framework-1.0~beta4/applications/sofa/gui/qt/GraphVisitor.cpp -=================================================================== ---- sofa-framework-1.0~beta4.orig/applications/sofa/gui/qt/GraphVisitor.cpp 2009-03-20 18:40:52.000000000 -0400 -+++ sofa-framework-1.0~beta4/applications/sofa/gui/qt/GraphVisitor.cpp 2010-03-16 20:02:03.000000000 -0400 +--- a/applications/sofa/gui/qt/GraphVisitor.cpp ++++ b/applications/sofa/gui/qt/GraphVisitor.cpp @@ -28,10 +28,7 @@ #include <sstream> @@ -256,10 +236,8 @@ #include <algorithm> -Index: sofa-framework-1.0~beta4/applications/sofa/gui/qt/GraphVisitor.h -=================================================================== ---- sofa-framework-1.0~beta4.orig/applications/sofa/gui/qt/GraphVisitor.h 2010-03-16 20:02:24.000000000 -0400 -+++ sofa-framework-1.0~beta4/applications/sofa/gui/qt/GraphVisitor.h 2010-03-16 20:02:31.000000000 -0400 +--- a/applications/sofa/gui/qt/GraphVisitor.h ++++ b/applications/sofa/gui/qt/GraphVisitor.h @@ -43,7 +43,6 @@ //Tinyxml library Added: trunk/packages/sofa-framework/trunk/debian/patches/fix-undefined-symbol.patch =================================================================== --- trunk/packages/sofa-framework/trunk/debian/patches/fix-undefined-symbol.patch (rev 0) +++ trunk/packages/sofa-framework/trunk/debian/patches/fix-undefined-symbol.patch 2013-07-18 12:35:42 UTC (rev 14178) @@ -0,0 +1,15 @@ +Description: missing include of template function definitons +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701360 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560104 +Author: Dmitrijs Ledkovs <[email protected]> + +--- sofa-framework-1.0~beta4.orig/modules/sofa/simulation/tree/GNode.cpp ++++ sofa-framework-1.0~beta4/modules/sofa/simulation/tree/GNode.cpp +@@ -26,6 +26,7 @@ + #include <sofa/simulation/common/Visitor.h> + #include <sofa/simulation/common/DesactivatedNodeVisitor.h> + #include <sofa/simulation/tree/MutationListener.h> ++#include <sofa/helper/Factory.inl> + #include <iostream> + + using std::cerr; Modified: trunk/packages/sofa-framework/trunk/debian/patches/series =================================================================== --- trunk/packages/sofa-framework/trunk/debian/patches/series 2013-07-18 09:08:32 UTC (rev 14177) +++ trunk/packages/sofa-framework/trunk/debian/patches/series 2013-07-18 12:35:42 UTC (rev 14178) @@ -7,4 +7,4 @@ qwt5-qt4.patch sofa-framework-gcc-4.7.diff sofa-framework-1.0~beta4.libpng15.patch - +fix-undefined-symbol.patch Added: trunk/packages/sofa-framework/trunk/debian/patches/sofa-framework-1.0~beta4.libpng15.patch =================================================================== --- trunk/packages/sofa-framework/trunk/debian/patches/sofa-framework-1.0~beta4.libpng15.patch (rev 0) +++ trunk/packages/sofa-framework/trunk/debian/patches/sofa-framework-1.0~beta4.libpng15.patch 2013-07-18 12:35:42 UTC (rev 14178) @@ -0,0 +1,21 @@ +Description: fixes FTBFS against libpng1.5 +Author: Nobuhiro Iwamatsu <[email protected]> +Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=650568#12 +Bug-Debian: http://bugs.debian.org/650568 +Acked-by: Anton Gladky <[email protected]> +Last-Update: 2013-05-20 + +--- a/framework/sofa/helper/io/ImagePNG.cpp ++++ b/framework/sofa/helper/io/ImagePNG.cpp +@@ -129,7 +129,11 @@ + + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) + { ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ png_set_expand_gray_1_2_4_to_8(PNG_reader); ++#else + png_set_gray_1_2_4_to_8(PNG_reader); ++#endif + changed = true; + } + _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
