[Libreoffice-commits] .: cppunit/avoid-synthetised-destructor.patch cppunit/makefile.mk

[David Tardon]

 cppunit/avoid-synthetised-destructor.patch |   29 +++++++++++++++++++++++++++++
 cppunit/makefile.mk                        |    2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

New commits:
commit b759f950b20d577e408be4f05eaa3e9f3c0db2e7
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jan 25 17:56:51 2011 +0100

    rhbz#641350 don't segfault when test is built with debug. STL

diff --git a/cppunit/avoid-synthetised-destructor.patch b/cppunit/avoid-synthetised-destructor.patch
new file mode 100644
index 0000000..9ef7476
--- /dev/null
+++ b/cppunit/avoid-synthetised-destructor.patch
@@ -0,0 +1,29 @@
+rhbz#641350 impl. destructor of CppUnit::Message causes segfault when test
+is built with debug. STL
+
+diff -up cppunit-1.12.1/include/cppunit/Message.h.dt cppunit-1.12.1/include/cppunit/Message.h
+--- cppunit-1.12.1/include/cppunit/Message.h.dt	2010-10-08 14:02:26.514477964 +0200
++++ cppunit-1.12.1/include/cppunit/Message.h	2010-10-08 14:02:15.411948098 +0200
+@@ -57,6 +57,8 @@ public:
+            const std::string &detail2,
+            const std::string &detail3 );
+ 
++  ~Message();
++
+   Message &operator =( const Message &other );
+ 
+   /*! \brief Returns the short description.
+diff -up cppunit-1.12.1/src/cppunit/Message.cpp.dt cppunit-1.12.1/src/cppunit/Message.cpp
+--- cppunit-1.12.1/src/cppunit/Message.cpp.dt	2010-10-08 14:02:39.421768852 +0200
++++ cppunit-1.12.1/src/cppunit/Message.cpp	2010-10-08 14:02:54.066829633 +0200
+@@ -47,6 +47,10 @@ Message::Message( const std::string &sho
+   addDetail( detail1, detail2, detail3 );
+ }
+ 
++Message::~Message()
++{
++}
++
+ Message &
+ Message::operator =( const Message &other )
+ {
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 26e6845..448d905 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -34,7 +34,7 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19
     # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/
     #  cppunit-1.12.1.tar.gz/download>
 
-PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch
+PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch
     # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail&
     #  aid=2912590&group_id=11795&atid=311795>
     # warnings.patch: see <https://sourceforge.net/tracker/?func=detail&