[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc2-1-18-g87cb1a6
The following commit has been merged in the debian-experimental-3.5 branch:
commit b6be572cb7d47e6a54642e3129bd61d58a0ba65c
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jan 30 13:44:16 2012 +0100
work around link error on armel by specifying explicit SwTblBoxFormula destructor
diff --git a/changelog b/changelog
index affea0c..c080e7b 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,9 @@
libreoffice (1:3.5.0~rc2-3) UNRELEASED; urgency=low
+ * debian/patches/SwTblBoxFormula-destructor.diff: work around link error
+ on armel by specifying explicit SwTblBoxFormula desctructor, thanks
+ Michael Meeks
+
* debian/rules:
- give gb_FULLDEPS= to actual make check call, not debian/rules
check
@@ -7,7 +11,7 @@ libreoffice (1:3.5.0~rc2-3) UNRELEASED; urgency=low
First step into making libooxlo.so not too big for it (though not
sufficient)
- -- Rene Engelhard <rene@debian.org> Sun, 29 Jan 2012 17:00:47 +0100
+ -- Rene Engelhard <rene@debian.org> Mon, 30 Jan 2012 13:33:20 +0100
libreoffice (1:3.5.0~rc2-2) experimental; urgency=low
diff --git a/patches/SwTblBoxFormula-destructor.diff b/patches/SwTblBoxFormula-destructor.diff
new file mode 100644
index 0000000..b094f27
--- /dev/null
+++ b/patches/SwTblBoxFormula-destructor.diff
@@ -0,0 +1,10 @@
+--- a/sw/inc/cellatr.hxx-old 2012-01-30 13:30:56.000000000 +0100
++++ b)sw/inc/cellatr.hxx 2012-01-30 13:31:52.000000000 +0100
+@@ -64,6 +64,7 @@
+
+ public:
+ SwTblBoxFormula( const String& rFormula );
++ ~SwTblBoxFormula() {};
+
+ // "pure virtual methods" of SfxPoolItem
+ virtual int operator==( const SfxPoolItem& ) const;
diff --git a/patches/series b/patches/series
index 9c885a6..7e33b6b 100644
--- a/patches/series
+++ b/patches/series
@@ -27,3 +27,4 @@ revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff
propagate-gb_FULLDEPS.diff
disable-sc-unoapi-subsequentcheck-for-now.diff
fix-nsplugin-build-and-install.diff
+SwTblBoxFormula-destructor.diff
--
LibreOffice packaging repository
Reply to: