[libreoffice] 01/01: fix build with curl 7.50.0
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to annotated tag libreoffice_5.2.0-1
in repository libreoffice.
commit d9bbb06f260318069cd22b1f4e6d83f04d5dd852
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jul 30 11:37:46 2016 +0200
fix build with curl 7.50.0
---
patches/curl-7.50.0.diff | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/patches/curl-7.50.0.diff b/patches/curl-7.50.0.diff
new file mode 100644
index 0000000..4a947d0
--- /dev/null
+++ b/patches/curl-7.50.0.diff
@@ -0,0 +1,23 @@
+From 0b8e589875ffd84150470832de18ebd79989efc0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Mon, 25 Jul 2016 12:08:35 +0100
+Subject: curl 7.50.0 has CURL as typedef struct Curl_easy
+
+Change-Id: I22e5e2cdf78c38087579071c1b1570a8adc7d3c4
+
+diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
+index be68d9a..315ccb7 100644
+--- a/ucb/source/ucp/ftp/ftploaderthread.cxx
++++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
+@@ -71,7 +71,7 @@ FTPLoaderThread::~FTPLoaderThread() {
+
+
+ CURL* FTPLoaderThread::handle() {
+- CURL* ret = osl_getThreadKeyData(m_threadKey);
++ CURL* ret = static_cast<CURL*>(osl_getThreadKeyData(m_threadKey));
+ if(!ret) {
+ ret = curl_easy_init();
+ if (ret != nullptr) {
+--
+cgit v0.10.2
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: