From 08245ad004d944a369b8149f706d89cca4ad94cd Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Wed, 5 Feb 2014 00:42:29 +0000 Subject: Update to 1560773 https://cwiki.apache.org/confluence/display/OOOUSERS/Development+Snapshot+Builds Now we set USE_GCC to avoid gcc 4.2.1 (along with FBSD9) bug. --- editors/openoffice-devel/files/patch-sal | 53 ++++++++++++++++++++++ .../patch-vcl_source_glyphs_graphite_adaptors.cxx | 11 +++++ editors/openoffice-devel/files/patch-webdav | 34 ++++++++++++++ 3 files changed, 98 insertions(+) create mode 100644 editors/openoffice-devel/files/patch-sal create mode 100644 editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite_adaptors.cxx create mode 100644 editors/openoffice-devel/files/patch-webdav (limited to 'editors/openoffice-devel/files') diff --git a/editors/openoffice-devel/files/patch-sal b/editors/openoffice-devel/files/patch-sal new file mode 100644 index 000000000000..ca4899eb8b02 --- /dev/null +++ b/editors/openoffice-devel/files/patch-sal @@ -0,0 +1,53 @@ +--- sal/inc/rtl/string.hxx 2014-01-24 03:32:49.000000000 +0900 ++++ sal/inc/rtl/string.hxx 2014-02-04 14:57:30.000000000 +0900 +@@ -234,8 +234,9 @@ + @return a pointer to a (not necessarily null-terminated) byte string + representing the characters of this string object. + */ +- operator const sal_Char *() const SAL_THROW(()) { return pData->buffer; } ++ + public: ++ operator const sal_Char *() const SAL_THROW(()) { return pData->buffer; } + /** Returns a reference to a character of this string. */ + sal_Char& operator[]( int n ) { return pData->buffer[n]; } + /** Returns a const reference to a character of this string. */ +build -- version: 275224 + + +============= +Building module canvas +============= + +Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/inc + + +Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/factory + + +Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/tools + + +Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/null + + +Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/vcl + + +Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo + +Compiling: canvas/source/cairo/cairo_textlayout.cxx +g++46 -fmessage-length=0 -c -O2 -fno-strict-aliasing -DENABLE_LAYOUT=0 -DENABLE_LAYOUT_EXPERIMENTAL=0 -I/usr/local/include/cairo -I/usr/local/include/glib-2.0 -I/usr/local/include/pixman-1 -I/usr/local/include/freetype2 -I/usr/local/include/libpng15 -D_THREAD_SAFE -I/usr/local/include -I/usr/local/include/freetype2 -I. -I../../unxfbsdx.pro/inc/cairocanvas -I../inc -I../../inc/pch -I../../inc -I../../unx/inc -I../../unxfbsdx.pro/inc -I. -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/stl -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/external -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solenv/unxfbsdx/inc -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solenv/inc -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/res -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solenv/inc/Xp31 -I/usr/local/openjdk6/include -I/usr/local/openjdk6/include/freebsd -I/usr/local/openjdk6/include/bsd -I/usr/local/openjdk6/include/linux -I/usr/local/openjdk6/include/native_threads/include -I/usr/local/include -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/offuh -I. -I../../res -I. -pipe -Wl,-rpath=/usr/local/lib/gcc46 -fvisibility-inlines-hidden -g1 -Wall -Wextra -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fpic -DFREEBSD -DUNX -DVCL -DGCC -DC341 -DX86_64 -DX86_64 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DHAVE_GCC_VISIBILITY_FEATURE -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/local/lib/gcc46/include/c++ -DSUPD=410 -DPRODUCT -DNDEBUG -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DGUI -DSOLAR_JAVA -DVERBOSE -DSHAREDLIB -D_DLL_ -fexceptions -fno-enforce-eh-specs -DEXCEPTIONS_ON -o ../../unxfbsdx.pro/slo/cairo_textlayout.o /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx +/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx: In member function 'void cairocanvas::TextLayout::useFont(cairo::Cairo*)': +/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx:237:5: error: 'rtl::OString::operator const sal_Char*() const' is private +/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:315:157: error: within this context +/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx: In member function 'bool cairocanvas::TextLayout::draw(cairo::Cairo*)': +/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx:237:5: error: 'rtl::OString::operator const sal_Char*() const' is private +/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:336:40: error: within this context +/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx: In member function 'bool cairocanvas::TextLayout::draw(cairo::SurfaceSharedPtr&, OutputDevice&, const Point&, const com::sun::star::rendering::ViewState&, const com::sun::star::rendering::RenderState&) const': +/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:475:51: warning: declaration of 'aIter' shadows a previous local [-Wshadow] +/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:415:47: warning: shadowed declaration is here [-Wshadow] +/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:476:57: warning: declaration of 'aEnd' shadows a previous local [-Wshadow] +/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:416:53: warning: shadowed declaration is here [-Wshadow] +dmake: Error code 1, while making '../../unxfbsdx.pro/slo/cairo_textlayout.obj' +ERROR: error 65280 occurred while making /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo + diff --git a/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite_adaptors.cxx b/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite_adaptors.cxx new file mode 100644 index 000000000000..28d522376d42 --- /dev/null +++ b/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite_adaptors.cxx @@ -0,0 +1,11 @@ +--- vcl/source/glyphs/graphite_adaptors.cxx.orig 2013-08-13 11:45:43.000000000 +0000 ++++ vcl/source/glyphs/graphite_adaptors.cxx 2013-12-31 16:39:41.000000000 +0000 +@@ -45,7 +45,7 @@ + + #include + +-#include ++#include + + // Module + #include "gcach_ftyp.hxx" diff --git a/editors/openoffice-devel/files/patch-webdav b/editors/openoffice-devel/files/patch-webdav new file mode 100644 index 000000000000..a18233a02e3e --- /dev/null +++ b/editors/openoffice-devel/files/patch-webdav @@ -0,0 +1,34 @@ +--- ucb/source/ucp/webdav/SerfUri.hxx_ 2014-02-04 14:39:02.000000000 +0900 ++++ ucb/source/ucp/webdav/SerfUri.hxx 2014-02-04 14:39:18.000000000 +0900 +@@ -23,7 +23,7 @@ + #ifndef INCLUDED_SERFURI_HXX + #define INCLUDED_SERFURI_HXX + +-#include ++#include + #include + #include "DAVException.hxx" + +--- ucb/source/ucp/webdav/SerfSession.cxx_ 2014-02-04 14:40:19.000000000 +0900 ++++ ucb/source/ucp/webdav/SerfSession.cxx 2014-02-04 14:40:26.000000000 +0900 +@@ -30,7 +30,7 @@ + #include "ucbhelper/simplecertificatevalidationrequest.hxx" + + #include "AprEnv.hxx" +-#include ++#include + + #include "DAVAuthListener.hxx" + #include "SerfTypes.hxx" + +--- ucb/source/ucp/webdav/SerfTypes.hxx 2014-01-24 03:33:21.000000000 +0900 ++++ ucb/source/ucp/webdav/SerfTypes.hxx 2014-02-04 14:38:44.000000000 +0900 +@@ -24,7 +24,7 @@ + #ifndef INCLUDED_SERFTYPES_HXX + #define INCLUDED_SERFTYPES_HXX + +-#include ++#include + + typedef serf_connection_t SerfConnection; + -- cgit v1.2.3