[cairo] Merge changes from PR #1232

This commit is contained in:
Robert Schumacher 2017-06-08 02:21:21 -07:00
parent 3ffef6223b
commit 9abbfe88ac
2 changed files with 2 additions and 2 deletions

View File

@ -1,4 +1,4 @@
Source: cairo
Version: 1.15.4-1
Version: 1.15.4-2
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

View File

@ -49,7 +49,7 @@ foreach(FILE
file(COPY ${FILE} DESTINATION ${CURRENT_PACKAGES_DIR}/include/cairo)
endforeach()
foreach(FILE "${CURRENT_PACKAGES_DIR}/include/cairo.h")
foreach(FILE "${CURRENT_PACKAGES_DIR}/include/cairo.h" "${CURRENT_PACKAGES_DIR}/include/cairo/cairo.h")
file(READ ${FILE} CAIRO_H)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
string(REPLACE "defined (CAIRO_WIN32_STATIC_BUILD)" "1" CAIRO_H "${CAIRO_H}")