From 3695b5d62c2aef6e82abc95d775a2ebd89bce081 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Sun, 5 Jun 2011 22:48:57 +0000
Subject: Sun Jun  5 22:48:57 UTC 2011

---
 extra/libreoffice/buildfix_boost.diff | 40 +++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 extra/libreoffice/buildfix_boost.diff

(limited to 'extra/libreoffice/buildfix_boost.diff')

diff --git a/extra/libreoffice/buildfix_boost.diff b/extra/libreoffice/buildfix_boost.diff
new file mode 100644
index 000000000..d8608d0d4
--- /dev/null
+++ b/extra/libreoffice/buildfix_boost.diff
@@ -0,0 +1,40 @@
+From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001
+From: Caolán McNamara <caolanm@redhat.com>
+Date: Tue, 05 Apr 2011 14:07:02 +0000
+Subject: silence some more of that annoying gcc#47679
+
+---
+diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch
+index 1c804aa..9b33a5f 100644
+--- a/boost/boost.gcc47679.patch
++++ b/boost/boost.gcc47679.patch
+@@ -36,3 +36,26 @@
+          template <int MaxDigits>
+          inline bool allow_more_digits(std::size_t i)
+          {
++--- misc/boost_1_44_0/boost/optional/optional.hpp	2011-04-05 13:19:01.223587256 +0100
+++++ misc/build/boost_1_44_0/boost/optional/optional.hpp	2011-04-05 13:19:01.223587256 +0100
++@@ -31,6 +31,8 @@
++ 
++ #include "boost/optional/optional_fwd.hpp"
++ 
+++#include <string.h>
+++
++ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
++ // VC6.0 has the following bug:
++ //   When a templated assignment operator exist, an implicit conversion
++@@ -114,6 +116,11 @@
++ 
++   public:
++ 
+++    aligned_storage()
+++    {
+++      memset(&dummy_, 0, sizeof(dummy_));
+++    }
+++
++     void const* address() const { return &dummy_.data[0]; }
++     void      * address()       { return &dummy_.data[0]; }
++ } ;
+--
+cgit v0.8.3-6-g21f6
+
-- 
cgit v1.2.3-54-g00ecf