Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5fbfd87bc054c0773983b2f6b03c3aa3470ff522
commit 5fbfd87bc054c0773983b2f6b03c3aa3470ff522 Author: DeX77 <[email protected]> Date: Tue Jul 26 14:23:50 2016 +0200 libreoffice-5.1.4.2-2-x86_64 * rebduild with glew 2.0.0 + add patch to build with curl 7.50 diff --git a/source/xoffice/libreoffice/0005-curl-7.50.0-has-CURL-as-typedef-struct-Curl_easy.patch b/source/xoffice/libreoffice/0005-curl-7.50.0-has-CURL-as-typedef-struct-Curl_easy.patch new file mode 100644 index 0000000..43c9afa --- /dev/null +++ b/source/xoffice/libreoffice/0005-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?= <[email protected]> +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<CURL*>(osl_getThreadKeyData(m_threadKey)); + if(!ret) { + ret = curl_easy_init(); + if (ret != nullptr) { +-- +2.7.4 + diff --git a/source/xoffice/libreoffice/FrugalBuild b/source/xoffice/libreoffice/FrugalBuild index 0eff287..a0d3355 100644 --- a/source/xoffice/libreoffice/FrugalBuild +++ b/source/xoffice/libreoffice/FrugalBuild @@ -6,7 +6,7 @@ pkgname=libreoffice pkgver=5.1.4.2 minor=${pkgver:0:5} # x.y.z major=${pkgver:0:3} # x.y -pkgrel=1 +pkgrel=2 pkgdesc="Free Software Productivity Suite" url="http://www.libreoffice.org/"; Finclude gnome-scriptlet @@ -19,7 +19,7 @@ depends=( 'expat' 'flex' 'fontconfig' - 'glew>=1.13' + 'glew>=2.0.0' 'graphite2' 'hyphen' 'libabw' @@ -97,6 +97,7 @@ source=( 0002-reduce-copypasta.patch 0003-detect-Boost.Filesystem.patch 0004-define-boost_filestystem-external-for-system-boost-t.patch + 0005-curl-7.50.0-has-CURL-as-typedef-struct-Curl_easy.patch ) signatures=( '' @@ -104,6 +105,7 @@ signatures=( '' '' '' + '' ) for i in "${modules[@]}" do _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
