From d40f2a4a5d51e28b322c5c63771af3e8de302c45 Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierryb@filewave.com>
Date: Thu, 21 Sep 2017 17:30:11 +0200
Subject: [PATCH 1/2] protobuf: update to 3.4.1

---
 ports/protobuf/001-add-compiler-flag.patch | 8 +++-----
 ports/protobuf/CONTROL                     | 2 +-
 ports/protobuf/portfile.cmake              | 6 +++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ports/protobuf/001-add-compiler-flag.patch b/ports/protobuf/001-add-compiler-flag.patch
index dd1285cea0..ad545cad3a 100644
--- a/ports/protobuf/001-add-compiler-flag.patch
+++ b/ports/protobuf/001-add-compiler-flag.patch
@@ -17,22 +17,20 @@ index 7618ba2..d282a60 100644
    include(tests.cmake)
 
 diff --git a/cmake/install.cmake b/cmake/install.cmake
-index 441bf55..4158820 100644
+index 441bf55..20b3aa0 100644
 --- a/cmake/install.cmake
 +++ b/cmake/install.cmake
 @@ -1,14 +1,17 @@
  include(GNUInstallDirs)
  
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/protobuf.pc.cmake
 +set(LIBRARIES_TO_SET_DEST libprotobuf-lite libprotobuf)
 +if(protobuf_BUILD_COMPILER)
 +  list(APPEND LIBRARIES_TO_SET_DEST libprotoc)
 +endif()
 +
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libprotobuf.cmake
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/protobuf.pc.cmake
                 ${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc @ONLY)
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/protobuf-lite.pc.cmake
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libprotobuf-lite.cmake
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/protobuf-lite.pc.cmake
                 ${CMAKE_CURRENT_BINARY_DIR}/protobuf-lite.pc @ONLY)
  
  foreach(_library
diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL
index 9fe4bbb327..b9d8b5b9e7 100644
--- a/ports/protobuf/CONTROL
+++ b/ports/protobuf/CONTROL
@@ -1,4 +1,4 @@
 Source: protobuf
-Version: 3.4.0-2
+Version: 3.4.1-1
 Build-Depends: zlib
 Description: Protocol Buffers - Google's data interchange format
diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake
index 804780ab45..5c3eaf5e7a 100644
--- a/ports/protobuf/portfile.cmake
+++ b/ports/protobuf/portfile.cmake
@@ -1,15 +1,15 @@
 include(vcpkg_common_functions)
 
-set(PROTOBUF_VERSION 3.4.0)
+set(PROTOBUF_VERSION 3.4.1)
 
 vcpkg_download_distfile(ARCHIVE_FILE
     URLS "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-cpp-${PROTOBUF_VERSION}.tar.gz"
     FILENAME "protobuf-cpp-${PROTOBUF_VERSION}.tar.gz"
-    SHA512 ce9bd9bc818c4a8e8b08c83e8a4eba6fca008a64a5ad9d322b19683b1de2b5fa622ed99093323f3c9d0820ef23430f7ee07f6930f7f877d334e5d36df9b0be0e
+    SHA512 6189e23c7e381f62e971bd0e35ad9c3ed8effe584755357013887c6a582cb5a9a654c39affa2a073b658854138f31bfb70f89fa1df494e9386f1d64fd73d07d2
 )
 vcpkg_download_distfile(TOOL_ARCHIVE_FILE
     URLS "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-win32.zip"
-    FILENAME "protoc-${PROTOBUF_VERSION}-win32.zip"
+    FILENAME "protoc-3.4.0-win32.zip"
     SHA512 b874c3f47b39ac78f5675e05220318683004a365c248bf47ba50d8c66c8ed7763432451bab30524e131e1185a2bdaa6e6071b389eb61ad58b1b95974cf39d41b
 )
 

From 5e2e32ac4b6791880fd7045a7abafc383d40e694 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 21 Sep 2017 13:12:50 -0700
Subject: [PATCH 2/2] [protobuf] Point to the correct url for protoc

---
 ports/protobuf/portfile.cmake | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake
index 5c3eaf5e7a..e3cae639c9 100644
--- a/ports/protobuf/portfile.cmake
+++ b/ports/protobuf/portfile.cmake
@@ -1,6 +1,7 @@
 include(vcpkg_common_functions)
 
 set(PROTOBUF_VERSION 3.4.1)
+set(PROTOC_VERSION 3.4.0)
 
 vcpkg_download_distfile(ARCHIVE_FILE
     URLS "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-cpp-${PROTOBUF_VERSION}.tar.gz"
@@ -8,8 +9,8 @@ vcpkg_download_distfile(ARCHIVE_FILE
     SHA512 6189e23c7e381f62e971bd0e35ad9c3ed8effe584755357013887c6a582cb5a9a654c39affa2a073b658854138f31bfb70f89fa1df494e9386f1d64fd73d07d2
 )
 vcpkg_download_distfile(TOOL_ARCHIVE_FILE
-    URLS "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-win32.zip"
-    FILENAME "protoc-3.4.0-win32.zip"
+    URLS "https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-win32.zip"
+    FILENAME "protoc-${PROTOC_VERSION}-win32.zip"
     SHA512 b874c3f47b39ac78f5675e05220318683004a365c248bf47ba50d8c66c8ed7763432451bab30524e131e1185a2bdaa6e6071b389eb61ad58b1b95974cf39d41b
 )