diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-06 09:54:55 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-06 09:54:55 -0300 |
commit | 60f323f25d2c0addbce5832ffbda060b0410d14f (patch) | |
tree | 644b9212e37f1a63dcef3977159033dee2f04392 /staging/libreoffice/buildfix_boost.diff | |
parent | 9e2eedaa4921b8d57c364fb3e2a8c9e2e96b8e69 (diff) | |
parent | 817e58c278cb8ebee7743205877d0f67c431fcec (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/inetutils/PKGBUILD
extra/audacious/PKGBUILD
extra/cvs/PKGBUILD
kde-unstable/libkipi/PKGBUILD
libre/linux-libre/PKGBUILD
libre/mplayer-vaapi-libre/PKGBUILD
libre/pacman/PKGBUILD
libre/psutils-libre/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
staging/kdebase-runtime/PKGBUILD
Diffstat (limited to 'staging/libreoffice/buildfix_boost.diff')
-rw-r--r-- | staging/libreoffice/buildfix_boost.diff | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/staging/libreoffice/buildfix_boost.diff b/staging/libreoffice/buildfix_boost.diff new file mode 100644 index 000000000..d8608d0d4 --- /dev/null +++ b/staging/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 + |