aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2020-02-26 08:42:08 +0800
committerGitHub <noreply@github.com>2020-02-25 16:42:08 -0800
commit5d6927385ea3c39774510f820e9d40e85398921f (patch)
treeef6d9202b7ababdcfa1886fb2e2e5574460c8591
parent1d58bf5310bd217d7fd72565762b3872b2809079 (diff)
downloadvcpkg-5d6927385ea3c39774510f820e9d40e85398921f.tar.gz
vcpkg-5d6927385ea3c39774510f820e9d40e85398921f.zip
[libmariadb] Fix patch (#10043)
The patch incorrectly left out the line just before the modification.
-rw-r--r--ports/libmariadb/CONTROL2
-rw-r--r--ports/libmariadb/md.patch26
2 files changed, 14 insertions, 14 deletions
diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL
index 2132fd8e0..6507c55c7 100644
--- a/ports/libmariadb/CONTROL
+++ b/ports/libmariadb/CONTROL
@@ -1,4 +1,4 @@
Source: libmariadb
-Version: 3.1.7
+Version: 3.1.7-1
Homepage: https://github.com/MariaDB/mariadb-connector-c
Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases
diff --git a/ports/libmariadb/md.patch b/ports/libmariadb/md.patch
index 42199cf92..dc92b6988 100644
--- a/ports/libmariadb/md.patch
+++ b/ports/libmariadb/md.patch
@@ -1,13 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ef45ee8..470573e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -110,7 +110,7 @@ IF(NOT IS_SUBPROJECT)
- IF(MSVC)
- # Speedup system tests
- INCLUDE(${CC_SOURCE_DIR}/cmake/WindowsCache.cmake)
-- IF (MSVC)
-+ IF (MSVC AND 0)
- SET(CONFIG_TYPES "DEBUG" "RELEASE" "RELWITHDEBINFO")
- FOREACH(BUILD_TYPE ${CONFIG_TYPES})
- FOREACH(COMPILER CXX C)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 528c170..a5cd3fe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -108,7 +108,7 @@ IF(MSVC)
+ # Speedup system tests
+ INCLUDE(${CC_SOURCE_DIR}/cmake/WindowsCache.cmake)
+ ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN)
+- IF (MSVC)
++ IF (MSVC AND 0)
+ SET(CONFIG_TYPES "DEBUG" "RELEASE" "RELWITHDEBINFO")
+ FOREACH(BUILD_TYPE ${CONFIG_TYPES})
+ FOREACH(COMPILER CXX C)