diff options
| author | wiz <wiz@pkgsrc.org> | 2016-07-25 13:11:17 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2016-07-25 13:11:17 +0000 |
| commit | a4b81930f31b0918c4686325b90054375755ee41 (patch) | |
| tree | 46e1603067331207372fd846553b72ef167c4e6e /misc/libreoffice | |
| parent | c397f103c899ccd87b17b898cb99fa4eda90e3c1 (diff) | |
| download | pkgsrc-a4b81930f31b0918c4686325b90054375755ee41.tar.gz | |
Fix build with curl-7.50.
Diffstat (limited to 'misc/libreoffice')
| -rw-r--r-- | misc/libreoffice/distinfo | 3 | ||||
| -rw-r--r-- | misc/libreoffice/patches/patch-ucb_source_ucp_ftp_ftploaderthread.cxx | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/misc/libreoffice/distinfo b/misc/libreoffice/distinfo index 444d7c2dbde..406f050f8f8 100644 --- a/misc/libreoffice/distinfo +++ b/misc/libreoffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2016/06/23 20:12:23 ryoon Exp $ +$NetBSD: distinfo,v 1.22 2016/07/25 13:11:17 wiz Exp $ SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b @@ -172,4 +172,5 @@ SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = e3223111488 SHA1 (patch-configure.ac) = fe603f79587b66fcd56f105330359526384e6e58 SHA1 (patch-solenv_gbuild_AllLangResTarget.mk) = 75af6e02b29bf1dfc619bda9cd5674f19adf2c95 SHA1 (patch-solenv_gbuild_Module.mk) = 45d5b2c41b468bb071253ae0f78d01d535662c40 +SHA1 (patch-ucb_source_ucp_ftp_ftploaderthread.cxx) = 7f0c472fd5395610ca352463acb1029d3349668c SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb diff --git a/misc/libreoffice/patches/patch-ucb_source_ucp_ftp_ftploaderthread.cxx b/misc/libreoffice/patches/patch-ucb_source_ucp_ftp_ftploaderthread.cxx new file mode 100644 index 00000000000..a8cf448ae9f --- /dev/null +++ b/misc/libreoffice/patches/patch-ucb_source_ucp_ftp_ftploaderthread.cxx @@ -0,0 +1,15 @@ +$NetBSD: patch-ucb_source_ucp_ftp_ftploaderthread.cxx,v 1.1 2016/07/25 13:11:17 wiz Exp $ + +Add cast to fix build with curl-7.50. + +--- ucb/source/ucp/ftp/ftploaderthread.cxx.orig 2016-06-14 20:05:10.000000000 +0000 ++++ ucb/source/ucp/ftp/ftploaderthread.cxx +@@ -79,7 +79,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) { |