From c35dd41195fc56506b44e415751a8e2fb1730019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20T=C3=A4schner?= <A.Taeschner@gsi.de>
Date: Thu, 1 Jun 2017 08:32:41 +0200
Subject: [cairo] Add cairo-pdf.h and cairo-svg.h to subdir cairo in includes.

---
 ports/cairo/CONTROL        | 2 +-
 ports/cairo/portfile.cmake | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL
index 89ba03b79..88325c521 100644
--- a/ports/cairo/CONTROL
+++ b/ports/cairo/CONTROL
@@ -1,4 +1,4 @@
 Source: cairo
-Version: 1.15.4
+Version: 1.15.4-1
 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.
 Build-Depends: zlib, libpng, pixman, glib, freetype, fontconfig
diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake
index 57b45e91c..47055a270 100644
--- a/ports/cairo/portfile.cmake
+++ b/ports/cairo/portfile.cmake
@@ -49,6 +49,13 @@ DESTINATION
 ${CURRENT_PACKAGES_DIR}/include
 )
 
+file(COPY
+"${SOURCE_PATH}/src/cairo-pdf.h"
+"${SOURCE_PATH}/src/cairo-svg.h"
+DESTINATION
+${CURRENT_PACKAGES_DIR}/include/cairo
+)
+
 # Handle copyright
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/cairo)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/cairo/COPYING ${CURRENT_PACKAGES_DIR}/share/cairo/copyright)
-- 
cgit v1.2.3


From 35e574de5dc3ba912bc2e7bc1c451db8c638002c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20T=C3=A4schner?= <A.Taeschner@gsi.de>
Date: Thu, 8 Jun 2017 07:35:33 +0200
Subject: [cairo] Copy headers to include and include/cairo.

---
 ports/cairo/portfile.cmake | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake
index 47055a270..9471c427a 100644
--- a/ports/cairo/portfile.cmake
+++ b/ports/cairo/portfile.cmake
@@ -33,7 +33,7 @@ endif()
 vcpkg_install_cmake()
 
 # Copy the appropriate header files.
-file(COPY
+foreach(FILE
 "${SOURCE_PATH}/src/cairo.h"
 "${SOURCE_PATH}/src/cairo-deprecated.h"
 "${SOURCE_PATH}/src/cairo-features.h"
@@ -44,17 +44,10 @@ file(COPY
 "${SOURCE_PATH}/cairo-version.h"
 "${SOURCE_PATH}/src/cairo-win32.h"
 "${SOURCE_PATH}/util/cairo-gobject/cairo-gobject.h"
-"${SOURCE_PATH}/src/cairo-ft.h"
-DESTINATION
-${CURRENT_PACKAGES_DIR}/include
-)
-
-file(COPY
-"${SOURCE_PATH}/src/cairo-pdf.h"
-"${SOURCE_PATH}/src/cairo-svg.h"
-DESTINATION
-${CURRENT_PACKAGES_DIR}/include/cairo
-)
+"${SOURCE_PATH}/src/cairo-ft.h")
+  file(COPY ${FILE} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+  file(COPY ${FILE} DESTINATION ${CURRENT_PACKAGES_DIR}/include/cairo)
+endforeach()
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/cairo)
-- 
cgit v1.2.3