aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLily <47812810+LilyWangL@users.noreply.github.com>2019-09-04 01:41:09 +0800
committerdan-shaw <51385773+dan-shaw@users.noreply.github.com>2019-09-03 10:41:09 -0700
commitae2d1b727a3123c7e8b5d0ab3491fc6b8f0003d1 (patch)
tree5b5516987a8f2c4f83fcef56fc86bb68c8ffd031
parent2b78cac373da1bde47d4c99d3c7c5f96398181a4 (diff)
downloadvcpkg-ae2d1b727a3123c7e8b5d0ab3491fc6b8f0003d1.tar.gz
vcpkg-ae2d1b727a3123c7e8b5d0ab3491fc6b8f0003d1.zip
[breakpad] Fix build failed with Visual Studio 2019 (#7938)
-rw-r--r--ports/breakpad/CONTROL2
-rw-r--r--ports/breakpad/fix-unique_ptr.patch13
-rw-r--r--ports/breakpad/portfile.cmake2
3 files changed, 16 insertions, 1 deletions
diff --git a/ports/breakpad/CONTROL b/ports/breakpad/CONTROL
index 394bbc5d6..b701aa69f 100644
--- a/ports/breakpad/CONTROL
+++ b/ports/breakpad/CONTROL
@@ -1,5 +1,5 @@
Source: breakpad
-Version: 2019-07-11
+Version: 2019-07-11-1
Build-Depends: libdisasm
Homepage: https://github.com/google/breakpad
Description: a set of client and server components which implement a crash-reporting system.
diff --git a/ports/breakpad/fix-unique_ptr.patch b/ports/breakpad/fix-unique_ptr.patch
new file mode 100644
index 000000000..4f81de3d9
--- /dev/null
+++ b/ports/breakpad/fix-unique_ptr.patch
@@ -0,0 +1,13 @@
+diff --git a/src/common/windows/pe_util.cc b/src/common/windows/pe_util.cc
+index 9f9e8fa..d912635 100644
+--- a/src/common/windows/pe_util.cc
++++ b/src/common/windows/pe_util.cc
+@@ -28,7 +28,7 @@
+ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ #include "pe_util.h"
+-
++#include <memory>
+ #include <windows.h>
+ #include <winnt.h>
+ #include <atlbase.h>
diff --git a/ports/breakpad/portfile.cmake b/ports/breakpad/portfile.cmake
index c1f249030..a5c3022f9 100644
--- a/ports/breakpad/portfile.cmake
+++ b/ports/breakpad/portfile.cmake
@@ -8,6 +8,8 @@ vcpkg_from_github(
REF c46151db0ffd1a8dae914e45f1212ef427f61ed3
SHA512 bd9f247851a3caa6f36574c8a243c2a01cb1cf23c2266b6f6786b85c7418dba5937363c00184e26cda24225f96bb7aaeb08efd13d6a269a3b78c357c2eda7e14
HEAD_REF master
+ PATCHES
+ fix-unique_ptr.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})