[Libreoffice-commits] core.git: 8 commits - connectivity/source external/boost external/clucene external/liborcus external/neon external/nss external/vigra sdext/source ucb/source
Michael Stahl
mstahl at redhat.com
Thu Nov 14 07:10:59 PST 2013
connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h | 3
connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h | 3
connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h | 3
connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h | 3
connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h | 3
connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx | 3
external/boost/boost.wdeprecated-auto_ptr.patch.0 | 125 +++++++---
external/boost/boost_1_44_0-clang-warnings.patch | 52 +++-
external/clucene/patches/clucene-warnings.patch | 86 ++++++
external/liborcus/ExternalProject_liborcus.mk | 4
external/neon/neon.patch | 13 -
external/nss/ExternalProject_nss.mk | 28 +-
external/nss/UnpackedTarball_nss.mk | 2
external/nss/nss.patch | 63 -----
external/nss/nss_macosx.patch | 90 ++++---
external/vigra/vigra1.6.0.patch | 22 -
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4
ucb/source/ucp/webdav-neon/NeonLockStore.cxx | 1
ucb/source/ucp/webdav-neon/NeonTypes.hxx | 8
19 files changed, 296 insertions(+), 220 deletions(-)
New commits:
commit ee9ab2765f2892104f68fd3b076b506921de7fd7
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 14 15:55:32 2013 +0100
vigra: stop using #pragma GCC system_header
... don't even get any warning with that removed.
Change-Id: I2647a5951a4ac3cba174a3564e99ef81e4959992
diff --git a/external/vigra/vigra1.6.0.patch b/external/vigra/vigra1.6.0.patch
index db57c2e..560fd44 100644
--- a/external/vigra/vigra1.6.0.patch
+++ b/external/vigra/vigra1.6.0.patch
@@ -1076,17 +1076,6 @@ diff -uprN misc/vigra1.6.0/include/vigra/recursiveconvolution.hxx misc/build/vig
diff -uprN misc/vigra1.6.0/include/vigra/rgbvalue.hxx misc/build/vigra1.6.0/include/vigra/rgbvalue.hxx
--- misc/vigra1.6.0/include/vigra/rgbvalue.hxx 2008-08-13 08:15:41.000000000 -0500
+++ misc/build/vigra1.6.0/include/vigra/rgbvalue.hxx 2012-09-19 17:30:24.000000000 -0500
-@@ -39,6 +39,10 @@
- #ifndef VIGRA_RGBVALUE_HXX
- #define VIGRA_RGBVALUE_HXX
-
-+#if defined __GNUC__
-+#pragma GCC system_header
-+#endif
-+
- #include <cmath> // abs(double)
- #include <cstdlib> // abs(int)
- #include "config.hxx"
@@ -702,8 +706,6 @@ operator/=(RGBValue<V, RIDX, GIDX, BIDX>
return l;
}
@@ -1420,17 +1409,6 @@ diff -uprN misc/vigra1.6.0/include/vigra/static_assert.hxx misc/build/vigra1.6.0
diff -uprN misc/vigra1.6.0/include/vigra/tinyvector.hxx misc/build/vigra1.6.0/include/vigra/tinyvector.hxx
--- misc/vigra1.6.0/include/vigra/tinyvector.hxx 2008-08-13 08:15:42.000000000 -0500
+++ misc/build/vigra1.6.0/include/vigra/tinyvector.hxx 2012-09-19 17:30:24.000000000 -0500
-@@ -39,6 +39,10 @@
- #ifndef VIGRA_TINYVECTOR_HXX
- #define VIGRA_TINYVECTOR_HXX
-
-+#if defined __GNUC__
-+#pragma GCC system_header
-+#endif
-+
- #include <cmath> // abs(double)
- #include <cstdlib> // abs(int)
- #include <iosfwd> // ostream
@@ -49,7 +53,6 @@
namespace vigra {
commit ee59dff09c4f2ace54c43b597e216fce463a9a06
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 14 15:55:07 2013 +0100
neon: stop using #pragma GCC system_header
... it breaks dependency generation.
Change-Id: I524f1789c32a633e8930a4e36a893ce02de66390
diff --git a/external/neon/neon.patch b/external/neon/neon.patch
index 95d6b55..de52043 100644
--- a/external/neon/neon.patch
+++ b/external/neon/neon.patch
@@ -174,19 +174,6 @@
ctx->found = 1;
}
}
---- src/ne_locks.h 2006-01-02 12:43:19.000000000 +0100
-+++ src/ne_locks.h 2011-02-03 10:26:21.000000000 +0100
-@@ -22,6 +22,10 @@
- #ifndef NE_LOCKS_H
- #define NE_LOCKS_H
-
-+# if defined __GNUC__
-+# pragma GCC system_header
-+# endif
-+
- #include "ne_request.h" /* for ne_session + ne_request */
- #include "ne_uri.h" /* for ne_uri */
-
--- src/ne_sspi.c 2007-08-10 17:26:08.000000000 +0200
+++ src/ne_sspi.c 2011-02-03 10:26:21.000000000 +0100
@@ -206,6 +206,45 @@
diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx
index 17e43bb..f76dc09 100644
--- a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx
@@ -27,7 +27,6 @@
************************************************************************/
-#include <ne_locks.h>
#include <ne_uri.h>
#include "rtl/ustring.hxx"
#include "osl/time.h"
diff --git a/ucb/source/ucp/webdav-neon/NeonTypes.hxx b/ucb/source/ucp/webdav-neon/NeonTypes.hxx
index cc40eb2..636ae8f 100644
--- a/ucb/source/ucp/webdav-neon/NeonTypes.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonTypes.hxx
@@ -34,7 +34,15 @@
#include <ne_utils.h>
#include <ne_basic.h>
#include <ne_props.h>
+
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wshadow"
+#endif
#include <ne_locks.h>
+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
+# pragma GCC diagnostic pop
+#endif
typedef ne_session HttpSession;
typedef ne_status HttpStatus;
commit 20803bd1dac462dedb670602c1ab4489f7f590fc
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 14 15:54:22 2013 +0100
clucene: stop using #pragma GCC system_header
... it breaks dependency generation.
Change-Id: I992e47ecea697617820358f711b7a6408fdabbe3
diff --git a/external/clucene/patches/clucene-warnings.patch b/external/clucene/patches/clucene-warnings.patch
index b9676d9..1f1a29f 100644
--- a/external/clucene/patches/clucene-warnings.patch
+++ b/external/clucene/patches/clucene-warnings.patch
@@ -1,54 +1,120 @@
--- src/core/CLucene/analysis/AnalysisHeader.h 2012-02-22 12:37:22.531637934 +0000
+++ src/core/CLucene/analysis/AnalysisHeader.h 2012-02-22 12:39:15.369916728 +0000
-@@ -7,6 +7,8 @@
+@@ -7,6 +7,12 @@
#ifndef _lucene_analysis_AnalysisHeader_
#define _lucene_analysis_AnalysisHeader_
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Woverloaded-virtual"
++#endif
+
#include "CLucene/index/Payload.h"
#include "CLucene/util/VoidList.h"
#include "CLucene/LuceneThreads.h"
+@@ -361,4 +361,8 @@
+ };
+
+ CL_NS_END
++
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
+ #endif
--- src/core/CLucene/search/Searchable.h 2012-02-22 12:37:22.513637729 +0000
+++ src/core/CLucene/search/Searchable.h 2012-02-22 12:38:51.073641550 +0000
-@@ -7,6 +7,7 @@
+@@ -7,6 +7,12 @@
#ifndef _lucene_search_Searcher_
#define _lucene_search_Searcher_
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Woverloaded-virtual"
++#endif
++
//#include "CLucene/index/IndexReader.h"
CL_CLASS_DEF(index,Term)
+@@ -180,4 +180,8 @@
+ };
+
+ CL_NS_END
++
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
+ #endif
--- src/core/CLucene/store/IndexInput.h 2012-02-22 12:37:22.508637673 +0000
+++ src/core/CLucene/store/IndexInput.h 2012-02-22 12:39:00.465747935 +0000
-@@ -7,6 +7,8 @@
+@@ -7,6 +7,12 @@
#ifndef _lucene_store_IndexInput_
#define _lucene_store_IndexInput_
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Woverloaded-virtual"
++#endif
+
#include "CLucene/LuceneThreads.h"
#include "CLucene/util/Equators.h"
+@@ -195,4 +195,8 @@
+ virtual void seekInternal(const int64_t pos) = 0;
+ };
+ CL_NS_END
++
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
+ #endif
--- src/core/CLucene/util/Array.h 2012-02-22 12:37:22.510637696 +0000
+++ src/core/CLucene/util/Array.h 2012-02-22 12:38:33.714444884 +0000
-@@ -7,6 +7,8 @@
+@@ -7,6 +7,12 @@
#ifndef _lucene_util_Array_
#define _lucene_util_Array_
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wshadow"
++#endif
+
#include <stdlib.h>
#include <string.h>
+@@ -338,4 +338,8 @@
+
+
+ CL_NS_END
++
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
+ #endif
--- src/core/CLucene/util/PriorityQueue.h 2012-02-22 12:37:22.510637696 +0000
+++ src/core/CLucene/util/PriorityQueue.h 2012-02-22 12:38:40.316519685 +0000
-@@ -7,6 +7,8 @@
+@@ -7,6 +7,12 @@
#ifndef _lucene_util_PriorityQueue_
#define _lucene_util_PriorityQueue_
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wshadow"
++#endif
+
#include <stdlib.h>
CL_NS_DEF(util)
+@@ -199,4 +199,8 @@
+ };
+
+ CL_NS_END
++
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
+ #endif
commit 29661a886e4157e0cb6141b49fb5602fa621cc9a
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 14 15:52:48 2013 +0100
boost: stop using #pragma GCC system_header
... it breaks dependency generation.
Change-Id: Ib6e1dac1210020d3a6eb1748f1266e69582f199e
diff --git a/external/boost/boost.wdeprecated-auto_ptr.patch.0 b/external/boost/boost.wdeprecated-auto_ptr.patch.0
index dd3ce71..c1cfea7 100644
--- a/external/boost/boost.wdeprecated-auto_ptr.patch.0
+++ b/external/boost/boost.wdeprecated-auto_ptr.patch.0
@@ -1,91 +1,144 @@
---- boost/ptr_container/ptr_map.hpp
-+++ boost/ptr_container/ptr_map.hpp
-@@ -16,6 +16,10 @@
- # pragma once
- #endif
-
-+#if defined __GNUC__
-+#pragma GCC system_header
-+#endif
-+
- #include <map>
- #include <boost/ptr_container/ptr_map_adapter.hpp>
-
--- boost/ptr_container/ptr_map_adapter.hpp
+++ boost/ptr_container/ptr_map_adapter.hpp
-@@ -16,6 +16,10 @@
+@@ -16,6 +16,12 @@
# pragma once
#endif
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
#include <boost/ptr_container/detail/map_iterator.hpp>
#include <boost/ptr_container/detail/associative_ptr_container.hpp>
#include <boost/ptr_container/detail/meta_functions.hpp>
+@@ -876,4 +876,8 @@
+
+ } // namespace 'boost'
+
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif
--- boost/ptr_container/ptr_set_adapter.hpp
+++ boost/ptr_container/ptr_set_adapter.hpp
-@@ -16,6 +16,10 @@
+@@ -16,6 +16,12 @@
# pragma once
#endif
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
#include <boost/ptr_container/detail/associative_ptr_container.hpp>
#include <boost/ptr_container/detail/meta_functions.hpp>
#include <boost/ptr_container/detail/void_ptr_iterator.hpp>
---- boost/ptr_container/ptr_vector.hpp
-+++ boost/ptr_container/ptr_vector.hpp
-@@ -16,6 +16,10 @@
+@@ -693,4 +693,8 @@
+
+ } // namespace 'boost'
+
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif
+--- boost/ptr_container/ptr_sequence_adapter.hpp
++++ boost/ptr_container/ptr_sequence_adapter.hpp
+@@ -16,6 +16,11 @@
# pragma once
#endif
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
-+
- #include <vector>
- #include <boost/ptr_container/ptr_sequence_adapter.hpp>
+ #include <boost/ptr_container/detail/reversible_ptr_container.hpp>
+ #include <boost/ptr_container/indirect_fun.hpp>
+@@ -773,4 +777,8 @@
+
+ } // namespace 'boost'
+
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif
--- boost/smart_ptr/detail/shared_count.hpp
+++ boost/smart_ptr/detail/shared_count.hpp
-@@ -18,6 +18,10 @@
+@@ -18,6 +18,12 @@
// http://www.boost.org/LICENSE_1_0.txt)
//
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
#ifdef __BORLANDC__
# pragma warn -8027 // Functions containing try are not expanded inline
#endif
+@@ -604,4 +604,8 @@
+ # pragma warn .8027 // Functions containing try are not expanded inline
+ #endif
+
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif // #ifndef BOOST_SMART_PTR_DETAIL_SHARED_COUNT_HPP_INCLUDED
--- boost/smart_ptr/scoped_ptr.hpp
+++ boost/smart_ptr/scoped_ptr.hpp
-@@ -11,6 +11,10 @@
+@@ -11,6 +11,12 @@
// http://www.boost.org/libs/smart_ptr/scoped_ptr.htm
//
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
#include <boost/config.hpp>
#include <boost/assert.hpp>
#include <boost/checked_delete.hpp>
+@@ -158,4 +158,8 @@
+
+ } // namespace boost
+
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif // #ifndef BOOST_SMART_PTR_SCOPED_PTR_HPP_INCLUDED
--- boost/smart_ptr/shared_ptr.hpp
+++ boost/smart_ptr/shared_ptr.hpp
-@@ -14,6 +14,10 @@
+@@ -14,6 +14,12 @@
// See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation.
//
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
#include <boost/config.hpp> // for broken compiler workarounds
#if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
+@@ -1036,4 +1036,9 @@
+
+ #endif // #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
+
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif // #ifndef BOOST_SMART_PTR_SHARED_PTR_HPP_INCLUDED
diff --git a/external/boost/boost_1_44_0-clang-warnings.patch b/external/boost/boost_1_44_0-clang-warnings.patch
index 0ab1636..177df02 100644
--- a/external/boost/boost_1_44_0-clang-warnings.patch
+++ b/external/boost/boost_1_44_0-clang-warnings.patch
@@ -11,40 +11,74 @@
}
--- misc/boost_1_44_0/boost/random/lagged_fibonacci.hpp
+++ misc/build/boost_1_44_0/boost/random/lagged_fibonacci.hpp
-@@ -16,6 +16,10 @@
+@@ -16,6 +16,12 @@
#ifndef BOOST_RANDOM_LAGGED_FIBONACCI_HPP
#define BOOST_RANDOM_LAGGED_FIBONACCI_HPP
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
#include <istream>
#include <iosfwd>
#include <algorithm> // std::max
+@@ -537,4 +537,8 @@
+
+ } // namespace boost
+
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif // BOOST_RANDOM_LAGGED_FIBONACCI_HPP
--- misc/boost_1_44_0/boost/random/shuffle_output.hpp
+++ misc/build/boost_1_44_0/boost/random/shuffle_output.hpp
-@@ -16,6 +16,10 @@
+@@ -16,6 +16,12 @@
#ifndef BOOST_RANDOM_SHUFFLE_OUTPUT_HPP
#define BOOST_RANDOM_SHUFFLE_OUTPUT_HPP
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
#include <boost/random/shuffle_order.hpp>
namespace boost {
+@@ -52,4 +52,8 @@
+ }
+ }
+
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif // BOOST_RANDOM_SHUFFLE_OUTPUT_HPP
--- misc/boost_1_44_0/boost/random/subtract_with_carry.hpp
+++ misc/build/boost_1_44_0/boost/random/subtract_with_carry.hpp
-@@ -16,6 +16,10 @@
+@@ -16,6 +16,12 @@
#ifndef BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP
#define BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
#include <boost/config/no_tr1/cmath.hpp> // std::pow
#include <iostream>
#include <algorithm> // std::equal
+@@ -614,4 +614,8 @@
+ } // namespace random
+ } // namespace boost
+
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif // BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP
+
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index 6497420..e8ebf00 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -51,6 +51,10 @@ endif
ifeq ($(SYSTEM_ZLIB),NO)
liborcus_CPPFLAGS+=$(ZLIB_CFLAGS)
endif
+# patched boost needs to find config_global.h
+ifeq ($(SYSTEM_BOOST),NO)
+liborcus_CPPFLAGS += -I$(SRCDIR)/config_$(gb_Side)
+endif
#
# OSes that use the GNU C++ library need to use -D_GLIBCXX_DEBUG in
# sync with the rest of LibreOffice, i.e. depending on
commit 96917c806847173ce2a597e533167dedf01ca81b
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 14 12:37:36 2013 +0100
connectivity: remove #pragma GCC system_header in mozabdrv
... which can only be built with MSVC currently anyway.
Change-Id: I806be27ec18e4f04e000f0b5d9ea613c3199855c
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
index 935ac3c..50a1288 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
@@ -18,9 +18,6 @@
*/
#include "pre_include_mozilla.h"
-#if defined __GNUC__
- #pragma GCC system_header
-#endif
#include "nsIServiceManager.h"
#include "nsIEventQueueService.h"
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
index 678cec0..65b7ed2 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
@@ -18,9 +18,6 @@
*/
#include "pre_include_mozilla.h"
-#if defined __GNUC__
- #pragma GCC system_header
-#endif
#include "nscore.h"
#include "nsIPrefService.h"
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
index ccaab78..b6d9c2e 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
@@ -18,9 +18,6 @@
*/
#include "pre_include_mozilla.h"
-#if defined __GNUC__
- #pragma GCC system_header
-#endif
#include "nsIDirectoryService.h"
#include "nsILocalFile.h"
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
index a50124d..4320c93 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
@@ -18,9 +18,6 @@
*/
#include "pre_include_mozilla.h"
-#if defined __GNUC__
- #pragma GCC system_header
-#endif
#include "nsCOMPtr.h"
#include "nsISupports.h"
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
index 6b33273..b31e5c8 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
@@ -18,9 +18,6 @@
*/
#include "pre_include_mozilla.h"
-#if defined __GNUC__
- #pragma GCC system_header
-#endif
#include "nsCOMPtr.h"
#include "nsISupports.h"
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
index ff06129..1d45215 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
@@ -27,9 +27,6 @@
#include <rtl/ustrbuf.hxx>
#include "pre_include_mozilla.h"
-#if defined __GNUC__
- #pragma GCC system_header
-#endif
#include <nsDebug.h>
commit 7379d2cf98805d91e933bdacf5f8d8f3bdf1083c
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 14 15:51:48 2013 +0100
GCC diagnostic push / pop requires HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
Change-Id: I0765649b94b370caf92a29a8ff2224e335196612
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 9e34d4b..f7e4a98 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -23,7 +23,7 @@
#include <sal/types.h>
#if defined __GNUC__
-#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-parameter"
#endif
@@ -43,7 +43,7 @@
#include "PDFDoc.h"
#if defined __GNUC__
-#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
# pragma GCC diagnostic pop
#endif
#elif defined __SUNPRO_CC
commit 78d4b78353b281b7380fe793abd81e9cedd8ee48
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 13 21:00:28 2013 +0100
nss: remove permission changes from nss_macosx.patch
... and instead do that in ExternalProject, which should be more
maintainable than patching.
Change-Id: I0ccf5697976399cf4f92c53e896492044ee6492d
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index 38dec3c..dc19ec4 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -67,19 +67,21 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
NSDISTMODE=copy \
$(MAKE) -j1 AR=$(AR) RANLIB=$(RANLIB) NMEDIT=$(NM)edit nss_build_all \
&& rm -f $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \
- $(if $(filter MACOSX,$(OS)),&& $(PERL) \
- $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
- $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libfreebl3.dylib \
- $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnspr4.dylib \
- $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnss3.dylib \
- $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssckbi.dylib \
- $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssdbm3.dylib \
- $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssutil3.dylib \
- $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplc4.dylib \
- $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplds4.dylib \
- $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libsmime3.dylib \
- $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libsoftokn3.dylib \
- $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libssl3.dylib) \
+ $(if $(filter MACOSX,$(OS)),\
+ && chmod u+w $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.dylib \
+ && $(PERL) \
+ $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+ $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libfreebl3.dylib \
+ $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnspr4.dylib \
+ $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnss3.dylib \
+ $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssckbi.dylib \
+ $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssdbm3.dylib \
+ $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssutil3.dylib \
+ $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplc4.dylib \
+ $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplds4.dylib \
+ $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libsmime3.dylib \
+ $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libsoftokn3.dylib \
+ $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libssl3.dylib) \
,nss)
endif
diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch
index ca625cb..853cd34 100644
--- a/external/nss/nss_macosx.patch
+++ b/external/nss/nss_macosx.patch
@@ -21,39 +21,6 @@
_OPTIMIZE_FLAGS=-O2
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
STRIP="$STRIP -x -S"
---- a/a/nspr/lib/ds/Makefile.in
-+++ b/b/nspr/lib/ds/Makefile.in
-@@ -143,7 +143,7 @@
-
- export:: $(TARGETS)
- $(INSTALL) -m 444 $(HEADERS) $(dist_includedir)
-- $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
-+ $(INSTALL) -m 664 $(TARGETS) $(dist_libdir)
- ifdef SHARED_LIBRARY
- ifeq ($(OS_ARCH),HP-UX)
- $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
---- a/a/nspr/lib/libc/src/Makefile.in
-+++ b/b/nspr/lib/libc/src/Makefile.in
-@@ -144,7 +144,7 @@
- #
-
- export:: $(TARGETS)
-- $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
-+ $(INSTALL) -m 664 $(TARGETS) $(dist_libdir)
- ifdef SHARED_LIBRARY
- ifeq ($(OS_ARCH),HP-UX)
- $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
---- a/a/nspr/pr/src/Makefile.in
-+++ b/b/nspr/pr/src/Makefile.in
-@@ -365,7 +365,7 @@
- #
-
- build:: $(TARGETS)
-- $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
-+ $(INSTALL) -m 664 $(TARGETS) $(dist_libdir)
- ifdef SHARED_LIBRARY
- ifeq ($(OS_ARCH),HP-UX)
- $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
--- a/a/nss/coreconf/Darwin.mk
+++ b/b/nss/coreconf/Darwin.mk
@@ -39,8 +39,12 @@
commit 226e89180c7959795394f7f0b7d4202c31e59187
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 13 18:18:27 2013 +0100
nss: move Darwin stuff from nss.patch to nss_macosx.patch
Change-Id: I5fc7cdbcdf079edb101f6a8c3851c4cf4f92e258
diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk
index 888e1ec..15a02d2 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.patch \
external/nss/nss.aix.patch \
external/nss/nss-3.13.5-zlib-werror.patch \
- $(if $(filter MACOSX,$(OS)),external/nss/nss_macosx.patch) \
+ external/nss/nss_macosx.patch \
$(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch) \
$(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \
external/nss/nss-3.13.3-build.patch.3 \
diff --git a/external/nss/nss.patch b/external/nss/nss.patch
index d7f13e5..37caae0 100644
--- a/external/nss/nss.patch
+++ b/external/nss/nss.patch
@@ -9,49 +9,6 @@
_OPTIMIZE_FLAGS=-O2
_DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that
# combo is not yet good at debugging inlined
---- a/a/nss/coreconf/Darwin.mk 2010-02-04 19:59:10.000000000 +0100
-+++ b/b/nss/coreconf/Darwin.mk 2010-06-11 16:35:54.966185975 +0200
-@@ -39,8 +39,12 @@
-
- DEFAULT_COMPILER = gcc
-
--CC = gcc
--CCC = g++
-+# CC is taken from environment automatically.
-+#CC = cc
-+# Use CCC from environment.
-+#CCC = c++
-+CCC = $(CXX)
-+
- RANLIB = ranlib
-
- ifndef CPU_ARCH
-@@ -57,19 +57,25 @@
-
- ifeq (,$(filter-out i%86,$(CPU_ARCH)))
- ifdef USE_64
-+ifeq (,$(findstring -arch ,$(CC)))
- CC += -arch x86_64
-+endif
- override CPU_ARCH = x86_64
- else
- OS_REL_CFLAGS = -Di386
-+ifeq (,$(findstring -arch ,$(CC)))
- CC += -arch i386
-+endif
- override CPU_ARCH = x86
- endif
- else
- ifeq (arm,$(CPU_ARCH))
- # Nothing set for arm currently.
- else
- OS_REL_CFLAGS = -Dppc
-+ifeq (,$(findstring -arch ,$(CC)))
- CC += -arch ppc
-+endif
- endif
- endif
-
--- a/a/nss/coreconf/FreeBSD.mk 2009-11-23 05:06:29.000000000 -0500
+++ b/b/nss/coreconf/FreeBSD.mk 2012-08-28 20:27:20.000000000 -0400
@@ -57,6 +57,7 @@
@@ -186,23 +143,3 @@
endif
endif
---- a/a/nss/coreconf/Darwin.mk
-+++ b/b/nss/coreconf/Darwin.mk
-@@ -64,12 +64,16 @@
- endif
-
- ifneq (,$(MACOS_SDK_DIR))
-+ CLANG_VERSION_FULL := $(shell $(CC) -v 2>&1 | grep "clang version" | sed -e "s/^.*clang version[ ]*//" | awk '{ print $$1 }')
- GCC_VERSION_FULL := $(shell $(CC) -dumpversion)
- GCC_VERSION_MAJOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$1 }')
- GCC_VERSION_MINOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$2 }')
- GCC_VERSION = $(GCC_VERSION_MAJOR).$(GCC_VERSION_MINOR)
-+ ifneq (,$(CLANG_VERSION_FULL))
-+ DARWIN_SDK_CFLAGS = -isysroot $(MACOS_SDK_DIR)
-+ DARWIN_SDK_SHLIBFLAGS = -isysroot $(MACOS_SDK_DIR)
-
-- ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR)))
-+ else ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR)))
- # GCC <= 3
- DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks
- ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0))
diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch
index ce64074..ca625cb 100644
--- a/external/nss/nss_macosx.patch
+++ b/external/nss/nss_macosx.patch
@@ -56,6 +56,65 @@
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
--- a/a/nss/coreconf/Darwin.mk
+++ b/b/nss/coreconf/Darwin.mk
+@@ -39,8 +39,12 @@
+
+ DEFAULT_COMPILER = gcc
+
+-CC = gcc
+-CCC = g++
++# CC is taken from environment automatically.
++#CC = cc
++# Use CCC from environment.
++#CCC = c++
++CCC = $(CXX)
++
+ RANLIB = ranlib
+
+ ifndef CPU_ARCH
+@@ -57,19 +57,25 @@
+
+ ifeq (,$(filter-out i%86,$(CPU_ARCH)))
+ ifdef USE_64
++ifeq (,$(findstring -arch ,$(CC)))
+ CC += -arch x86_64
++endif
+ override CPU_ARCH = x86_64
+ else
+ OS_REL_CFLAGS = -Di386
++ifeq (,$(findstring -arch ,$(CC)))
+ CC += -arch i386
++endif
+ override CPU_ARCH = x86
+ endif
+ else
+ ifeq (arm,$(CPU_ARCH))
+ # Nothing set for arm currently.
+ else
+ OS_REL_CFLAGS = -Dppc
++ifeq (,$(findstring -arch ,$(CC)))
+ CC += -arch ppc
++endif
+ endif
+ endif
+
+@@ -64,12 +64,16 @@
+ endif
+
+ ifneq (,$(MACOS_SDK_DIR))
++ CLANG_VERSION_FULL := $(shell $(CC) -v 2>&1 | grep "clang version" | sed -e "s/^.*clang version[ ]*//" | awk '{ print $$1 }')
+ GCC_VERSION_FULL := $(shell $(CC) -dumpversion)
+ GCC_VERSION_MAJOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$1 }')
+ GCC_VERSION_MINOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$2 }')
+ GCC_VERSION = $(GCC_VERSION_MAJOR).$(GCC_VERSION_MINOR)
++ ifneq (,$(CLANG_VERSION_FULL))
++ DARWIN_SDK_CFLAGS = -isysroot $(MACOS_SDK_DIR)
++ DARWIN_SDK_SHLIBFLAGS = -isysroot $(MACOS_SDK_DIR)
+
+- ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR)))
++ else ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR)))
+ # GCC <= 3
+ DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks
+ ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0))
@@ -150,7 +150,7 @@
# May override this with different compatibility and current version numbers.
DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1
More information about the Libreoffice-commits
mailing list