[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 4 commits - external/boost sd/CppunitTest_sd_misc_tests.mk sw/source
Michael Stahl
mstahl at redhat.com
Tue Dec 15 11:25:07 PST 2015
external/boost/boost.wdeprecated-auto_ptr.patch.0 | 46 ++++++++++++++++++++++
sd/CppunitTest_sd_misc_tests.mk | 30 --------------
sw/source/filter/ww8/docxexport.cxx | 10 ++--
3 files changed, 51 insertions(+), 35 deletions(-)
New commits:
commit c3d24d6416556ea6d583f08ba6aef916ba972096
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Dec 15 17:50:06 2015 +0100
sd: remove cargo-culted dependencies from CppunitTest_sd_misc_tests
Change-Id: I9f11bbc1f16a79eac3621f2233b047826637b33d
(cherry picked from commit 39d0bd194dac13ea9bcf6c0e7e6a65cf6bbc723b)
diff --git a/sd/CppunitTest_sd_misc_tests.mk b/sd/CppunitTest_sd_misc_tests.mk
index a01eceb..f95801c 100644
--- a/sd/CppunitTest_sd_misc_tests.mk
+++ b/sd/CppunitTest_sd_misc_tests.mk
@@ -67,22 +67,8 @@ $(eval $(call gb_CppunitTest_use_api,sd_misc_tests,\
udkapi \
))
-ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_use_system_win32_libs,sd_misc_tests,\
- uuid \
- ws2_32 \
-))
-endif
-
$(eval $(call gb_CppunitTest_use_externals,sd_misc_tests,\
boost_headers \
- gtk \
- dbus \
- $(if $(ENABLE_AVAHI), \
- avahi \
- ) \
- $(if $(filter WNT,$(OS)),mDNSResponder) \
- libxml2 \
))
$(eval $(call gb_CppunitTest_use_ure,sd_misc_tests))
@@ -134,11 +120,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_misc_tests,\
$(eval $(call gb_CppunitTest_use_configuration,sd_misc_tests))
-$(eval $(call gb_CppunitTest_use_packages,sd_misc_tests,\
- oox_customshapes \
-))
-
-
$(call gb_CppunitTest_get_target,sd_misc_tests) : $(call gb_AllLangResTarget_get_target,sd)
# vim: set noet sw=4 ts=4:
commit 352dd11affcff57da81de8987a2fe4ce395d5ebd
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Dec 15 16:09:43 2015 +0200
Bin obviously unneeded copy pasta
Change-Id: If6b40899ad38d2ae6e91f6627cca5a7129ffa6d6
(cherry picked from commit 40782060f6e5c825d0086d743c1451ecaeb87a9e)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sd/CppunitTest_sd_misc_tests.mk b/sd/CppunitTest_sd_misc_tests.mk
index 453ec35..a01eceb 100644
--- a/sd/CppunitTest_sd_misc_tests.mk
+++ b/sd/CppunitTest_sd_misc_tests.mk
@@ -74,17 +74,6 @@ $(eval $(call gb_CppunitTest_use_system_win32_libs,sd_misc_tests,\
))
endif
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_CppunitTest_add_libs,sd_uimpress,\
- -lobjc \
-))
-
-$(eval $(call gb_CppunitTest_use_system_darwin_frameworks,sd_uimpress,\
- Foundation \
- IOBluetooth \
-))
-endif
-
$(eval $(call gb_CppunitTest_use_externals,sd_misc_tests,\
boost_headers \
gtk \
commit a166945a45b33c408a03731e8c0b455e23b85446
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Dec 15 20:16:15 2015 +0100
boost: suppress auto_ptr deprecation warnings in boost::spirit
Apparently GCC 5.3.1 has turned these annoyances into actual warnings
that convert to errors with -Werror.
Change-Id: Ib1567b3fc2cf33a0f6cffac116a06d73912b84df
(cherry picked from commit d8fb3ed5fa47afa1f3e31d4211bfe0a477641c94)
diff --git a/external/boost/boost.wdeprecated-auto_ptr.patch.0 b/external/boost/boost.wdeprecated-auto_ptr.patch.0
index 860840d..b02af6d 100644
--- a/external/boost/boost.wdeprecated-auto_ptr.patch.0
+++ b/external/boost/boost.wdeprecated-auto_ptr.patch.0
@@ -189,3 +189,49 @@ diff -ru boost.orig/boost/smart_ptr/shared_ptr.hpp boost/boost/smart_ptr/shared_
+#endif
+
#endif // #ifndef BOOST_SMART_PTR_SHARED_PTR_HPP_INCLUDED
+--- boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp.orig2 2015-12-15 18:24:31.318854561 +0100
++++ boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2015-12-15 18:26:19.804853629 +0100
+@@ -11,6 +11,11 @@
+ #if !defined BOOST_SPIRIT_GRAMMAR_IPP
+ #define BOOST_SPIRIT_GRAMMAR_IPP
+
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) || defined(__clang__)
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++#endif
++
+ #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
+ #include <boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp>
+ #include <algorithm>
+@@ -368,4 +373,8 @@
+
+ }} // namespace boost::spirit
+
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) || defined(__clang__)
++# pragma GCC diagnostic pop
++#endif
++
+ #endif
+--- boost/spirit/home/classic/symbols/impl/tst.ipp.orig 2015-12-15 19:08:48.978831726 +0100
++++ boost/spirit/home/classic/symbols/impl/tst.ipp 2015-12-15 19:09:35.064831330 +0100
+@@ -9,6 +9,11 @@
+ #ifndef BOOST_SPIRIT_TST_IPP
+ #define BOOST_SPIRIT_TST_IPP
+
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) || defined(__clang__)
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++#endif
++
+ ///////////////////////////////////////////////////////////////////////////////
+ #include <memory> // for std::auto_ptr
+ #include <boost/spirit/home/classic/core/assert.hpp>
+@@ -278,4 +283,8 @@
+
+ }} // namespace boost::spirit
+
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) || defined(__clang__)
++# pragma GCC diagnostic pop
++#endif
++
+ #endif
commit 0050019b54a266db92aa71069668ee58e12a7876
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Dec 15 20:11:10 2015 +0100
sw: fix MSVC build, stupid thing can't initialize const members
Change-Id: I546b96a5628d2ad186b5b626cce28f67841db157
(cherry picked from commit 159e78791ba40d76ba0d8af6abbd7d629eb6dd85)
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 43a57ab..d2c05c4 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -476,11 +476,11 @@ static uno::Reference<io::XInputStream> lcl_StoreOwnAsOOXML(
sal_uInt32 n1;
sal_uInt16 n2, n3;
sal_uInt8 b8, b9, b10, b11, b12, b13, b14, b15;
- } const ClassId;
- char const*const pFilterName;
- char const*const pMediaType;
- char const*const pProgID;
- char const*const pSuffix;
+ } ClassId;
+ char const* pFilterName;
+ char const* pMediaType;
+ char const* pProgID;
+ char const* pSuffix;
} s_Mapping[] = {
{ {SO3_SW_CLASSID_60}, "MS Word 2007 XML", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "Word.Document.12", "docx" },
{ {SO3_SC_CLASSID_60}, "Calc MS Excel 2007 XML", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "Excel.Sheet.12", "xlsx" },
More information about the Libreoffice-commits
mailing list