ooo-build r14992 - in branches/ooo-build-3-0-1: . patches/dev300
- From: brosenk svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14992 - in branches/ooo-build-3-0-1: . patches/dev300
- Date: Sun, 4 Jan 2009 00:38:28 +0000 (UTC)
Author: brosenk
Date: Sun Jan 4 00:38:28 2009
New Revision: 14992
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14992&view=rev
Log:
fix for building with boost 1.37
Added:
branches/ooo-build-3-0-1/patches/dev300/oox-boost-1.37.diff
Modified:
branches/ooo-build-3-0-1/ChangeLog
branches/ooo-build-3-0-1/patches/dev300/apply
Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply (original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply Sun Jan 4 00:38:28 2009
@@ -1042,6 +1042,9 @@
# OpenJDK paths for some archs
config_office-openjdk-paths.diff, i91783
+# Make oox compile with boost 1.37.0
+oox-boost-1.37.diff
+
[ BuildBits == ooo300-m13 ]
# fix build after cws swffixes
cws-swffixes02.diff, i#96970
Added: branches/ooo-build-3-0-1/patches/dev300/oox-boost-1.37.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/oox-boost-1.37.diff Sun Jan 4 00:38:28 2009
@@ -0,0 +1,10 @@
+--- oox/inc/oox/drawingml/diagram/diagram.hxx.ark 2009-01-03 13:04:49.527708247 +0100
++++ oox/inc/oox/drawingml/diagram/diagram.hxx 2009-01-03 13:05:33.668117830 +0100
+@@ -34,6 +34,7 @@
+ #define OOX_DRAWINGML_DIAGRAM_HXX
+
+ #include <vector>
++#include <boost/weak_ptr.hpp>
+ #include <boost/shared_ptr.hpp>
+ #include <boost/enable_shared_from_this.hpp>
+ #include "oox/drawingml/shape.hxx"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]