diff options
| author | Martin Hosken <martin_hosken@sil.org> | 2012-10-06 22:08:10 +0700 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-10-11 11:39:08 +0000 |
| commit | f0d1a2e9927243bf650e280af9d9dcdaca8b603e (patch) | |
| tree | 28c1b5a309d6b94b6395bafbf7f2fac00039f477 /graphite | |
| parent | 60a93729c95d31edab50a905236faa9e38a81556 (diff) | |
Update graphite to 1.2.0
Change-Id: I768df17c12e918a39e2011e3ce639e0c4ac4d451
Reviewed-on: https://gerrit.libreoffice.org/780
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'graphite')
| -rw-r--r-- | graphite/graphite2.patch | 12 | ||||
| -rw-r--r-- | graphite/graphite_make.patch | 4 | ||||
| -rw-r--r-- | graphite/makefile.mk | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/graphite/graphite2.patch b/graphite/graphite2.patch index d5a956553ad1..2b6f64b7b0b1 100644 --- a/graphite/graphite2.patch +++ b/graphite/graphite2.patch @@ -1,12 +1,12 @@ ---- misc/graphite2-1.0.3/include/graphite2/Types.h 2011-02-12 16:54:16.000000000 +0100 -+++ misc/build/graphite2-1.0.3/include/graphite2/Types.h 2011-03-15 21:38:06.264788098 +0100 -@@ -36,7 +36,8 @@ +--- 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 - #ifdef GR2_EXPORTING - #ifdef __GNUC__ - #define GR2_API __attribute__((dllexport)) + #if defined GRAPHITE2_STATIC + #define GR2_API + #elif defined GRAPHITE2_EXPORTING diff --git a/graphite/graphite_make.patch b/graphite/graphite_make.patch index 4532163be5b0..7b1339f4d800 100644 --- a/graphite/graphite_make.patch +++ b/graphite/graphite_make.patch @@ -1,5 +1,5 @@ ---- misc/build/graphite2-1.0.3/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 -+++ misc/build/graphite2-1.0.3/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 +--- misc/build/graphite2-1.2.0/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 ++++ misc/build/graphite2-1.2.0/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 @@ -1,1 +1,38 @@ -dummy +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 3793d6c54778..639f64bab43c 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -39,14 +39,14 @@ TARGET=libgraphite .IF "$(SYSTEM_GRAPHITE)" == "YES" all: - @echo "An already available installation of graphite2 should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." + @echo "An already available installation of graphite2 should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." .ENDIF # --- Files -------------------------------------------------------- .IF "$(ENABLE_GRAPHITE)"=="TRUE" -TARFILE_NAME=graphite2-1.0.3 -TARFILE_MD5=3bf481ca95109b14435125c0dd1f2217 +TARFILE_NAME=graphite2-1.2.0 +TARFILE_MD5=f5ef3f7f10fa8c3542c6a085a233080b PATCH_FILES= graphite2.patch \ graphite_make.patch |