[arch-commits] Commit in libreoffice-still/trunk (PKGBUILD buildfix.diff)

[Andreas Radke]

    Date: Monday, August 1, 2016 @ 03:38:31
  Author: andyrtr
Revision: 272766

fix build with new curl

Added:
  libreoffice-still/trunk/buildfix.diff
Modified:
  libreoffice-still/trunk/PKGBUILD

---------------+
 PKGBUILD      |   11 ++++++++---
 buildfix.diff |   27 +++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-31 22:44:11 UTC (rev 272765)
+++ PKGBUILD	2016-08-01 03:38:31 UTC (rev 272766)
@@ -6,7 +6,7 @@
 pkgname=('libreoffice-still-sdk' 'libreoffice-still')
 _LOver=5.0.6.3
 pkgver=5.0.6
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -65,7 +65,8 @@
 	libreoffice-still.sh libreoffice-still.csh
 	gcc6_buildfix.diff
 	fix_gcc_build_error.diff
-	hunspell14_buildfix.diff)
+	hunspell14_buildfix.diff
+	buildfix.diff)
 noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
 	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -144,7 +145,8 @@
          'f82232620f3e27d1532c49af4b36ce9a'
          '6752d22fc5bcbdbef0640c6aca163e50'
          '60a6a9bf86bbcefa8c712dc8ba8ab73f'
-         '2afac5aa93f7bcd85058348147c962e4')
+         '2afac5aa93f7bcd85058348147c962e4'
+         'd386f3a0b484cd3929329a294159f5bc')
 
 prepare() {
 	cd libreoffice-$_LOver
@@ -155,6 +157,9 @@
 		ln -s ${srcdir}/$source .
 	done
 	popd
+	
+	# https://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-5-2&id=e13db0f16c4ac5a243587e881d7b18979d07f478
+	patch -Np1 -i ../buildfix.diff
 
 	# unowinreg.dll must be a file not a symlink or the result will become a broken symlink
 	# /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll

Added: buildfix.diff
===================================================================
--- buildfix.diff	                        (rev 0)
+++ buildfix.diff	2016-08-01 03:38:31 UTC (rev 272766)
@@ -0,0 +1,27 @@
+From e13db0f16c4ac5a243587e881d7b18979d07f478 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at 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
+(cherry picked from commit 0b8e589875ffd84150470832de18ebd79989efc0)
+Reviewed-on: https://gerrit.libreoffice.org/27513
+Reviewed-by: David Tardon <dtardon at redhat.com>
+Tested-by: Jenkins <ci at libreoffice.org>
+
+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<CURL*>(osl_getThreadKeyData(m_threadKey));
+     if(!ret) {
+         ret = curl_easy_init();
+         if (ret != nullptr) {
+-- 
+cgit v0.10.2
+