CVS commit: pkgsrc/misc/libreoffice

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jul 25 13:11:17 UTC 2016

Modified Files:
        pkgsrc/misc/libreoffice: distinfo
Added Files:
        pkgsrc/misc/libreoffice/patches:
            patch-ucb_source_ucp_ftp_ftploaderthread.cxx

Log Message:
Fix build with curl-7.50.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/libreoffice/patches/patch-ucb_source_ucp_ftp_ftploaderthread.cxx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.21 pkgsrc/misc/libreoffice/distinfo:1.22
--- pkgsrc/misc/libreoffice/distinfo:1.21       Thu Jun 23 20:12:23 2016
+++ pkgsrc/misc/libreoffice/distinfo    Mon Jul 25 13:11:17 2016
@@ -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
 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

Added files:

Index: pkgsrc/misc/libreoffice/patches/patch-ucb_source_ucp_ftp_ftploaderthread.cxx
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-ucb_source_ucp_ftp_ftploaderthread.cxx:1.1
--- /dev/null   Mon Jul 25 13:11:17 2016
+++ pkgsrc/misc/libreoffice/patches/patch-ucb_source_ucp_ftp_ftploaderthread.cxx        Mon Jul 25 13:11:17 2016
@@ -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) {