[libreoffice] 82/152: fix mysqlc ftbfs

Rene Engelhard rene at moszumanska.debian.org
Thu Jul 27 19:17:01 UTC 2017


This is an automated email from the git hooks/post-receive script.

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit aa6e3cb897f28349de4320ea41f63a40b8e9025b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jun 4 23:09:55 2016 +0200

    fix mysqlc ftbfs
---
 patches/mysqlc-boost-fallthrough.diff | 21 +++++++++++++++++++++
 patches/series                        |  1 +
 2 files changed, 22 insertions(+)

diff --git a/patches/mysqlc-boost-fallthrough.diff b/patches/mysqlc-boost-fallthrough.diff
new file mode 100644
index 0000000..74807de
--- /dev/null
+++ b/patches/mysqlc-boost-fallthrough.diff
@@ -0,0 +1,21 @@
+diff -ru a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx
+--- a/mysqlc/source/mysqlc_preparedstatement.cxx	2016-05-26 18:55:21.000000000 +0200
++++ b/mysqlc/source/mysqlc_preparedstatement.cxx	2016-06-04 15:49:03.320192122 +0200
+@@ -564,7 +564,7 @@
+             setDouble( _parameterIndex, nValue );
+             break;
+         }
+-        BOOST_FALLTHROUGH;
++        //BOOST_FALLTHROUGH;
+     }
+ 
+     case DataType::CHAR:
+@@ -591,7 +591,7 @@
+             setFloat(_parameterIndex,nValue);
+             break;
+         }
+-        BOOST_FALLTHROUGH;
++        //BOOST_FALLTHROUGH;
+     }
+ 
+     case DataType::DOUBLE:
diff --git a/patches/series b/patches/series
index 42a819c..5e50d26 100644
--- a/patches/series
+++ b/patches/series
@@ -28,3 +28,4 @@ gcj-no-bitness-check.diff
 rsc-no-error-about-unknown-switch.diff
 lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
 integraltrans.diff
+mysqlc-boost-fallthrough.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git



More information about the Pkg-openoffice-commits mailing list