From 67e69831107f46d595da0109bb8648247442350e Mon Sep 17 00:00:00 2001
From: talregev <talregev@users.noreply.github.com>
Date: Mon, 27 Feb 2023 21:51:45 +0200
Subject: [PATCH] update cairo (#29818)

---
 ports/cairo/cairo_static_fix.patch | 7 ++++---
 ports/cairo/portfile.cmake         | 7 +++----
 ports/cairo/vcpkg.json             | 3 +--
 versions/baseline.json             | 4 ++--
 versions/c-/cairo.json             | 5 +++++
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ports/cairo/cairo_static_fix.patch b/ports/cairo/cairo_static_fix.patch
index 20c1c28772..e3c15f7f87 100644
--- a/ports/cairo/cairo_static_fix.patch
+++ b/ports/cairo/cairo_static_fix.patch
@@ -1,8 +1,9 @@
 --- meson.build.orig	2022-03-19 03:40:07.000000000 +0900
 +++ meson.build	2022-03-29 21:32:41.000000000 +0900
-@@ -100,6 +100,13 @@
- # Autotools compatibility
- add_project_arguments('-DHAVE_CONFIG_H', language: 'c')
+@@ -96,6 +96,13 @@
+ endif
+
+ add_project_arguments('-D_GNU_SOURCE', language: 'c')
  
 +if host_machine.system() == 'windows'
 +  lib_default = get_option('default_library')
diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake
index 436de4fe5e..a78d97f955 100644
--- a/ports/cairo/portfile.cmake
+++ b/ports/cairo/portfile.cmake
@@ -4,12 +4,11 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
 endif()
 
 vcpkg_from_gitlab(
-    GITLAB_URL https://gitlab.freedesktop.org
     OUT_SOURCE_PATH SOURCE_PATH
+    GITLAB_URL https://gitlab.freedesktop.org
     REPO cairo/cairo
-    REF b43e7c6f3cf7855e16170a06d3a9c7234c60ca94 #v1.17.6
-    SHA512 2d8f0cbb11638610eda104a370bb8450e28d835852b0f861928738a60949e0aaba7a554a9f9efabbefda10a37616d4cd0d3021b3fbb4ced1d52db1edb49bc358
-    HEAD_REF master
+    REF ${VERSION}
+    SHA512 e12f4b05326c1ac7d930e18d95398dc9c65f3af9745d7fd301ef1663dd378feeb43acc47de17fd082d0acf96e9fc60310557c24e3fe8af06d17931590c7759c6
     PATCHES
         cairo_static_fix.patch
         disable-atomic-ops-check.patch # See https://gitlab.freedesktop.org/cairo/cairo/-/issues/554
diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json
index 6e4e9996db..53ce7bc057 100644
--- a/ports/cairo/vcpkg.json
+++ b/ports/cairo/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "cairo",
-  "version": "1.17.6",
-  "port-version": 5,
+  "version": "1.17.8",
   "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",
   "license": "MPL-1.1",
diff --git a/versions/baseline.json b/versions/baseline.json
index 6fa5734951..0dc9189b08 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1309,8 +1309,8 @@
       "port-version": 8
     },
     "cairo": {
-      "baseline": "1.17.6",
-      "port-version": 5
+      "baseline": "1.17.8",
+      "port-version": 0
     },
     "cairomm": {
       "baseline": "1.16.2",
diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json
index 0f2fc0696d..56b7c17dbe 100644
--- a/versions/c-/cairo.json
+++ b/versions/c-/cairo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "062c7e11a8b910e76a2f16e57e3ffe0d59bd905e",
+      "version": "1.17.8",
+      "port-version": 0
+    },
     {
       "git-tree": "d4e8c89704a7354fbae6bd789d5744d37021aacc",
       "version": "1.17.6",