Skip to content

Commit

Permalink
[pango] fix exports
Browse files Browse the repository at this point in the history
  • Loading branch information
codicodi committed May 4, 2017
1 parent e6a47f5 commit 61a5a8a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 16 deletions.
16 changes: 2 additions & 14 deletions ports/pango/0001-fix-static-symbols-export.diff
Original file line number Diff line number Diff line change
@@ -1,28 +1,16 @@
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
+#endif
+#else
#define _PANGO_EXTERN __attribute__((visibility("default"))) __declspec(dllexport) extern
#endif
--
2.11.0.windows.1

3 changes: 2 additions & 1 deletion ports/pango/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ports/pango/CONTROL
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 61a5a8a

Please sign in to comment.