update cairo (#29818)

This commit is contained in:
talregev 2023-02-27 21:51:45 +02:00 committed by GitHub
parent 5a08096b14
commit 67e6983110
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 11 deletions

View File

@ -1,8 +1,9 @@
--- meson.build.orig 2022-03-19 03:40:07.000000000 +0900 --- meson.build.orig 2022-03-19 03:40:07.000000000 +0900
+++ meson.build 2022-03-29 21:32:41.000000000 +0900 +++ meson.build 2022-03-29 21:32:41.000000000 +0900
@@ -100,6 +100,13 @@ @@ -96,6 +96,13 @@
# Autotools compatibility endif
add_project_arguments('-DHAVE_CONFIG_H', language: 'c')
add_project_arguments('-D_GNU_SOURCE', language: 'c')
+if host_machine.system() == 'windows' +if host_machine.system() == 'windows'
+ lib_default = get_option('default_library') + lib_default = get_option('default_library')

View File

@ -4,12 +4,11 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
endif() endif()
vcpkg_from_gitlab( vcpkg_from_gitlab(
GITLAB_URL https://gitlab.freedesktop.org
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
GITLAB_URL https://gitlab.freedesktop.org
REPO cairo/cairo REPO cairo/cairo
REF b43e7c6f3cf7855e16170a06d3a9c7234c60ca94 #v1.17.6 REF ${VERSION}
SHA512 2d8f0cbb11638610eda104a370bb8450e28d835852b0f861928738a60949e0aaba7a554a9f9efabbefda10a37616d4cd0d3021b3fbb4ced1d52db1edb49bc358 SHA512 e12f4b05326c1ac7d930e18d95398dc9c65f3af9745d7fd301ef1663dd378feeb43acc47de17fd082d0acf96e9fc60310557c24e3fe8af06d17931590c7759c6
HEAD_REF master
PATCHES PATCHES
cairo_static_fix.patch cairo_static_fix.patch
disable-atomic-ops-check.patch # See https://gitlab.freedesktop.org/cairo/cairo/-/issues/554 disable-atomic-ops-check.patch # See https://gitlab.freedesktop.org/cairo/cairo/-/issues/554

View File

@ -1,7 +1,6 @@
{ {
"name": "cairo", "name": "cairo",
"version": "1.17.6", "version": "1.17.8",
"port-version": 5,
"description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.", "description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.",
"homepage": "https://cairographics.org", "homepage": "https://cairographics.org",
"license": "MPL-1.1", "license": "MPL-1.1",

View File

@ -1309,8 +1309,8 @@
"port-version": 8 "port-version": 8
}, },
"cairo": { "cairo": {
"baseline": "1.17.6", "baseline": "1.17.8",
"port-version": 5 "port-version": 0
}, },
"cairomm": { "cairomm": {
"baseline": "1.16.2", "baseline": "1.16.2",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "062c7e11a8b910e76a2f16e57e3ffe0d59bd905e",
"version": "1.17.8",
"port-version": 0
},
{ {
"git-tree": "d4e8c89704a7354fbae6bd789d5744d37021aacc", "git-tree": "d4e8c89704a7354fbae6bd789d5744d37021aacc",
"version": "1.17.6", "version": "1.17.6",