Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[cairo] Windows: Fix cairo dll definition #17596

Merged
merged 5 commits into from
May 3, 2021
Merged

[cairo] Windows: Fix cairo dll definition #17596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cb078ff
[cairo] fix def name for dll
Neumann-A Apr 30, 2021
f4299aa
version stuff
Neumann-A Apr 30, 2021
019076f
use same approach as the fontconfig fix
Neumann-A Apr 30, 2021
beb3c48
update version
Neumann-A Apr 30, 2021
637ae98
Merge remote-tracking branch 'upstream/master' into fix_cairo_dll_def
Neumann-A May 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ports/cairo/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ vcpkg_download_distfile(ARCHIVE
FILENAME "cairo-${CAIRO_VERSION}.tar.xz"
SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
)

if(NOT VCPKG_TARGET_IS_MINGW AND VCPKG_TARGET_IS_WINDOWS)
set(PATCHES win_dll_def.patch)
endif()

vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
Expand All @@ -14,6 +19,7 @@ vcpkg_extract_source_archive_ex(
0001_fix_osx_defined.patch
build2.patch
remove_test_perf.patch
${PATCHES}
)

#TODO the autoconf script has a lot of additional option which use auto detection and should be disabled!
Expand Down
2 changes: 1 addition & 1 deletion ports/cairo/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cairo",
"version": "1.16.0",
"port-version": 11,
"port-version": 12,
"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",
"dependencies": [
Expand Down
13 changes: 13 additions & 0 deletions ports/cairo/win_dll_def.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/Makefile.am b/src/Makefile.am
index df6de0136..b8de9669c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,7 +72,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers)
$(EGREP) '^cairo_.* \(' | \
sed -e 's/[ ].*//' | \
sort; \
- echo LIBRARY libcairo-$(CAIRO_VERSION_SONUM).dll; \
+ echo LIBRARY cairo-$(CAIRO_VERSION_SONUM).dll; \
) >$@
@ ! grep -q cairo_ERROR $@ || ($(RM) $@; false)

2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,7 +1082,7 @@
},
"cairo": {
"baseline": "1.16.0",
"port-version": 11
"port-version": 12
},
"cairomm": {
"baseline": "1.16.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/cairo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ea721528bdf86a3a1fd35b78550e3c9463a8e715",
"version": "1.16.0",
"port-version": 12
},
{
"git-tree": "f5e2e3535796b2fb785709ae2273c1243b4aa2fc",
"version": "1.16.0",
Expand Down