[Libreoffice-commits] .: Branch 'libreoffice-3-4' - graphite/graphite2.placementnew.patch graphite/makefile.mk

[Caolán McNamara]

 graphite/graphite2.placementnew.patch |   10 ++++++++++
 graphite/makefile.mk                  |    3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 44fa311c6181aeddde4895cfd078d75ce79ef5e9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 23 11:48:04 2011 +0100

    placement new needs new header included

diff --git a/graphite/graphite2.placementnew.patch b/graphite/graphite2.placementnew.patch
new file mode 100644
index 0000000..47b50a2
--- /dev/null
+++ b/graphite/graphite2.placementnew.patch
@@ -0,0 +1,10 @@
+--- misc/graphite2-1.0.2/src/GlyphFace.cpp	2011-08-23 11:37:11.971472000 +0100
++++ misc/build/graphite2-1.0.2/src/GlyphFace.cpp	2011-08-23 11:38:13.979750400 +0100
+@@ -25,6 +25,7 @@
+ of the License or (at your option) any later version.
+ */
+ #include <iterator>
++#include <new>
+ #include "GlyphFace.h"
+ #include "XmlTraceLog.h"
+ #include "GlyphFaceCache.h"
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index ab6bce7..522c261 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -48,7 +48,8 @@ all:
 TARFILE_NAME=graphite2-1.0.2
 TARFILE_MD5=3115c721f5cb7c464f01c2dddccfaba6
 PATCH_FILES= graphite2.patch \
-        graphite_make.patch
+        graphite_make.patch \
+        graphite2.placementnew.patch
 
 ADDITIONAL_FILES= \
     src/makefile.mk