summaryrefslogtreecommitdiffstats
path: root/contrib/freetype/P00-mingw-lib.patch
diff options
context:
space:
mode:
authorBradley Sepos <[email protected]>2019-10-13 11:59:14 -0400
committerBradley Sepos <[email protected]>2019-10-14 13:57:20 -0400
commit72361fca012a05fd3d20f950fd051dbf374adcba (patch)
treeaf01fb7417b5eef65f0fa1e2ffba45c615a12506 /contrib/freetype/P00-mingw-lib.patch
parent05e599c6cd1f0dfbcc4d6d4d51fadb3db2c88934 (diff)
contrib: Update to freetype 2.10.1.
Diffstat (limited to 'contrib/freetype/P00-mingw-lib.patch')
-rw-r--r--contrib/freetype/P00-mingw-lib.patch24
1 files changed, 12 insertions, 12 deletions
diff --git a/contrib/freetype/P00-mingw-lib.patch b/contrib/freetype/P00-mingw-lib.patch
index 607a0956c..e7e09e2cc 100644
--- a/contrib/freetype/P00-mingw-lib.patch
+++ b/contrib/freetype/P00-mingw-lib.patch
@@ -1,24 +1,24 @@
-diff -ur freetype-2.9.1.orig/builds/unix/ftconfig.in freetype-2.9.1/builds/unix/ftconfig.in
---- freetype-2.9.1.orig/builds/unix/ftconfig.in 2018-04-22 05:41:36.000000000 -0400
-+++ freetype-2.9.1/builds/unix/ftconfig.in 2019-02-26 15:43:31.000000000 -0500
-@@ -490,7 +490,7 @@
+diff -ur freetype-2.10.1.orig/builds/unix/ftconfig.in freetype-2.10.1/builds/unix/ftconfig.in
+--- freetype-2.10.1.orig/builds/unix/ftconfig.in 2019-02-23 04:06:06.000000000 -0500
++++ freetype-2.10.1/builds/unix/ftconfig.in 2019-10-13 16:10:52.000000000 -0400
+@@ -488,7 +488,7 @@
#ifdef FT2_BUILD_LIBRARY
- #if defined( _WIN32 ) && ( defined( _DLL ) || defined( DLL_EXPORT ) )
+ #if defined( _WIN32 ) && defined( DLL_EXPORT )
-#define FT_EXPORT( x ) __declspec( dllexport ) x
+#define FT_EXPORT( x ) x
#elif defined( __GNUC__ ) && __GNUC__ >= 4
#define FT_EXPORT( x ) __attribute__(( visibility( "default" ) )) x
- #elif defined( __cplusplus )
-diff -ur freetype-2.9.1.orig/include/freetype/config/ftconfig.h freetype-2.9.1/include/freetype/config/ftconfig.h
---- freetype-2.9.1.orig/include/freetype/config/ftconfig.h 2018-04-22 05:41:36.000000000 -0400
-+++ freetype-2.9.1/include/freetype/config/ftconfig.h 2019-02-26 15:43:49.000000000 -0500
-@@ -458,7 +458,7 @@
+ #elif defined( __SUNPRO_C ) && __SUNPRO_C >= 0x550
+diff -ur freetype-2.10.1.orig/include/freetype/config/ftconfig.h freetype-2.10.1/include/freetype/config/ftconfig.h
+--- freetype-2.10.1.orig/include/freetype/config/ftconfig.h 2019-02-23 04:06:06.000000000 -0500
++++ freetype-2.10.1/include/freetype/config/ftconfig.h 2019-10-13 16:12:48.000000000 -0400
+@@ -460,7 +460,7 @@
#ifdef FT2_BUILD_LIBRARY
- #if defined( _WIN32 ) && ( defined( _DLL ) || defined( DLL_EXPORT ) )
+ #if defined( _WIN32 ) && defined( DLL_EXPORT )
-#define FT_EXPORT( x ) __declspec( dllexport ) x
+#define FT_EXPORT( x ) x
#elif defined( __GNUC__ ) && __GNUC__ >= 4
#define FT_EXPORT( x ) __attribute__(( visibility( "default" ) )) x
- #elif defined( __cplusplus )
+ #elif defined( __SUNPRO_C ) && __SUNPRO_C >= 0x550