From e819d336250267bbd31e47e4c3e9056efef516b8 Mon Sep 17 00:00:00 2001
From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
Date: Wed, 13 Jan 2021 12:05:11 +0800
Subject: [poppler] Fix error gperf is not recognized as an internal or
 external command (#15574)

Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
---
 ports/poppler/0003-fix-gperf-not-recognized.patch | 15 +++++++++++++++
 ports/poppler/portfile.cmake                      |  5 +++++
 ports/poppler/vcpkg.json                          |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 ports/poppler/0003-fix-gperf-not-recognized.patch

diff --git a/ports/poppler/0003-fix-gperf-not-recognized.patch b/ports/poppler/0003-fix-gperf-not-recognized.patch
new file mode 100644
index 000000000..e6edf39e7
--- /dev/null
+++ b/ports/poppler/0003-fix-gperf-not-recognized.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cce875a..0b04be7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -530,8 +530,8 @@ endif()
+ if (GPERF AND RUN_GPERF_IF_PRESENT)
+     macro(ADD_GPERF_FILE input)
+         add_custom_command(OUTPUT poppler/${input}.c
+-                       COMMAND gperf poppler/${input}.gperf > ${CMAKE_CURRENT_BINARY_DIR}/poppler/${input}.c
+-                       COMMAND gperf poppler/${input}.gperf > ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c
++                       COMMAND ${GPERF} poppler/${input}.gperf > ${CMAKE_CURRENT_BINARY_DIR}/poppler/${input}.c
++                       COMMAND ${GPERF} poppler/${input}.gperf > ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c
+                        COMMAND clang-format -i ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c || true
+                        DEPENDS poppler/${input}.gperf
+                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/ports/poppler/portfile.cmake b/ports/poppler/portfile.cmake
index 89345f0a0..4d5b58dee 100644
--- a/ports/poppler/portfile.cmake
+++ b/ports/poppler/portfile.cmake
@@ -7,8 +7,13 @@ vcpkg_from_github(
     PATCHES
         0001-remove-CMAKE_CXX_STANDARD.patch
         0002-remove-test-subdirectory.patch
+        0003-fix-gperf-not-recognized.patch
 )
 
+vcpkg_find_acquire_program(GPERF)
+get_filename_component(GPERF_PATH ${GPERF} DIRECTORY)
+vcpkg_add_to_path(${GPERF_PATH})
+
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     curl ENABLE_CURL
     zlib ENABLE_ZLIB
diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json
index 71cb470c5..788c88abc 100644
--- a/ports/poppler/vcpkg.json
+++ b/ports/poppler/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "poppler",
   "version-string": "20.12.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "a PDF rendering library",
   "homepage": "https://poppler.freedesktop.org/",
   "dependencies": [
-- 
cgit v1.2.3