-
Notifications
You must be signed in to change notification settings - Fork 507
Test updated pango library #6777
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.
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| string(REGEX MATCH "^([0-9]*[.][0-9]*)" VERSION_MAJOR_MINOR "${VERSION}") | ||
| vcpkg_download_distfile(SOURCE_ARCHIVE | ||
| URLS | ||
| "https://download.gnome.org/sources/pango/${VERSION_MAJOR_MINOR}/pango-${VERSION}.tar.xz" | ||
| "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" | ||
| FILENAME "pango-${VERSION}.tar.xz" | ||
| SHA512 e3d251e0c2d5cb7f2e9d26e675aa2fae0c3cedce9e73b77f92a4abbeff55eaa819811e4c064ca036d3964a3ee4592f596ebfa7c0a760189b9d8c38a5f3a4ea3a | ||
| ) | ||
| vcpkg_extract_source_archive(SOURCE_PATH | ||
| ARCHIVE "${SOURCE_ARCHIVE}" | ||
| PATCHES | ||
| relax-gi-requirement.diff | ||
| ) | ||
|
|
||
| if("introspection" IN_LIST FEATURES) | ||
| list(APPEND OPTIONS_RELEASE -Dintrospection=enabled) | ||
| vcpkg_get_gobject_introspection_programs(PYTHON3 GIR_COMPILER GIR_SCANNER) | ||
| else() | ||
| list(APPEND OPTIONS_RELEASE -Dintrospection=disabled) | ||
| endif() | ||
|
|
||
| vcpkg_configure_meson( | ||
| SOURCE_PATH "${SOURCE_PATH}" | ||
| OPTIONS | ||
| -Ddocumentation=false | ||
| -Dman-pages=false | ||
| -Dbuild-testsuite=false | ||
| -Dbuild-examples=false | ||
| -Dfontconfig=enabled # Build with FontConfig support. | ||
| -Dsysprof=disabled # include tracing support for sysprof | ||
| -Dlibthai=disabled # Build with libthai support | ||
| -Dcairo=enabled # Build with cairo support | ||
| -Dxft=disabled # Build with xft support | ||
| -Dfreetype=enabled # Build with freetype support | ||
| ${OPTIONS} | ||
| OPTIONS_RELEASE | ||
| ${OPTIONS_RELEASE} | ||
| OPTIONS_DEBUG | ||
| -Dintrospection=disabled | ||
| ADDITIONAL_BINARIES | ||
| "glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'" | ||
| "glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'" | ||
| "g-ir-compiler='${GIR_COMPILER}'" | ||
| "g-ir-scanner='${GIR_SCANNER}'" | ||
| ) | ||
|
|
||
| vcpkg_install_meson(ADD_BIN_TO_PATH) | ||
| vcpkg_fixup_pkgconfig() | ||
| vcpkg_copy_pdbs() | ||
|
|
||
| vcpkg_copy_tools(TOOL_NAMES pango-view pango-list pango-segmentation AUTO_CLEAN) | ||
|
|
||
| vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") |
25 changes: 25 additions & 0 deletions
25
3rdParty/vcpkg_ports/ports/pango/relax-gi-requirement.diff
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| diff --git a/meson.build b/meson.build | ||
| index b8098c1..10033c8 100644 | ||
| --- a/meson.build | ||
| +++ b/meson.build | ||
| @@ -209,7 +209,7 @@ glib_major_req = 2 | ||
| glib_minor_req = 82 | ||
|
|
||
| glib_req = '>= @0@.@1@'.format(glib_major_req, glib_minor_req) | ||
| -gi_req = '>= 1.83.2' | ||
| +gi_req = '>= 1.82.0' | ||
| fribidi_req = '>= 1.0.6' | ||
| libthai_req = '>= 0.1.9' | ||
| harfbuzz_req = '>= 8.4.0' | ||
| diff --git a/pango/meson.build b/pango/meson.build | ||
| index f3c6d70..674b702 100644 | ||
| --- a/pango/meson.build | ||
| +++ b/pango/meson.build | ||
|
||
| @@ -132,7 +132,6 @@ pango_dep_sources = [pango_enum_h] | ||
| if build_gir | ||
| gir_args = [ | ||
| '--quiet', | ||
| - '--doc-format=gi-docgen', | ||
| ] | ||
| harfbuzz_gobject_dep = dependency('harfbuzz-gobject', | ||
| version: harfbuzz_req, | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| { | ||
| "name": "pango", | ||
| "version": "1.57.0", | ||
| "description": "Text and font handling library.", | ||
| "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", | ||
| "license": "LGPL-2.0-or-later", | ||
| "supports": "!xbox", | ||
| "dependencies": [ | ||
| { | ||
| "name": "cairo", | ||
| "features": [ | ||
| "gobject" | ||
| ] | ||
| }, | ||
| "fontconfig", | ||
| "freetype", | ||
| "fribidi", | ||
| { | ||
| "name": "gettext", | ||
| "host": true, | ||
| "default-features": false, | ||
| "features": [ | ||
| "tools" | ||
| ] | ||
| }, | ||
| "gettext-libintl", | ||
| "glib", | ||
| { | ||
| "name": "glib", | ||
| "host": true | ||
| }, | ||
| "harfbuzz", | ||
| { | ||
| "name": "harfbuzz", | ||
| "features": [ | ||
| "coretext" | ||
| ], | ||
| "platform": "osx" | ||
| }, | ||
| { | ||
| "name": "vcpkg-tool-meson", | ||
| "host": true | ||
| } | ||
| ], | ||
| "features": { | ||
| "introspection": { | ||
| "description": "Build with introspection", | ||
| "supports": "!static", | ||
| "dependencies": [ | ||
| "gobject-introspection", | ||
| { | ||
| "name": "harfbuzz", | ||
| "default-features": false, | ||
| "features": [ | ||
| "introspection" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The patch file header has an incorrect number of plus signs. Standard unified diff format requires exactly three plus signs (+++), but this line has four (++++). This will cause the patch to fail when applied by standard patch tools. Change ++++ to +++.