aboutsummaryrefslogtreecommitdiff
path: root/ports/qscintilla
diff options
context:
space:
mode:
authorStefano Sinigardi <stesinigardi@hotmail.com>2019-10-07 19:35:13 +0200
committerCurtis J Bezault <curtbezault@gmail.com>2019-10-07 10:35:13 -0700
commit726c11148105a97aef39bec024fdb7c140b1b154 (patch)
tree26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/qscintilla
parente86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff)
downloadvcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz
vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/qscintilla')
-rw-r--r--ports/qscintilla/CONTROL2
-rw-r--r--ports/qscintilla/portfile.cmake8
2 files changed, 7 insertions, 3 deletions
diff --git a/ports/qscintilla/CONTROL b/ports/qscintilla/CONTROL
index ee8a7be2f..3e8d82c92 100644
--- a/ports/qscintilla/CONTROL
+++ b/ports/qscintilla/CONTROL
@@ -1,5 +1,5 @@
Source: qscintilla
-Version: 2.10-8
+Version: 2.10-9
Homepage: https://sourceforge.net/projects/pyqt
Description: QScintilla is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin)
Build-Depends: qt5-base, qt5-macextras (osx), qt5-winextras (windows)
diff --git a/ports/qscintilla/portfile.cmake b/ports/qscintilla/portfile.cmake
index 111001f12..d979f3135 100644
--- a/ports/qscintilla/portfile.cmake
+++ b/ports/qscintilla/portfile.cmake
@@ -1,11 +1,15 @@
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/QScintilla_gpl-2.10)
+
vcpkg_download_distfile(ARCHIVE
URLS "https://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-2.10/QScintilla_gpl-2.10.zip"
FILENAME "QScintilla_gpl-2.10.zip"
SHA512 7c580cfee03af1056f530af756a0ff9cc2396a5419fa23aecc66a6bc8809a4fb154788956220bb0b068a5c214d571c053271c3906d6d541196fbbf7c6dbec917
)
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+)
vcpkg_find_acquire_program(PYTHON3)