[arch-commits] Commit in libreoffice/trunk (7 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Wed Apr 3 20:13:44 UTC 2013
Date: Wednesday, April 3, 2013 @ 22:13:44
Author: andyrtr
Revision: 181374
prepare next release
Added:
libreoffice/trunk/gcc48_1.diff
libreoffice/trunk/gcc48_2.diff
libreoffice/trunk/gcc48_3.diff
libreoffice/trunk/gcc48_4.diff
libreoffice/trunk/gcc48_5.diff
libreoffice/trunk/remove_unused_vars.diff
Modified:
libreoffice/trunk/PKGBUILD
-------------------------+
PKGBUILD | 31 ++++--
gcc48_1.diff | 52 ++++++++++
gcc48_2.diff | 45 +++++++++
gcc48_3.diff | 46 +++++++++
gcc48_4.diff | 223 ++++++++++++++++++++++++++++++++++++++++++++++
gcc48_5.diff | 34 +++++++
remove_unused_vars.diff | 26 +++++
7 files changed, 450 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-04-03 17:59:38 UTC (rev 181373)
+++ PKGBUILD 2013-04-03 20:13:44 UTC (rev 181374)
@@ -79,7 +79,12 @@
${_additional_source_url}/libvisio-0.0.25.tar.bz2
make-pyuno-work-with-system-wide-module-install.diff
libreoffice-common.sh libreoffice-common.csh
- librelogo.diff)
+ gcc48_1.diff
+ gcc48_2.diff
+ remove_unused_vars.diff
+ gcc48_3.diff
+ gcc48_4.diff
+ gcc48_5.diff)
noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
185d60944ea767075d27247c3162b3bc-unowinreg.dll
9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2
@@ -150,7 +155,12 @@
'97bf43dda273d79ff90c848ab53b0e3c'
'abcb1b0a7deaffe13ab3d7ca70becb49'
'72790a4103da259a55cadd66db931d00'
- 'cc07fdb40e005ad2a79ba8a6756b0ad6')
+ '941aab11a42c8052cc1999434ae82bcd'
+ 'caf426e9eefb99108adba6cf231de348'
+ 'c367454b402720eea064280d0dfb291b'
+ '69aef9ea67856714e0ad3b5600b49bd7'
+ '424c346c52d1a3ee7b1008cdcf89ed82'
+ 'aed5397524af27a8cceced54a30edf23')
build() {
@@ -159,11 +169,19 @@
# [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
cd ${srcdir}/libreoffice-$_LOver
+
+ # fix exttextcat build error
+ # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
+ unset CPPFLAGS
- # make librelogo depend on libreoffice-writer
- # http://cgit.freedesktop.org/libreoffice/core/commit/?id=4e69b35674882d8d675a677940805b187cad0bc3
-# patch -Np1 -i ${srcdir}/librelogo.diff
-
+ # git commits from 2013-03-09 with "GCC" to fix gcc 4.8 issues
+# patch -Np1 -i ${srcdir}/gcc48_1.diff
+# patch -Np1 -i ${srcdir}/gcc48_2.diff
+# patch -Np1 -i ${srcdir}/remove_unused_vars.diff
+# patch -Np1 -i ${srcdir}/gcc48_3.diff
+# patch -Np1 -i ${srcdir}/gcc48_4.diff
+# patch -Np1 -i ${srcdir}/gcc48_5.diff
+
# move external sources into place
mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources
for source in "${noextract[@]}"; do
@@ -200,7 +218,6 @@
--disable-fetch-external \
--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
--libdir=/usr/lib --mandir=/usr/share/man \
- --disable-verbose \
--with-lang="" \
--enable-crashdump \
--enable-dbus \
Added: gcc48_1.diff
===================================================================
--- gcc48_1.diff (rev 0)
+++ gcc48_1.diff 2013-04-03 20:13:44 UTC (rev 181374)
@@ -0,0 +1,52 @@
+From 6bea5311d70f518444fe3218cf0b6f49bd93cc34 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Fri, 08 Mar 2013 09:36:44 +0000
+Subject: Work around GCC 4.8 -Werror=unused-local-typedefs in boost
+
+Change-Id: Ib137c5c5764333d7a878c5e996e6983a277d3856
+---
+diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
+index 2fcae8c..fde6fa6 100644
+--- a/boost/UnpackedTarball_boost.mk
++++ b/boost/UnpackedTarball_boost.mk
+@@ -52,6 +52,8 @@ boost_patches += boost_1_44_0-clang-warnings.patch
+ # in GCC-4.7 experimental":
+ boost_patches += boost_1_44_0-gthreads.patch
+
++boost_patches += boost_1_44_0-gcc4.8.patch
++
+ $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
+
+ $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))
+diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch
+new file mode 100644
+index 0000000..9fc603e
+--- a/dev/null
++++ b/boost/boost_1_44_0-gcc4.8.patch
+@@ -0,0 +1,24 @@
++--- misc/boost_1_44_0/boost/bind/arg.hpp
+++++ misc/build/boost_1_44_0/boost/bind/arg.hpp
++@@ -35,6 +35,8 @@
++ {
++ // static assert I == is_placeholder<T>::value
++ typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ];
+++ T_must_be_placeholder dummy; (void) dummy;
+++ // silence -Werror=unused-local-typedefs (GCC 4.8)
++ }
++ };
++
++--- misc/boost_1_44_0/boost/concept/detail/general.hpp
+++++ misc/build/boost_1_44_0/boost/concept/detail/general.hpp
++@@ -68,7 +68,9 @@
++ # define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \
++ typedef ::boost::concepts::detail::instantiate< \
++ &::boost::concepts::requirement_<ModelFnPtr>::failed> \
++- BOOST_PP_CAT(boost_concept_check,__LINE__)
+++ BOOST_PP_CAT(boost_concept_check,__LINE__); \
+++ BOOST_PP_CAT(boost_concept_check,__LINE__) BOOST_PP_CAT(boost_concept_check_dummy,__LINE__)()
+++ // silence -Werror=unused-local-typedefs (GCC 4.8)
++
++ }}
++
+--
+cgit v0.9.0.2-2-gbebe
Added: gcc48_2.diff
===================================================================
--- gcc48_2.diff (rev 0)
+++ gcc48_2.diff 2013-04-03 20:13:44 UTC (rev 181374)
@@ -0,0 +1,45 @@
+From c6cfd44717643b0630b5f8fd3262c243fdaaf239 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Fri, 08 Mar 2013 09:54:45 +0000
+Subject: Work around GCC 4.8 -Werror=format= in python3
+
+...complainging that "‘PyArg_ParseTuple’ is an unrecognized format function
+type."
+
+Change-Id: I125af6669010c4c9c1a18cc7c1a4895acc89338b
+---
+diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk
+index d8c0862..87adff0 100644
+--- a/python3/UnpackedTarball_python3.mk
++++ b/python3/UnpackedTarball_python3.mk
+@@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
+ python3/python-3.3.0-ssl.patch.1 \
+ python3/python-3.3.0-implicit-int.patch.1 \
+ python3/python-3.3.0-ffi-clang.patch.1 \
++ python3/python-3.3.0-gcc-4.8.patch.1 \
+ ))
+
+ ifneq ($(OS),WNT)
+diff --git a/python3/python-3.3.0-gcc-4.8.patch.1 b/python3/python-3.3.0-gcc-4.8.patch.1
+new file mode 100644
+index 0000000..8fb7107
+--- a/dev/null
++++ b/python3/python-3.3.0-gcc-4.8.patch.1
+@@ -0,0 +1,15 @@
++--- Python-3.3.0/Include/modsupport.h 2012-09-29 10:00:26.000000000 +0200
+++++ Python-3.3.0/Include/modsupport.h 2013-03-08 10:46:28.671938738 +0100
++@@ -26,7 +26,11 @@
++ /* Due to a glitch in 3.2, the _SizeT versions weren't exported from the DLL. */
++ #if !defined(PY_SSIZE_T_CLEAN) || !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
++ PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...);
++-PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3);
+++PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...)
+++#ifdef PY_SSIZE_T_CLEAN
+++ Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3)
+++#endif
+++ ;
++ PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *,
++ const char *, char **, ...);
++ PyAPI_FUNC(int) PyArg_ValidateKeywordArguments(PyObject *);
+--
+cgit v0.9.0.2-2-gbebe
Added: gcc48_3.diff
===================================================================
--- gcc48_3.diff (rev 0)
+++ gcc48_3.diff 2013-04-03 20:13:44 UTC (rev 181374)
@@ -0,0 +1,46 @@
+From 52c5eb20fd96d63e17cb9cd18912030131bcc787 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Fri, 08 Mar 2013 09:59:05 +0000
+Subject: -Werror=unused-local-typedefs (GCC 4.8)
+
+Change-Id: Ib1dedbe8e273463fa47573486d67dc9d509953db
+---
+diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+index f8267c6..810470e 100644
+--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
++++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+@@ -608,7 +608,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
+ putenv(strdup(osJavaHome.getStr()));
+ #endif
+
+- typedef jint JNICALL JNI_InitArgs_Type(void *);
+ typedef jint JNICALL JNI_CreateVM_Type(JavaVM **, JNIEnv **, void *);
+ rtl::OUString sSymbolCreateJava(
+ RTL_CONSTASCII_USTRINGPARAM("JNI_CreateJavaVM"));
+diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+index 8c4f129..2694218 100644
+--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
++++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+@@ -201,8 +201,6 @@ void ClientBox::DeleteRemoved()
+
+ if ( ! m_vRemovedEntries.empty() )
+ {
+- typedef std::vector< TClientBoxEntry >::iterator ITER;
+-
+ m_vRemovedEntries.clear();
+ }
+
+diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
+index cd7df65..1eb94c9 100644
+--- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
++++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
+@@ -225,7 +225,6 @@ void MasterPageObserver::Implementation::AddEventListener (
+
+ // Tell the new listener about all the master pages that are
+ // currently in use.
+- typedef ::std::vector<String> StringList;
+ MasterPageContainer::iterator aDocumentIterator;
+ for (aDocumentIterator=maUsedMasterPages.begin();
+ aDocumentIterator!=maUsedMasterPages.end();
+--
+cgit v0.9.0.2-2-gbebe
Added: gcc48_4.diff
===================================================================
--- gcc48_4.diff (rev 0)
+++ gcc48_4.diff 2013-04-03 20:13:44 UTC (rev 181374)
@@ -0,0 +1,223 @@
+From 72c62e0e83598862e1c6e00e4264d7720aa94e41 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Fri, 08 Mar 2013 10:45:35 +0000
+Subject: -Werror=unused-local-typedefs (GCC 4.8)
+
+Change-Id: I873813e30e44712d6793bad91938eb847b55a7bb
+---
+diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch
+index 9fc603e..2d2beeb 100644
+--- a/boost/boost_1_44_0-gcc4.8.patch
++++ b/boost/boost_1_44_0-gcc4.8.patch
+@@ -1,3 +1,45 @@
++--- misc/boost_1_44_0/boost/algorithm/string/detail/finder.hpp
+++++ misc/build/boost_1_44_0/boost/algorithm/string/detail/finder.hpp
++@@ -142,7 +142,6 @@
++ ForwardIteratorT End,
++ std::forward_iterator_tag ) const
++ {
++- typedef ForwardIteratorT input_iterator_type;
++ typedef iterator_range<ForwardIteratorT> result_type;
++
++ first_finder_type first_finder(
++@@ -263,7 +262,6 @@
++ ForwardIteratorT End,
++ unsigned int N) const
++ {
++- typedef ForwardIteratorT input_iterator_type;
++ typedef iterator_range<ForwardIteratorT> result_type;
++
++ // Sanity check
++@@ -298,7 +296,6 @@
++ ForwardIteratorT End,
++ unsigned int N) const
++ {
++- typedef ForwardIteratorT input_iterator_type;
++ typedef iterator_range<ForwardIteratorT> result_type;
++
++ // Sanity check
++@@ -362,7 +359,6 @@
++ unsigned int N,
++ std::random_access_iterator_tag )
++ {
++- typedef ForwardIteratorT input_iterator_type;
++ typedef iterator_range<ForwardIteratorT> result_type;
++
++ if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) )
++@@ -436,7 +432,6 @@
++ unsigned int N,
++ std::random_access_iterator_tag )
++ {
++- typedef ForwardIteratorT input_iterator_type;
++ typedef iterator_range<ForwardIteratorT> result_type;
++
++ if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) )
+ --- misc/boost_1_44_0/boost/bind/arg.hpp
+ +++ misc/build/boost_1_44_0/boost/bind/arg.hpp
+ @@ -35,6 +35,8 @@
+@@ -22,3 +64,163 @@
+
+ }}
+
++--- misc/boost_1_44_0/boost/date_time/date_parsing.hpp
+++++ misc/build/boost_1_44_0/boost/date_time/date_parsing.hpp
++@@ -113,7 +113,6 @@
++ spec_str = "mdy";
++ }
++
++- typedef typename date_type::year_type year_type;
++ typedef typename date_type::month_type month_type;
++ unsigned pos = 0;
++ unsigned short year(0), month(0), day(0);
++@@ -159,7 +158,7 @@
++ parse_undelimited_date(const std::string& s) {
++ int offsets[] = {4,2,2};
++ int pos = 0;
++- typedef typename date_type::year_type year_type;
+++ //typedef typename date_type::year_type year_type;
++ //typename date_type::ymd_type ymd((year_type::min)(),1,1);
++ unsigned short y = 0, m = 0, d = 0;
++
++--- misc/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp
+++++ misc/build/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp
++@@ -36,7 +36,6 @@
++ boost::io::ios_flags_saver iflags(os);
++ typedef local_date_time time_type;//::utc_time_type typename
++ typedef date_time::time_facet<time_type, CharT> custom_time_facet;
++- typedef std::time_put<CharT> std_time_facet;
++ std::ostreambuf_iterator<CharT> oitr(os);
++
++ if(std::has_facet<custom_time_facet>(os.getloc())) {
++@@ -123,7 +122,6 @@
++ const boost::local_time::local_time_period& p) {
++ boost::io::ios_flags_saver iflags(os);
++ typedef boost::date_time::time_facet<local_date_time, CharT> custom_facet;
++- typedef std::time_put<CharT> std_time_facet;
++ std::ostreambuf_iterator<CharT> oitr(os);
++ if (std::has_facet<custom_facet>(os.getloc())) {
++ std::use_facet<custom_facet>(os.getloc()).put(oitr, os, os.fill(), p);
++--- misc/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp
+++++ misc/build/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp
++@@ -47,7 +47,6 @@
++ const ptime& p) {
++ boost::io::ios_flags_saver iflags(os);
++ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet;
++- typedef std::time_put<CharT> std_ptime_facet;
++ std::ostreambuf_iterator<CharT> oitr(os);
++ if (std::has_facet<custom_ptime_facet>(os.getloc()))
++ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p);
++@@ -114,7 +113,6 @@
++ const boost::posix_time::time_period& p) {
++ boost::io::ios_flags_saver iflags(os);
++ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet;
++- typedef std::time_put<CharT> std_time_facet;
++ std::ostreambuf_iterator<CharT> oitr(os);
++ if (std::has_facet<custom_ptime_facet>(os.getloc())) {
++ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p);
++@@ -180,7 +178,6 @@
++ {
++ boost::io::ios_flags_saver iflags(os);
++ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet;
++- typedef std::time_put<CharT> std_ptime_facet;
++ std::ostreambuf_iterator<CharT> oitr(os);
++ if (std::has_facet<custom_ptime_facet>(os.getloc()))
++ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), td);
++--- misc/boost_1_44_0/boost/date_time/string_convert.hpp
+++++ misc/build/boost_1_44_0/boost/date_time/string_convert.hpp
++@@ -21,7 +21,6 @@
++ inline
++ std::basic_string<OutputT> convert_string_type(const std::basic_string<InputT>& inp_str)
++ {
++- typedef std::basic_string<InputT> input_type;
++ typedef std::basic_string<OutputT> output_type;
++ output_type result;
++ result.insert(result.begin(), inp_str.begin(), inp_str.end());
++--- misc/boost_1_44_0/boost/date_time/strings_from_facet.hpp
+++++ misc/build/boost_1_44_0/boost/date_time/strings_from_facet.hpp
++@@ -35,7 +35,6 @@
++ {
++ typedef std::basic_string<charT> string_type;
++ typedef std::vector<string_type> collection_type;
++- typedef std::basic_ostringstream<charT> ostream_type;
++ typedef std::ostreambuf_iterator<charT> ostream_iter_type;
++ typedef std::basic_ostringstream<charT> stringstream_type;
++ typedef std::time_put<charT> time_put_facet_type;
++@@ -85,7 +84,6 @@
++ {
++ typedef std::basic_string<charT> string_type;
++ typedef std::vector<string_type> collection_type;
++- typedef std::basic_ostringstream<charT> ostream_type;
++ typedef std::ostreambuf_iterator<charT> ostream_iter_type;
++ typedef std::basic_ostringstream<charT> stringstream_type;
++ typedef std::time_put<charT> time_put_facet_type;
++--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp
+++++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp
++@@ -39,8 +39,6 @@
++
++ template <typename Array, typename IdxGen, typename Call_Type>
++ static void call(Array& a, const IdxGen& idgen, Call_Type c) {
++- typedef typename Array::index_range index_range_;
++- typedef typename Array::index index_;
++ idgen_helper<N-1>::call(a,idgen[c],c);
++ }
++ };
++@@ -50,8 +48,6 @@
++
++ template <typename Array, typename IdxGen, typename Call_Type>
++ static void call(Array& a, const IdxGen& idgen, Call_Type) {
++- typedef typename Array::index_range index_range_;
++- typedef typename Array::index index_;
++ a[ idgen ];
++ }
++ };
++--- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
+++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
++@@ -307,7 +307,6 @@
++ #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
++ typedef impl::grammar_helper_base<GrammarT> helper_base_t;
++ typedef grammar_helper_list<GrammarT> helper_list_t;
++- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
++
++ helper_list_t& helpers =
++ # if !defined(__GNUC__) || (__GNUC__ > 2)
++@@ -318,6 +317,7 @@
++
++ # if (defined(BOOST_MSVC) && (BOOST_MSVC < 1300)) \
++ || defined(BOOST_INTEL_CXX_VERSION)
+++ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
++ for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i)
++ (*i)->undefine(self);
++ # else
++--- misc/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp
+++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp
++@@ -47,7 +47,6 @@
++ typename parser_result<self_t, ScannerT>::type
++ parse(ScannerT const& scan) const
++ {
++- typedef typename parser_result<self_t, ScannerT>::type result_t;
++ typedef typename ScannerT::value_t value_t;
++ typedef typename ScannerT::iterator_t iterator_t;
++
++--- misc/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp
+++++ misc/build/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp
++@@ -140,7 +140,6 @@
++ parse(ScannerT const& scan) const
++ {
++ typedef typename parser_result<ParserT, ScannerT>::type result_t;
++- typedef typename ScannerT::iterator_t iterator_t;
++
++ result_t hit = this->subject().parse(scan);
++ if (!hit)
++--- misc/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp
+++++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp
++@@ -49,8 +49,6 @@
++ typename parser_result<self_t, ScannerT>::type
++ parse(ScannerT const& scan) const
++ {
++- typedef typename parser_result<self_t, ScannerT>::type result_t;
++- typedef typename ScannerT::value_t value_t;
++ typedef typename ScannerT::iterator_t iterator_t;
++
++ iterator_t const s(scan.first);
+--
+cgit v0.9.0.2-2-gbebe
Added: gcc48_5.diff
===================================================================
--- gcc48_5.diff (rev 0)
+++ gcc48_5.diff 2013-04-03 20:13:44 UTC (rev 181374)
@@ -0,0 +1,34 @@
+From 157ce65588ec8ef4ff8f805f7b8a64fefdd9edec Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Fri, 08 Mar 2013 11:07:11 +0000
+Subject: Work around GCC 4.8 -Werror=virtual-move-assign
+
+...complaining that "defaulted move assignment for ‘cppcanvas::SpriteCanvas’
+calls a non-trivial move assignment operator for virtual base
+‘cppcanvas::BitmapCanvas’."
+
+Change-Id: I4dc92176dbec62f0ae4fa7d2842073077ecb8fc3
+---
+diff --git a/cppcanvas/inc/cppcanvas/spritecanvas.hxx b/cppcanvas/inc/cppcanvas/spritecanvas.hxx
+index 59aa3da..6a606b3 100644
+--- a/cppcanvas/inc/cppcanvas/spritecanvas.hxx
++++ b/cppcanvas/inc/cppcanvas/spritecanvas.hxx
+@@ -24,6 +24,7 @@
+ #include <osl/diagnose.h>
+ #include <basegfx/vector/b2dsize.hxx>
+
++#include <boost/noncopyable.hpp>
+ #include <boost/shared_ptr.hpp>
+
+
+@@ -48,7 +49,7 @@ namespace cppcanvas
+
+ /** SpriteCanvas interface
+ */
+- class SpriteCanvas : public virtual BitmapCanvas
++ class SpriteCanvas : public virtual BitmapCanvas, private boost::noncopyable
+ {
+ public:
+ virtual bool updateScreen( bool bUpdateAll ) const = 0;
+--
+cgit v0.9.0.2-2-gbebe
Added: remove_unused_vars.diff
===================================================================
--- remove_unused_vars.diff (rev 0)
+++ remove_unused_vars.diff 2013-04-03 20:13:44 UTC (rev 181374)
@@ -0,0 +1,26 @@
+From 305bf19e390aebdf2d20ea052a92f782e8d1185c Mon Sep 17 00:00:00 2001
+From: Thomas Arnhold <thomas at arnhold.org>
+Date: Sun, 24 Feb 2013 17:39:08 +0000
+Subject: loplugin: unused variables
+
+And some fallout.
+
+Change-Id: I8dfc12f3566e72d79d4f9930284c92577aa485a1
+---
+(limited to 'sd/source/ui/toolpanel/controls/MasterPageObserver.cxx')
+
+diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
+index 1d27c9d..cd7df65 100644
+--- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
++++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
+@@ -226,8 +226,6 @@ void MasterPageObserver::Implementation::AddEventListener (
+ // Tell the new listener about all the master pages that are
+ // currently in use.
+ typedef ::std::vector<String> StringList;
+- StringList aNewMasterPages;
+- StringList aRemovedMasterPages;
+ MasterPageContainer::iterator aDocumentIterator;
+ for (aDocumentIterator=maUsedMasterPages.begin();
+ aDocumentIterator!=maUsedMasterPages.end();
+--
+cgit v0.9.0.2-2-gbebe
More information about the arch-commits
mailing list