[Libreoffice-commits] .: graphite/graphite2.patch graphite/graphite_make.patch graphite/makefile.mk ooo.lst.in

[Libreoffice Gerrit user]

 graphite/graphite2.patch     |   12 ++++++------
 graphite/graphite_make.patch |    4 ++--
 graphite/makefile.mk         |    8 ++++----
 ooo.lst.in                   |    2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit f0d1a2e9927243bf650e280af9d9dcdaca8b603e
Author: Martin Hosken <martin_hosken at sil.org>
Date:   Sat Oct 6 22:08:10 2012 +0700

    Update graphite to 1.2.0
    
    Change-Id: I768df17c12e918a39e2011e3ce639e0c4ac4d451
    Reviewed-on: https://gerrit.libreoffice.org/780
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/graphite/graphite2.patch b/graphite/graphite2.patch
index d5a9565..2b6f64b 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 4532163..7b1339f 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 3793d6c..639f64b 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 
 
diff --git a/ooo.lst.in b/ooo.lst.in
index 06081e4..ff82e21 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -87,7 +87,7 @@ a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
 @MDDS_TARBALL@
 @BOOST_TARBALL@
 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
-3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
+f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz
 @VISIO_TARBALL@
 @CMIS_TARBALL@
 @CDR_TARBALL@