diff --git a/0001-curl-7.50.0-has-CURL-as-typedef-struct-Curl_easy.patch b/0001-curl-7.50.0-has-CURL-as-typedef-struct-Curl_easy.patch new file mode 100644 index 0000000..43c9afa --- /dev/null +++ b/0001-curl-7.50.0-has-CURL-as-typedef-struct-Curl_easy.patch @@ -0,0 +1,27 @@ +From 90cdadc9497e12d2e0376a368c5bcf50e275bc57 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 25 Jul 2016 12:08:35 +0100 +Subject: [PATCH] curl 7.50.0 has CURL as typedef struct Curl_easy + +Change-Id: I22e5e2cdf78c38087579071c1b1570a8adc7d3c4 +(cherry picked from commit 0b8e589875ffd84150470832de18ebd79989efc0) +--- + ucb/source/ucp/ftp/ftploaderthread.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx +index 25bc26d..5d1cfb5 100644 +--- a/ucb/source/ucp/ftp/ftploaderthread.cxx ++++ b/ucb/source/ucp/ftp/ftploaderthread.cxx +@@ -77,7 +77,7 @@ FTPLoaderThread::~FTPLoaderThread() { + + + CURL* FTPLoaderThread::handle() { +- CURL* ret = osl_getThreadKeyData(m_threadKey); ++ CURL* ret = static_cast(osl_getThreadKeyData(m_threadKey)); + if(!ret) { + ret = curl_easy_init(); + if (ret != nullptr) { +-- +2.7.4 + diff --git a/libreoffice.spec b/libreoffice.spec index d5119ba..8098948 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -242,6 +242,7 @@ Patch12: 0001-Resolves-rhbz-1352965-gtk3-infinite-clipboard-recurs.patch Patch13: 0001-rhbz-1351292-correctly-set-edit-mode.patch Patch14: 0001-Related-rhbz-1351369-gtk3-clipboards-have-to-live-to.patch Patch15: 0001-Related-rhbz-1065807-recover-using-xdg-templates-and.patch +Patch16: 0001-curl-7.50.0-has-CURL-as-typedef-struct-Curl_easy.patch %if 0%{?rhel} # not upstreamed