-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
11 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -94,11 +94,16 @@ PKG_ROOT=$GOPATH/src/github.com/go-spatial/go-mbgl/mbgl/c | |
|
||
# download and install sdk | ||
if [[ ! -d mapbox-gl-native ]]; then | ||
git clone --depth=1 --recursive https://github.com/mapbox/mapbox-gl-native | ||
pushd mapbox-gl-native | ||
git config user.email "[email protected]" | ||
git config user.name "Gautam Dey" | ||
git am ../patches/* | ||
|
||
git checkout 98eac18a2133a7beda12fdfc27d6f88217d800cf | ||
git reset --hard | ||
git submodule init | ||
git submodule update | ||
git apply ../patches/* | ||
|
||
popd | ||
|
||
fi | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,7 @@ | ||
From 029bc84f5fb9e1fe30d382ee8c160d4ccb6fd1a3 Mon Sep 17 00:00:00 2001 | ||
From: Gautam Dey <[email protected]> | ||
Date: Tue, 25 Sep 2018 22:06:54 +0000 | ||
Subject: [PATCH] Removed CURLOPT_CAINFO; so that it can use the system default | ||
for finding the ca certificates. | ||
|
||
--- | ||
platform/default/http_file_source.cpp | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/platform/default/http_file_source.cpp b/platform/default/http_file_source.cpp | ||
index 9166d92fb..6e6522c33 100644 | ||
--- a/platform/default/http_file_source.cpp | ||
+++ b/platform/default/http_file_source.cpp | ||
diff --git a/platform/default/src/mbgl/storage/http_file_source.cpp b/platform/default/src/mbgl/storage/http_file_source.cpp | ||
index 213b53d..009eb9b 100644 | ||
--- a/platform/default/src/mbgl/storage/http_file_source.cpp | ||
+++ b/platform/default/src/mbgl/storage/http_file_source.cpp | ||
@@ -325,7 +325,7 @@ HTTPRequest::HTTPRequest(HTTPFileSource::Impl* context_, Resource resource_, Fil | ||
|
||
handleError(curl::easy_setopt(handle, CURLOPT_PRIVATE, this)); | ||
|
@@ -21,6 +11,3 @@ index 9166d92fb..6e6522c33 100644 | |
handleError(curl::easy_setopt(handle, CURLOPT_FOLLOWLOCATION, 1)); | ||
handleError(curl::easy_setopt(handle, CURLOPT_URL, resource.url.c_str())); | ||
handleError(curl::easy_setopt(handle, CURLOPT_WRITEFUNCTION, writeCallback)); | ||
-- | ||
2.17.1 | ||
|