Kaydet (Commit) f0d1a2e9 authored tarafından Martin Hosken's avatar Martin Hosken Kaydeden (comit) Caolán McNamara

Update graphite to 1.2.0

Change-Id: I768df17c12e918a39e2011e3ce639e0c4ac4d451
Reviewed-on: https://gerrit.libreoffice.org/780Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 60a93729
--- 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
--- 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
......
......@@ -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
......
......@@ -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@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment