diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2021-01-23 02:40:01 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 10:40:01 -0800 |
| commit | ab0acc7439bf74bab07940ed2295cd97df59a38f (patch) | |
| tree | 709feb1008a49e05e230c679383ad8a3588e124c | |
| parent | 83b8e27b95e0117a80fe5e2e4749ecaede098fa0 (diff) | |
| download | vcpkg-ab0acc7439bf74bab07940ed2295cd97df59a38f.tar.gz vcpkg-ab0acc7439bf74bab07940ed2295cd97df59a38f.zip | |
[poppler] Disable clang-format check (#15727)
* [poppler] Disable clang-format check
* Update port_version check
* Add CLANG program
* Add clang-format program
* Update clang-format and add it to azure-pipelines/linux/provision-image.sh
* Update ports/poppler/portfile.cmake
* Revert the changes for clang-format
| -rw-r--r-- | ports/poppler/0004-disable-clang-format.patch | 12 | ||||
| -rw-r--r-- | ports/poppler/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/poppler/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/p-/poppler.json | 5 |
5 files changed, 20 insertions, 2 deletions
diff --git a/ports/poppler/0004-disable-clang-format.patch b/ports/poppler/0004-disable-clang-format.patch new file mode 100644 index 000000000..43a48da78 --- /dev/null +++ b/ports/poppler/0004-disable-clang-format.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b04be7..947d5be 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -532,7 +532,6 @@ if (GPERF AND RUN_GPERF_IF_PRESENT) + 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 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 4d5b58dee..77ebf431c 100644 --- a/ports/poppler/portfile.cmake +++ b/ports/poppler/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( 0001-remove-CMAKE_CXX_STANDARD.patch 0002-remove-test-subdirectory.patch 0003-fix-gperf-not-recognized.patch + 0004-disable-clang-format.patch ) vcpkg_find_acquire_program(GPERF) diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json index 788c88abc..b9af52083 100644 --- a/ports/poppler/vcpkg.json +++ b/ports/poppler/vcpkg.json @@ -1,7 +1,7 @@ { "name": "poppler", "version-string": "20.12.1", - "port-version": 2, + "port-version": 3, "description": "a PDF rendering library", "homepage": "https://poppler.freedesktop.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index d09baa59e..082055258 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4602,7 +4602,7 @@ }, "poppler": { "baseline": "20.12.1", - "port-version": 2 + "port-version": 3 }, "portable-snippets": { "baseline": "2019-09-20", diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json index b6de22558..e961e3926 100644 --- a/versions/p-/poppler.json +++ b/versions/p-/poppler.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "a6d078aca2d1c5803ddd287701692b891856c3fd", + "version-string": "20.12.1", + "port-version": 3 + }, + { "git-tree": "acfc09df4e386e910884ee45b13e79c7ecb23d29", "version-string": "20.12.1", "port-version": 2 |