Date: Tue, 19 Mar 2013 08:03:56 +0000 (UTC) From: Maho Nakata <maho@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314623 - in head/editors/openoffice-3: . files Message-ID: <201303190803.r2J83usS096110@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: maho Date: Tue Mar 19 08:03:55 2013 New Revision: 314623 URL: http://svnweb.freebsd.org/changeset/ports/314623 Log: * patches are needed for new glib [1] * move bison section to appropreate place. Submitted by: Jan Henrik Sylvester <me@janh.de> [1] Added: head/editors/openoffice-3/files/patch-main_avmedia_source_gstreamer_gstplayer.hxx (contents, props changed) head/editors/openoffice-3/files/patch-main_ucb_source_ucp_gvfs_gvfs_content.hxx (contents, props changed) Modified: head/editors/openoffice-3/Makefile Modified: head/editors/openoffice-3/Makefile ============================================================================== --- head/editors/openoffice-3/Makefile Tue Mar 19 07:48:25 2013 (r314622) +++ head/editors/openoffice-3/Makefile Tue Mar 19 08:03:55 2013 (r314623) @@ -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}/archiver p5-libwww>=0:${PORTSDIR}/www/p5-libwww USE_AUTOTOOLS= autoconf -USES= bison GNU_CONFIGURE= yes WRKSRC?= ${WRKDIR}/aoo-${PORTVERSION}/main BASH?= ${PREFIX}/bin/bash Added: head/editors/openoffice-3/files/patch-main_avmedia_source_gstreamer_gstplayer.hxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-3/files/patch-main_avmedia_source_gstreamer_gstplayer.hxx Tue Mar 19 08:03:55 2013 (r314623) @@ -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 Added: head/editors/openoffice-3/files/patch-main_ucb_source_ucp_gvfs_gvfs_content.hxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-3/files/patch-main_ucb_source_ucp_gvfs_gvfs_content.hxx Tue Mar 19 08:03:55 2013 (r314623) @@ -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> +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303190803.r2J83usS096110>