diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-12-12 16:34:07 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-12 17:55:51 +0000 |
| commit | 94886f8324b7eae3ed1a75191f86be4c358a600d (patch) | |
| tree | 4004b705e946a7f596c1f49c4bedbf9e240975b6 /external | |
| parent | 3cdf111672ae41f85f7fa6f90d4d000182e8d50b (diff) | |
Update bundled Graphite to 1.2.4
Change-Id: Id8c90b58c40bd449617c58f6c9e7cdea035a1c41
Reviewed-on: https://gerrit.libreoffice.org/7056
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/graphite/UnpackedTarball_graphite.mk | 2 | ||||
| -rw-r--r-- | external/graphite/graphite2.patch | 29 |
2 files changed, 0 insertions, 31 deletions
diff --git a/external/graphite/UnpackedTarball_graphite.mk b/external/graphite/UnpackedTarball_graphite.mk index 35ca233268c3..4c4a0d052292 100644 --- a/external/graphite/UnpackedTarball_graphite.mk +++ b/external/graphite/UnpackedTarball_graphite.mk @@ -11,10 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,graphite)) $(eval $(call gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL))) -# http://projects.palaso.org/issues/1030 # http://projects.palaso.org/issues/1115 $(eval $(call gb_UnpackedTarball_add_patches,graphite,\ - external/graphite/graphite2.patch \ external/graphite/graphite2.issue1115.patch.1 \ )) diff --git a/external/graphite/graphite2.patch b/external/graphite/graphite2.patch deleted file mode 100644 index c7739ad441cb..000000000000 --- a/external/graphite/graphite2.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- misc/graphite2-1.2.0/include/graphite2/Types.h 2011-02-12 16:54:16.000000000 +0100 -+++ misc/build/graphite2-1.2.0/include/graphite2/Types.h 2011-03-15 21:38:06.264788098 +0100 -@@ -41,7 +41,8 @@ - }; - - // Definitions for library publicly exported symbols --#if defined _WIN32 || defined __CYGWIN__ -+#define GR2_STATIC 1 -+#if ( defined _WIN32 || defined __CYGWIN__ ) && !defined GR2_STATIC - #if defined GRAPHITE2_STATIC - #define GR2_API - #elif defined GRAPHITE2_EXPORTING ---- misc/graphite2-1.2.0/src/inc/json.h -+++ misc/build/graphite2-1.2.0/src/inc/json.h -@@ -146,6 +146,14 @@ - inline - json & operator << (json & j, unsigned int d) throw() { return j << json::integer(d); } - -+#if defined(_WIN64) -+inline -+json & operator << (json & j, __int64 d) throw() { return j << json::integer((unsigned int)d); } -+ -+inline -+json & operator << (json & j, size_t d) throw() { return j << json::integer((unsigned int)d); } -+ -+#endif - inline - json & operator << (json & j, char c) throw () - { |