From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1040334-garchives=archives.gentoo.org@lists.gentoo.org>
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 12479138334
for <garchives@archives.gentoo.org>; Sat, 4 Aug 2018 12:04:17 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B7C83E07ED;
Sat, 4 Aug 2018 12:04:15 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0715CE07ED
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Aug 2018 12:04:14 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 5EB40335CD5
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Aug 2018 12:04:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3ED43379
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Aug 2018 12:04:10 +0000 (UTC)
From: "Amy Liffey" <amynka@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Amy Liffey" <amynka@gentoo.org>
Message-ID: <1533384220.24b142ee7181dd03692bd636d3ffc2e787dc5202.amynka@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-libs/gdal/files/gdal-2.3.0-curl.patch sci-libs/gdal/gdal-2.3.0-r1.ebuild
X-VCS-Directories: sci-libs/gdal/files/ sci-libs/gdal/
X-VCS-Committer: amynka
X-VCS-Committer-Name: Amy Liffey
X-VCS-Revision: 24b142ee7181dd03692bd636d3ffc2e787dc5202
X-VCS-Branch: master
Date: Sat, 4 Aug 2018 12:04:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 77982f22-ef1a-45ee-a14d-e58abe9b7edf
X-Archives-Hash: 815b3ad1137c08fb65eba60b318ce5a2
commit: 24b142ee7181dd03692bd636d3ffc2e787dc5202
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 4 12:03:05 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Aug 4 12:03:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24b142ee
sci-libs/gdal: fix curl undefined reference
Submitted-by: Michael Uleysky <uleysky <AT> gmail.com>
Closes: https://bugs.gentoo.org/659840
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sci-libs/gdal/files/gdal-2.3.0-curl.patch | 15 +++++++++++++++
sci-libs/gdal/gdal-2.3.0-r1.ebuild | 1 +
2 files changed, 16 insertions(+)
diff --git a/sci-libs/gdal/files/gdal-2.3.0-curl.patch b/sci-libs/gdal/files/gdal-2.3.0-curl.patch
new file mode 100644
index 00000000000..1cd33243f42
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.0-curl.patch
@@ -0,0 +1,15 @@
+diff -urNd gdal-2.3.1/port/cpl_vsil_curl.cpp gdal-2.3.1-curl/port/cpl_vsil_curl.cpp
+--- gdal-2.3.1/port/cpl_vsil_curl.cpp 2018-06-24 01:10:23.000000000 +1000
++++ gdal-2.3.1-curl/port/cpl_vsil_curl.cpp 2018-07-13 01:29:31.326347717 +1000
+@@ -8617,8 +8617,10 @@
+ if( poFSHandler )
+ poFSHandler->ClearCache();
+ }
+-
++#if !defined(HAVE_CURL) || defined(CPL_MULTIPROC_STUB)
++#else
+ VSICurlStreamingClearCache();
++#endif
+ }
+
+ #endif /* HAVE_CURL */
diff --git a/sci-libs/gdal/gdal-2.3.0-r1.ebuild b/sci-libs/gdal/gdal-2.3.0-r1.ebuild
index 8aacbcb83c7..2ddaa49d414 100644
--- a/sci-libs/gdal/gdal-2.3.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.0-r1.ebuild
@@ -81,6 +81,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.2.3-soname.patch"
"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
"${FILESDIR}/${PN}-2.2.3-goocast.patch" # bug 656252
+ "${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
)
src_prepare() {