From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 03DE113832E for ; Tue, 26 Jul 2016 07:39:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 07D40E08C7; Tue, 26 Jul 2016 07:39:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96391E08C7 for ; Tue, 26 Jul 2016 07:39:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AEFE6340CAA for ; Tue, 26 Jul 2016 07:39:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C58EFE6B for ; Tue, 26 Jul 2016 07:39:24 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1469518757.9c1e96216f410c4ab68dd91b575609cde1d9c842.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/files/libreoffice-curl-7.50.0.patch app-office/libreoffice/libreoffice-5.1.4.2.ebuild X-VCS-Directories: app-office/libreoffice/ app-office/libreoffice/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 9c1e96216f410c4ab68dd91b575609cde1d9c842 X-VCS-Branch: master Date: Tue, 26 Jul 2016 07:39:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 11359e67-e157-4af1-9f56-6266bb508631 X-Archives-Hash: a71308d0538699a21ae2e906159b859b commit: 9c1e96216f410c4ab68dd91b575609cde1d9c842 Author: Lars Wendler gentoo org> AuthorDate: Tue Jul 26 07:39:17 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Jul 26 07:39:17 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c1e9621 app-office/libreoffice: Fixed building with >=net-misc/curl-7.50.0 Gentoo bug #589578 Package-Manager: portage-2.3.0 Signed-off-by: Lars Wendler gentoo.org> .../files/libreoffice-curl-7.50.0.patch | 23 ++++++++++++++++++++++ app-office/libreoffice/libreoffice-5.1.4.2.ebuild | 1 + 2 files changed, 24 insertions(+) diff --git a/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch b/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch new file mode 100644 index 0000000..4a947d0 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch @@ -0,0 +1,23 @@ +From 0b8e589875ffd84150470832de18ebd79989efc0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 25 Jul 2016 12:08:35 +0100 +Subject: curl 7.50.0 has CURL as typedef struct Curl_easy + +Change-Id: I22e5e2cdf78c38087579071c1b1570a8adc7d3c4 + +diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx +index be68d9a..315ccb7 100644 +--- a/ucb/source/ucp/ftp/ftploaderthread.cxx ++++ b/ucb/source/ucp/ftp/ftploaderthread.cxx +@@ -71,7 +71,7 @@ FTPLoaderThread::~FTPLoaderThread() { + + + CURL* FTPLoaderThread::handle() { +- CURL* ret = osl_getThreadKeyData(m_threadKey); ++ CURL* ret = static_cast(osl_getThreadKeyData(m_threadKey)); + if(!ret) { + ret = curl_easy_init(); + if (ret != nullptr) { +-- +cgit v0.10.2 + diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild index 52653526..c0c2792 100644 --- a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild +++ b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild @@ -244,6 +244,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} PATCHES=( # from 5.2 branch "${FILESDIR}/${PN}-5.1.4.2-gcc6.patch" + "${FILESDIR}/${PN}-curl-7.50.0.patch" # not upstreamable stuff "${FILESDIR}/${PN}-4.4-system-pyuno.patch"