Mon Jul 25 13:11:17 2016 UTC ()
Fix build with curl-7.50.


(wiz)
diff -r1.21 -r1.22 pkgsrc/misc/libreoffice/distinfo
diff -r0 -r1.1 pkgsrc/misc/libreoffice/patches/patch-ucb_source_ucp_ftp_ftploaderthread.cxx
cvs diff -r1.21 -r1.22 pkgsrc/misc/libreoffice/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/distinfo 2016/06/23 20:12:23 1.21
+++ pkgsrc/misc/libreoffice/distinfo 2016/07/25 13:11:17 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.21 2016/06/23 20:12:23 ryoon Exp $ 1$NetBSD: distinfo,v 1.22 2016/07/25 13:11:17 wiz Exp $
2 2
3SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 3SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
4RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b 4RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
5SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 5SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
6Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes 6Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes
7SHA1 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 66ed8eac9bac2a23ba9e3a3b3d560609fa3acc25 7SHA1 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 66ed8eac9bac2a23ba9e3a3b3d560609fa3acc25
8RMD160 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 45c0fd5f41e82691dcdebdda87da78b0af529066 8RMD160 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 45c0fd5f41e82691dcdebdda87da78b0af529066
9SHA512 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 9bdc7e440809a9f6fed6dd5a8ba9bc41c029a3d59586bead442efed34a2288d23fade0aee889b4519781ef2d8283dbf0567be3dbdce51ce502f6c2c3450e4783 9SHA512 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 9bdc7e440809a9f6fed6dd5a8ba9bc41c029a3d59586bead442efed34a2288d23fade0aee889b4519781ef2d8283dbf0567be3dbdce51ce502f6c2c3450e4783
10Size (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 102916 bytes 10Size (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 102916 bytes
11SHA1 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 885cc4b6c9472d95e2515e777f6018a90657e974 11SHA1 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 885cc4b6c9472d95e2515e777f6018a90657e974
12RMD160 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = f3c180e878c68bb44fd9fc44b40c0e1ea480f266 12RMD160 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = f3c180e878c68bb44fd9fc44b40c0e1ea480f266
13SHA512 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 1107ac0ba3804ef5c9870a9359076cc48d0be4e6610287abf78b606519fc834b97dc0fff851cd680ade6327f4803e7232eaf462d9428ca20398ad397b714d8f8 13SHA512 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 1107ac0ba3804ef5c9870a9359076cc48d0be4e6610287abf78b606519fc834b97dc0fff851cd680ade6327f4803e7232eaf462d9428ca20398ad397b714d8f8
14Size (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 525299 bytes 14Size (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 525299 bytes
@@ -162,14 +162,15 @@ SHA512 (libreoffice/libreoffice-dictiona @@ -162,14 +162,15 @@ SHA512 (libreoffice/libreoffice-dictiona
162Size (libreoffice/libreoffice-dictionaries-5.1.4.2.tar.xz) = 38527860 bytes 162Size (libreoffice/libreoffice-dictionaries-5.1.4.2.tar.xz) = 38527860 bytes
163SHA1 (libreoffice/libreoffice-help-5.1.4.2.tar.xz) = fd6c0793677870b2778f26be4f5ded9ce0adab1e 163SHA1 (libreoffice/libreoffice-help-5.1.4.2.tar.xz) = fd6c0793677870b2778f26be4f5ded9ce0adab1e
164RMD160 (libreoffice/libreoffice-help-5.1.4.2.tar.xz) = 0cffab27f973bdc5284e9a0ea4c970db82831fe9 164RMD160 (libreoffice/libreoffice-help-5.1.4.2.tar.xz) = 0cffab27f973bdc5284e9a0ea4c970db82831fe9
165SHA512 (libreoffice/libreoffice-help-5.1.4.2.tar.xz) = a8af619dff4b873574afd4b6cfc930543ab58a449a5cfa4b76a0edf242e18a885b6cba1f1a660e9a07e902c367f1a305c2c525f2b0a70e99f56ae5303abef5fe 165SHA512 (libreoffice/libreoffice-help-5.1.4.2.tar.xz) = a8af619dff4b873574afd4b6cfc930543ab58a449a5cfa4b76a0edf242e18a885b6cba1f1a660e9a07e902c367f1a305c2c525f2b0a70e99f56ae5303abef5fe
166Size (libreoffice/libreoffice-help-5.1.4.2.tar.xz) = 1905160 bytes 166Size (libreoffice/libreoffice-help-5.1.4.2.tar.xz) = 1905160 bytes
167SHA1 (libreoffice/libreoffice-translations-5.1.4.2.tar.xz) = 305889a8531e2f3cf672d1eb938a230a9b83dd90 167SHA1 (libreoffice/libreoffice-translations-5.1.4.2.tar.xz) = 305889a8531e2f3cf672d1eb938a230a9b83dd90
168RMD160 (libreoffice/libreoffice-translations-5.1.4.2.tar.xz) = b76e0a6c19c366bb3fb463407f1bb745cf83cbaa 168RMD160 (libreoffice/libreoffice-translations-5.1.4.2.tar.xz) = b76e0a6c19c366bb3fb463407f1bb745cf83cbaa
169SHA512 (libreoffice/libreoffice-translations-5.1.4.2.tar.xz) = 86b852ff20806950c9b89e41c3344cfa9ab256c4a055f590cf7023f6e8386c522272c037dbef1af1c6d4d4ef705cf0e5987cec263fd045321a837aced179c26d 169SHA512 (libreoffice/libreoffice-translations-5.1.4.2.tar.xz) = 86b852ff20806950c9b89e41c3344cfa9ab256c4a055f590cf7023f6e8386c522272c037dbef1af1c6d4d4ef705cf0e5987cec263fd045321a837aced179c26d
170Size (libreoffice/libreoffice-translations-5.1.4.2.tar.xz) = 131740248 bytes 170Size (libreoffice/libreoffice-translations-5.1.4.2.tar.xz) = 131740248 bytes
171SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = e3223111488a6ebabf66ae74c3b6c30095fd2294 171SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = e3223111488a6ebabf66ae74c3b6c30095fd2294
172SHA1 (patch-configure.ac) = fe603f79587b66fcd56f105330359526384e6e58 172SHA1 (patch-configure.ac) = fe603f79587b66fcd56f105330359526384e6e58
173SHA1 (patch-solenv_gbuild_AllLangResTarget.mk) = 75af6e02b29bf1dfc619bda9cd5674f19adf2c95 173SHA1 (patch-solenv_gbuild_AllLangResTarget.mk) = 75af6e02b29bf1dfc619bda9cd5674f19adf2c95
174SHA1 (patch-solenv_gbuild_Module.mk) = 45d5b2c41b468bb071253ae0f78d01d535662c40 174SHA1 (patch-solenv_gbuild_Module.mk) = 45d5b2c41b468bb071253ae0f78d01d535662c40
 175SHA1 (patch-ucb_source_ucp_ftp_ftploaderthread.cxx) = 7f0c472fd5395610ca352463acb1029d3349668c
175SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb 176SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb
File Added: pkgsrc/misc/libreoffice/patches/Attic/patch-ucb_source_ucp_ftp_ftploaderthread.cxx
$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) {