[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
This commit is contained in:
NancyLi1013 2021-01-23 02:40:01 +08:00 committed by GitHub
parent 83b8e27b95
commit ab0acc7439
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 2 deletions

View File

@ -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})

View File

@ -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)

View File

@ -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": [

View File

@ -4602,7 +4602,7 @@
},
"poppler": {
"baseline": "20.12.1",
"port-version": 2
"port-version": 3
},
"portable-snippets": {
"baseline": "2019-09-20",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a6d078aca2d1c5803ddd287701692b891856c3fd",
"version-string": "20.12.1",
"port-version": 3
},
{
"git-tree": "acfc09df4e386e910884ee45b13e79c7ecb23d29",
"version-string": "20.12.1",