Skip to content

[poppler] Disable clang-format check #15727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-shaw merged 9 commits into from
Jan 22, 2021
Merged

[poppler] Disable clang-format check #15727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
90b8cac
[poppler] Disable clang-format check
Jan 18, 2021
27dda01
Update port_version check
Jan 18, 2021
8b49c2d
Add CLANG program
Jan 18, 2021
87e282a
Add clang-format program
Jan 18, 2021
da15df1
Update clang-format and add it to azure-pipelines/linux/provision-ima…
Jan 19, 2021
e62612a
Update ports/poppler/portfile.cmake
NancyLi1013 Jan 19, 2021
ac72834
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
Jan 22, 2021
0182a14
Merge branch 'dev/NancyLi/fix-poppler' of https://github.com/NancyLi1…
Jan 22, 2021
2308e84
Revert the changes for clang-format
Jan 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ports/poppler/0004-disable-clang-format.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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})

1 change: 1 addition & 0 deletions ports/poppler/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ports/poppler/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4602,7 +4602,7 @@
},
"poppler": {
"baseline": "20.12.1",
"port-version": 2
"port-version": 3
},
"portable-snippets": {
"baseline": "2019-09-20",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/poppler.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a6d078aca2d1c5803ddd287701692b891856c3fd",
"version-string": "20.12.1",
"port-version": 3
},
{
"git-tree": "acfc09df4e386e910884ee45b13e79c7ecb23d29",
"version-string": "20.12.1",
Expand Down