[libreoffice] 01/04: git update; update gcc-6.diff; add shlibs override for internal liblangtag
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit 6dbde181131e5ccd566a7f0cfaeb1f7b32f655c3
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jan 25 18:26:45 2016 +0100
git update; update gcc-6.diff; add shlibs override for internal liblangtag
---
changelog | 6 +++
patches/gcc-6.diff | 97 ----------------------------------------------
rules | 3 ++
shlibs.override.liblangtag | 1 +
4 files changed, 10 insertions(+), 97 deletions(-)
diff --git a/changelog b/changelog
index c86f6cb..533ebb4 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.1.1~rc1~git20160125-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene@debian.org> Sat, 19 Dec 2015 01:50:15 +0100
+
libreoffice (1:5.1.0~rc3-1) experimental; urgency=medium
* New upstream release candidate
diff --git a/patches/gcc-6.diff b/patches/gcc-6.diff
index d69e11b..580432f 100644
--- a/patches/gcc-6.diff
+++ b/patches/gcc-6.diff
@@ -88,100 +88,3 @@ index aa65234..b2b1ba8 100644
--
cgit v0.10.2
-From 96fea1a05d2cfb0173f292f59018c997d2f63c89 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Tue, 19 Jan 2016 10:46:13 +0100
-Subject: Make enumarray_iterator adhere to iterator requirements
-
-...or else using it with GCC 6 libstdc++ std::find causes compilation failures
-
-Change-Id: I95e674922348f72fab6da8f049b2b4fcbdc74d07
-
-diff --git a/include/o3tl/enumarray.hxx b/include/o3tl/enumarray.hxx
-index a6861c1..c264c2f 100644
---- a/include/o3tl/enumarray.hxx
-+++ b/include/o3tl/enumarray.hxx
-@@ -22,6 +22,7 @@
-
- #include <sal/config.h>
- #include <iterator>
-+#include <type_traits>
-
- namespace o3tl {
-
-@@ -86,7 +87,10 @@ public:
- typedef typename EA::value_type value_type;
- typedef typename EA::key_type key_type;
- typedef std::bidirectional_iterator_tag iterator_category; //should be random access, but that would require define subtraction operators on the enums
-- typedef typename EA::key_type difference_type;
-+ typedef
-+ typename std::make_signed<
-+ typename std::underlying_type<typename EA::key_type>::type>::type
-+ difference_type;
- typedef typename EA::value_type* pointer;
- typedef typename EA::value_type& reference;
-
-@@ -95,8 +99,8 @@ public:
- value_type &operator*() { return (*m_buf)[static_cast<key_type>(m_pos)]; }
- value_type *operator->() { return &(operator*()); }
- self_type &operator++() { ++m_pos; return *this; }
-- bool operator!=(const self_type& other) { return m_buf != other.m_buf || m_pos != other.m_pos; }
-- bool operator==(const self_type& other) { return m_buf == other.m_buf && m_pos == other.m_pos; }
-+ bool operator!=(const self_type& other) const { return m_buf != other.m_buf || m_pos != other.m_pos; }
-+ bool operator==(const self_type& other) const { return m_buf == other.m_buf && m_pos == other.m_pos; }
- };
-
- }; // namespace o3tl
---
-cgit v0.10.2
-
-From 8d1a24dae03690b576310e3539369916f31ac475 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Tue, 19 Jan 2016 10:58:44 +0100
-Subject: Make virtual ~ScValidationDlg non-inline
-
-...otherwise, GCC 6 would aggressively inline ScValidationDlg destruction of the
-VclPtr<ScValidationDlg> in ScValidityRefChildWin::ScValidityRefChildWin
-(sc/source/ui/view/reffact.cxx, in sc library), checking whether the vtable
-points at ~ScValidationDlg (instead of a derived class dtor) to directly inline
-the ~ScValidationDlg code, which requires the ScValidateionDlg vtable (to store
-it in the object's vtable during destruction), which requires the code of inline
-virtual ScValidationDlg::dispose and ScValidationDlg::Close, which in turn need
-the addresses of (non-inline) ScValidationDlg::RemoveRefDlg and
-ScTPValidationValue::RemoveRefDlg, both defined in the scui library and not
-exported from there.
-
-Change-Id: I7eb96f42deb5edd844d91e999aa5511679302c01
-
-diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
-index 459c5d7..db73012 100644
---- a/sc/source/ui/dbgui/validate.cxx
-+++ b/sc/source/ui/dbgui/validate.cxx
-@@ -96,6 +96,11 @@ ScValidationDlg::ScValidationDlg(vcl::Window* pParent, const SfxItemSet* pArgSet
- get(m_pHBox, "refinputbox");
- }
-
-+ScValidationDlg::~ScValidationDlg()
-+{
-+ disposeOnce();
-+}
-+
- void ScTPValidationValue::SetReferenceHdl( const ScRange&rRange , ScDocument* pDoc )
- {
- if ( rRange.aStart != rRange.aEnd )
-diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
-index 2ef7738..8849557 100644
---- a/sc/source/ui/inc/validate.hxx
-+++ b/sc/source/ui/inc/validate.hxx
-@@ -176,7 +176,7 @@ class ScValidationDlg
-
- public:
- explicit ScValidationDlg( vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell * pTabViewSh, SfxBindings *pB = nullptr );
-- virtual ~ScValidationDlg() { disposeOnce(); }
-+ virtual ~ScValidationDlg();
- virtual void dispose() override
- {
- if( m_bOwnRefHdlr )
---
-cgit v0.10.2
-
diff --git a/rules b/rules
index 4c7df77..e07f327 100755
--- a/rules
+++ b/rules
@@ -3273,6 +3273,9 @@ endif
ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
cat debian/shlibs.override.orcus >> debian/shlibs.local
endif
+ifeq (,$(filter liblangtag, $(SYSTEM_STUFF)))
+ cat debian/shlibs.override.liblangtag >> debian/shlibs.local
+endif
# we need to do it in two steps. The new dpkg-shlibdeps doesn't find
# /usr/lib/libgcj-bc.so when specifying -l$(GCJ_JAWT_DIR)
# and therefore we must not use it for -gcj. But we *do* need it
diff --git a/shlibs.override.liblangtag b/shlibs.override.liblangtag
new file mode 100644
index 0000000..e426070
--- /dev/null
+++ b/shlibs.override.liblangtag
@@ -0,0 +1 @@
+liblangtag-lo 1
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: