diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-05-04 15:43:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-04 15:43:15 -0700 |
| commit | ef149c7c4b8852916cf863598ce17ead9602641b (patch) | |
| tree | 903f0cb692d42976507ab7dcc7c7be9c5f995d77 | |
| parent | 54602eb4446a67387933edaa69c9524ca5f05aa7 (diff) | |
| parent | 61a5a8a943b9db861b70f9ddc01369dab19d98c4 (diff) | |
| download | vcpkg-ef149c7c4b8852916cf863598ce17ead9602641b.tar.gz vcpkg-ef149c7c4b8852916cf863598ce17ead9602641b.zip | |
Merge pull request #1026 from codicodi/pango-exports
[pango] fix exports
| -rw-r--r-- | ports/pango/0001-fix-static-symbols-export.diff | 16 | ||||
| -rw-r--r-- | ports/pango/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | ports/pango/CONTROL | 2 |
3 files changed, 5 insertions, 16 deletions
diff --git a/ports/pango/0001-fix-static-symbols-export.diff b/ports/pango/0001-fix-static-symbols-export.diff index c09544f5d..a7ab60901 100644 --- a/ports/pango/0001-fix-static-symbols-export.diff +++ b/ports/pango/0001-fix-static-symbols-export.diff @@ -1,21 +1,12 @@ -From 9e7d3a6ea06e1fb661e0aa4b60c6efa9a5684d9d Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka <me@mixaill.tk> -Date: Sat, 29 Apr 2017 21:28:12 +0300 -Subject: [PATCH] do not use dllexport for static build - ---- - config.h.win32 | 4 ++++ - 1 file changed, 4 insertions(+) - diff --git a/config.h.win32 b/config.h.win32 -index 31b330f..e25b5d8 100644 +index 31b330f..e5ed86c 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -147,7 +147,11 @@ /* defines how to decorate public symbols while building */ #ifdef _MSC_VER -+#ifdef _WINDLL ++#ifdef PANGO_EXPORTS #define _PANGO_EXTERN __declspec(dllexport) extern #else +#define _PANGO_EXTERN extern @@ -23,6 +14,3 @@ index 31b330f..e25b5d8 100644 +#else #define _PANGO_EXTERN __attribute__((visibility("default"))) __declspec(dllexport) extern #endif --- -2.11.0.windows.1 - diff --git a/ports/pango/CMakeLists.txt b/ports/pango/CMakeLists.txt index f6145dc4c..7dad7dbcf 100644 --- a/ports/pango/CMakeLists.txt +++ b/ports/pango/CMakeLists.txt @@ -58,7 +58,8 @@ macro(pango_add_module MODULE_NAME) G_LOG_DOMAIN="Pango" PANGO_ENABLE_BACKEND PANGO_ENABLE_ENGINE G_DISABLE_SINGLE_INCLUDES SYSCONFDIR="/dummy/etc" LIBDIR="/dummy/lib") target_compile_definitions(${MODULE_NAME} PRIVATE HAVE_CAIRO_FREETYPE=1) - set_target_properties(${MODULE_NAME} PROPERTIES + set_target_properties(${MODULE_NAME} PROPERTIES + DEFINE_SYMBOL PANGO_EXPORTS OUTPUT_NAME ${MODULE_NAME}-${PANGO_DLL_SUFFIX} ARCHIVE_OUTPUT_NAME ${MODULE_NAME}-${PANGO_LIB_SUFFIX}) install(TARGETS ${MODULE_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) diff --git a/ports/pango/CONTROL b/ports/pango/CONTROL index 89a742b79..430243537 100644 --- a/ports/pango/CONTROL +++ b/ports/pango/CONTROL @@ -1,4 +1,4 @@ Source: pango
-Version: 1.40.5-1
+Version: 1.40.5-2
Description: Text and font handling library.
Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz
|