[libreoffice-online] 01/01: fix build with poco 1.8

Rene Engelhard rene at moszumanska.debian.org
Mon Nov 13 19:27:12 UTC 2017


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

rene pushed a commit to branch master
in repository libreoffice-online.

commit 69893f1d42c4478a73daf671f393b03d988a5520
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Nov 13 20:27:00 2017 +0100

    fix build with poco 1.8
---
 debian/changelog             |  2 +-
 debian/patches/poco-1.8.diff | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cf0093f..8b844e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ libreoffice-online (5.4.2.2-1) UNRELEASED; urgency=medium
 
   * Initial release. (closes: #787080)
 
- -- Rene Engelhard <rene at debian.org>  Sun, 12 Nov 2017 00:06:43 +0100
+ -- Rene Engelhard <rene at debian.org>  Mon, 13 Nov 2017 20:26:21 +0100
diff --git a/debian/patches/poco-1.8.diff b/debian/patches/poco-1.8.diff
new file mode 100644
index 0000000..f57d188
--- /dev/null
+++ b/debian/patches/poco-1.8.diff
@@ -0,0 +1,32 @@
+From 623b45a533198acc3ef7a393382f23ebb0f6ebab Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene at rene-engelhard.de>
+Date: Mon, 13 Nov 2017 20:20:00 +0100
+Subject: [PATCH] fix build with poco 1.8.0(.1)
+
+---
+ common/UnitHTTP.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/common/UnitHTTP.hpp b/common/UnitHTTP.hpp
+index 0343036f..a6a107d9 100644
+--- a/common/UnitHTTP.hpp
++++ b/common/UnitHTTP.hpp
+@@ -82,13 +82,13 @@ public:
+     {
+         return _dummyStream;
+     }
+-#if POCO_VERSION < 0x02000000
++#if POCO_VERSION < 0x01080000
+     virtual bool expectContinue() const override
+     {
+         return false;
+     }
+ #endif
+-#if POCO_VERSION >= 0x02000000
++#if POCO_VERSION >= 0x01080000
+     virtual bool secure() const override
+     {
+         return true;
+-- 
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 4e568c6..5842888 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ no-werror.diff
 etc-default.diff
 ssl-dir.diff
 logs.diff
+poco-1.8.diff

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



More information about the Pkg-openoffice-commits mailing list