[libreoffice] 01/01: remove obsolete GCC-6-PR69273-workaround.diff
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 475c3e37287c1347221fcb1052236d9b47cf0d2c
Author: Rene Engelhard <rene@debian.org>
Date: Wed Apr 20 13:59:31 2016 +0200
remove obsolete GCC-6-PR69273-workaround.diff
---
changelog | 5 +++-
patches/GCC-6-PR69273-workaround.diff | 50 -----------------------------------
patches/series | 1 -
3 files changed, 4 insertions(+), 52 deletions(-)
diff --git a/changelog b/changelog
index 2f5c6b1..6908b31 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,10 @@
-libreoffice (1:5.1.3~rc1-1) UNRELEASED; urgency=medium
+libreoffice (1:5.1.3~rc1-1) unstable; urgency=medium
* New upstream release candidate
+ * debian/patcches/GCC-6-PR69273-workaround.diff: remove; AFAICS gcc is
+ fixed
+
* debian/rules:
- (temporarily) bump libgtk-3-dev build-dep to >= 3.20~ to ensure
we build against 3.20
diff --git a/patches/GCC-6-PR69273-workaround.diff b/patches/GCC-6-PR69273-workaround.diff
deleted file mode 100644
index 7297a4c..0000000
--- a/patches/GCC-6-PR69273-workaround.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-From 772ae03e1e680106dcdd08fae51d15d9df7c7931 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Wed, 20 Jan 2016 09:34:57 +0100
-Subject: [PATCH 1/2] GCC 6 PR69273 workaround
-
-see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69273>
-
-Change-Id: I4a9ba50f68f3f08f878c530f05a18b2b63f29b2a
----
- sc/source/filter/oox/autofiltercontext.cxx | 3 ++-
- sc/source/filter/oox/pivottablefragment.cxx | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/sc/source/filter/oox/autofiltercontext.cxx b/sc/source/filter/oox/autofiltercontext.cxx
-index 11f0da8..671de7e 100644
---- a/sc/source/filter/oox/autofiltercontext.cxx
-+++ b/sc/source/filter/oox/autofiltercontext.cxx
-@@ -35,10 +35,11 @@ FilterSettingsContext::FilterSettingsContext( WorksheetContextBase& rParent, Fil
-
- ContextHandlerRef FilterSettingsContext::onCreateContext( sal_Int32 nElement, const AttributeList& /*rAttribs*/ )
- {
-+ ContextHandlerRef gcc_pr69273_workaround(this);
- switch( getCurrentElement() )
- {
- case XLS_TOKEN( filters ):
-- if( nElement == XLS_TOKEN( filter ) ) return this;
-+ if( nElement == XLS_TOKEN( filter ) ) return gcc_pr69273_workaround;
- break;
- case XLS_TOKEN( customFilters ):
- if( nElement == XLS_TOKEN( customFilter ) ) return this;
-diff --git a/sc/source/filter/oox/pivottablefragment.cxx b/sc/source/filter/oox/pivottablefragment.cxx
-index ca26708..fc4817d 100644
---- a/sc/source/filter/oox/pivottablefragment.cxx
-+++ b/sc/source/filter/oox/pivottablefragment.cxx
-@@ -113,10 +113,11 @@ PivotTableFilterContext::PivotTableFilterContext( WorksheetFragmentBase& rFragme
-
- ContextHandlerRef PivotTableFilterContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs )
- {
-+ ContextHandlerRef gcc_pr69273_workaround(this);
- switch( getCurrentElement() )
- {
- case XLS_TOKEN( filter ):
-- if( nElement == XLS_TOKEN( autoFilter ) ) return this;
-+ if( nElement == XLS_TOKEN( autoFilter ) ) return gcc_pr69273_workaround;
- break;
- case XLS_TOKEN( autoFilter ):
- if( nElement == XLS_TOKEN( filterColumn ) ) return this;
---
-2.4.3
-
diff --git a/patches/series b/patches/series
index 60ef4dd..dbaa342 100644
--- a/patches/series
+++ b/patches/series
@@ -31,7 +31,6 @@ rsc-no-error-about-unknown-switch.diff
debian-branding.diff
disable-npapi-plugin-support.diff
gcc-6.diff
-GCC-6-PR69273-workaround.diff
bash-completion-dir.diff
OPENCL_DLL_NAME.diff
no-packagekit-per-default.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: