From 49c41ff9d38412891f08505f1cad3c1e6f21b85a Mon Sep 17 00:00:00 2001
From: Maho Nakata <maho@FreeBSD.org>
Date: Tue, 19 Mar 2013 08:03:55 +0000
Subject: * patches are needed for new glib  [1] * move bison section to
 appropreate place.

Submitted by:	Jan Henrik Sylvester <me@janh.de> [1]
---
 editors/openoffice-3/Makefile                                |  2 +-
 .../files/patch-main_avmedia_source_gstreamer_gstplayer.hxx  | 11 +++++++++++
 .../files/patch-main_ucb_source_ucp_gvfs_gvfs_content.hxx    | 12 ++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 editors/openoffice-3/files/patch-main_avmedia_source_gstreamer_gstplayer.hxx
 create mode 100644 editors/openoffice-3/files/patch-main_ucb_source_ucp_gvfs_gvfs_content.hxx

(limited to 'editors/openoffice-3')

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index e01ed55f49ea..cbc9b07e626f 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -28,6 +28,7 @@ USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_PERL5_BUILD=	yes
 USE_BZIP2=	yes
+USES+=		bison
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
 
@@ -140,7 +141,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
 USE_AUTOTOOLS=	autoconf
-USES=		bison
 GNU_CONFIGURE=	yes
 WRKSRC?=	${WRKDIR}/aoo-${PORTVERSION}/main
 BASH?=		${PREFIX}/bin/bash
diff --git a/editors/openoffice-3/files/patch-main_avmedia_source_gstreamer_gstplayer.hxx b/editors/openoffice-3/files/patch-main_avmedia_source_gstreamer_gstplayer.hxx
new file mode 100644
index 000000000000..aac1ed8859aa
--- /dev/null
+++ b/editors/openoffice-3/files/patch-main_avmedia_source_gstreamer_gstplayer.hxx
@@ -0,0 +1,11 @@
+--- avmedia/source/gstreamer/gstplayer.hxx.ORIG	2013-03-09 04:35:46.000000000 +0000
++++ avmedia/source/gstreamer/gstplayer.hxx	2013-03-09 11:57:13.000000000 +0000
+@@ -28,7 +28,7 @@
+ 
+ #include "gstcommon.hxx"
+ #include <glib.h>
+-#include <glib/gatomic.h>
++//#include <glib/gatomic.h>
+ 
+ // necessary for mixed environments with GStreamer-0.10 and GLib versions < 2.8
+ #ifndef G_GNUC_NULL_TERMINATED
diff --git a/editors/openoffice-3/files/patch-main_ucb_source_ucp_gvfs_gvfs_content.hxx b/editors/openoffice-3/files/patch-main_ucb_source_ucp_gvfs_gvfs_content.hxx
new file mode 100644
index 000000000000..915f695bd205
--- /dev/null
+++ b/editors/openoffice-3/files/patch-main_ucb_source_ucp_gvfs_gvfs_content.hxx
@@ -0,0 +1,12 @@
+--- ucb/source/ucp/gvfs/gvfs_content.hxx.ORIG	2011-11-07 16:59:40.000000000 +0000
++++ ucb/source/ucp/gvfs/gvfs_content.hxx	2013-03-09 13:53:52.000000000 +0000
+@@ -30,7 +30,8 @@
+ #include <com/sun/star/ucb/XContentCreator.hpp>
+ #include <ucbhelper/contenthelper.hxx>
+ 
+-#include <glib/gthread.h>
++#include <glib.h>
++//#include <glib/gthread.h>
+ #include <libgnomevfs/gnome-vfs-ops.h>
+ #include <libgnomevfs/gnome-vfs-directory.h>
+ 
-- 
cgit v1.2.3