| 1 |
commit: 9c1e96216f410c4ab68dd91b575609cde1d9c842 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 26 07:39:17 2016 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 26 07:39:17 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c1e9621 |
| 7 |
|
| 8 |
app-office/libreoffice: Fixed building with >=net-misc/curl-7.50.0 |
| 9 |
|
| 10 |
Gentoo bug #589578 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.0 |
| 13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/libreoffice-curl-7.50.0.patch | 23 ++++++++++++++++++++++ |
| 16 |
app-office/libreoffice/libreoffice-5.1.4.2.ebuild | 1 + |
| 17 |
2 files changed, 24 insertions(+) |
| 18 |
|
| 19 |
diff --git a/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch b/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..4a947d0 |
| 22 |
--- /dev/null |
| 23 |
+++ b/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch |
| 24 |
@@ -0,0 +1,23 @@ |
| 25 |
+From 0b8e589875ffd84150470832de18ebd79989efc0 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@××××××.com> |
| 27 |
+Date: Mon, 25 Jul 2016 12:08:35 +0100 |
| 28 |
+Subject: curl 7.50.0 has CURL as typedef struct Curl_easy |
| 29 |
+ |
| 30 |
+Change-Id: I22e5e2cdf78c38087579071c1b1570a8adc7d3c4 |
| 31 |
+ |
| 32 |
+diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx |
| 33 |
+index be68d9a..315ccb7 100644 |
| 34 |
+--- a/ucb/source/ucp/ftp/ftploaderthread.cxx |
| 35 |
++++ b/ucb/source/ucp/ftp/ftploaderthread.cxx |
| 36 |
+@@ -71,7 +71,7 @@ FTPLoaderThread::~FTPLoaderThread() { |
| 37 |
+ |
| 38 |
+ |
| 39 |
+ CURL* FTPLoaderThread::handle() { |
| 40 |
+- CURL* ret = osl_getThreadKeyData(m_threadKey); |
| 41 |
++ CURL* ret = static_cast<CURL*>(osl_getThreadKeyData(m_threadKey)); |
| 42 |
+ if(!ret) { |
| 43 |
+ ret = curl_easy_init(); |
| 44 |
+ if (ret != nullptr) { |
| 45 |
+-- |
| 46 |
+cgit v0.10.2 |
| 47 |
+ |
| 48 |
|
| 49 |
diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild |
| 50 |
index 52653526..c0c2792 100644 |
| 51 |
--- a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild |
| 52 |
+++ b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild |
| 53 |
@@ -244,6 +244,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 54 |
PATCHES=( |
| 55 |
# from 5.2 branch |
| 56 |
"${FILESDIR}/${PN}-5.1.4.2-gcc6.patch" |
| 57 |
+ "${FILESDIR}/${PN}-curl-7.50.0.patch" |
| 58 |
|
| 59 |
# not upstreamable stuff |
| 60 |
"${FILESDIR}/${PN}-4.4-system-pyuno.patch" |
Archives