[libreoffice] 01/02: back to master;: remove obsolete patches

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 4df02348f80b44792dfc2e08b786a1056cbfd919
Author: Rene Engelhard <rene at debian.org>
Date:   Thu May 11 19:24:15 2017 +0200

    back to master;: remove obsolete patches
---
 changelog                                   |  6 +++++
 patches/fix-disable-pdfium-build.diff       | 16 -------------
 patches/fix-enable-mergelibs-build.diff     | 35 -----------------------------
 patches/fix-wpft-impress-test-filename.diff | 23 -------------------
 patches/series                              |  3 ---
 source/include-binaries                     |  2 +-
 6 files changed, 7 insertions(+), 78 deletions(-)

diff --git a/changelog b/changelog
index 81dcd2e..9871aff 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.4.0~beta1~git20170510-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot
+
+ -- Rene Engelhard <rene at debian.org>  Sat, 06 May 2017 17:24:08 +0200
+
 libreoffice (1:5.4.0~alpha1-1) experimental; urgency=medium
 
   * New upstream alpha release
diff --git a/patches/fix-disable-pdfium-build.diff b/patches/fix-disable-pdfium-build.diff
deleted file mode 100644
index 609bc84..0000000
--- a/patches/fix-disable-pdfium-build.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
-index d3fafeb7e4ec..771a9ec848d2 100644
---- a/xmlsecurity/Module_xmlsecurity.mk
-+++ b/xmlsecurity/Module_xmlsecurity.mk
-@@ -47,9 +47,11 @@ $(eval $(call gb_Module_add_screenshot_targets,xmlsecurity,\
- 
- ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
- 
-+ifneq (,$(filter PDFIUM,$(BUILD_TYPE)))
- $(eval $(call gb_Module_add_targets,xmlsecurity,\
-     Executable_pdfverify \
- ))
-+endif
- 
- endif
- 
diff --git a/patches/fix-enable-mergelibs-build.diff b/patches/fix-enable-mergelibs-build.diff
deleted file mode 100644
index 42eaa83..0000000
--- a/patches/fix-enable-mergelibs-build.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-From 974d48b9b8d12eecbe83a5a741c6ac729794309f Mon Sep 17 00:00:00 2001
-From: Michael Stahl <mstahl at redhat.com>
-Date: Fri, 28 Apr 2017 21:51:59 +0200
-Subject: xmloff: fix --enable-mergedlibs build
-
-multiple definition of `toBool(rtl::OUString const&)' since
-commit 836c9bbb6486e9c0c81de9d7534b934699131d3d
-
-Change-Id: I6a3e6a4e8a2af3c37f925cbdd684b8a99c088b1c
-
-diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx
-index 88fb3e3..c335197 100644
---- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
-+++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
-@@ -78,6 +78,8 @@ XFormsSubmissionContext::XFormsSubmissionContext(
-     xModel->getSubmissions()->insert( makeAny( mxSubmission ) );
- }
- 
-+namespace {
-+
- Any toBool( const OUString& rValue )
- {
-     Any aValue;
-@@ -89,6 +91,8 @@ Any toBool( const OUString& rValue )
-     return aValue;
- }
- 
-+} // namespace
-+
- void XFormsSubmissionContext::HandleAttribute( sal_uInt16 nToken,
-                                                const OUString& rValue )
- {
--- 
-cgit v0.10.2
-
diff --git a/patches/fix-wpft-impress-test-filename.diff b/patches/fix-wpft-impress-test-filename.diff
deleted file mode 100644
index f58716e..0000000
--- a/patches/fix-wpft-impress-test-filename.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From 9daa6e293d24694cb6102a15f228a6c008acf79d Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Tue, 2 May 2017 23:07:45 +0200
-Subject: fix file name
-
-Change-Id: I43f4f0281d83c402fb7ced9fe0b01ef8a59d7aa5
-
-diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
-index ebcc1f1..2da1195 100644
---- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
-+++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
-@@ -43,7 +43,7 @@ void WpftImpressFilterTest::test()
-         {"PowerPoint_Mac_1", REQUIRE_MWAW_VERSION(0, 3, 9)},
-         {"PowerPoint_Mac_2", REQUIRE_MWAW_VERSION(0, 3, 9)},
-         {"PowerPoint_Mac_3", REQUIRE_MWAW_VERSION(0, 3, 9)},
--        {"PowerPoint_Mac_4", REQUIRE_MWAW_VERSION(0, 3, 10)},
-+        {"PowerPoint_Mac_4.ppt", REQUIRE_MWAW_VERSION(0, 3, 10)},
-         {"PowerPoint_2.ppt", REQUIRE_MWAW_VERSION(0, 3, 10)},
-         {"PowerPoint_3.ppt", REQUIRE_MWAW_VERSION(0, 3, 9)},
-         {"PowerPoint_4.ppt", REQUIRE_MWAW_VERSION(0, 3, 10)},
--- 
-cgit v0.10.2
-
diff --git a/patches/series b/patches/series
index 45cd6cb..3337797 100644
--- a/patches/series
+++ b/patches/series
@@ -28,7 +28,4 @@ debian-branding.diff
 no-packagekit-per-default.diff
 system-officeotron-and-odfvalidator.diff
 no-openssl.diff
-fix-disable-pdfium-build.diff
-fix-enable-mergelibs-build.diff
-fix-wpft-impress-test-filename.diff
 disable-sc_subsequent_filters_test-with-internal-cppunit.diff
diff --git a/source/include-binaries b/source/include-binaries
index 7b912a2..1cbc71c 100644
--- a/source/include-binaries
+++ b/source/include-binaries
@@ -4,5 +4,5 @@ desktop/test/deployment/update/platform/linux_sparc64.oxt
 tarballs/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 tarballs/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-tarballs/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
+tarballs/xmlsec1-1.2.24.tar.gz
 tarballs/pdfium-3064.tar.bz2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git