Date: Wed, 5 Feb 2014 00:42:29 +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: r342617 - in head/editors/openoffice-devel: . files Message-ID: <201402050042.s150gTXE044469@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: maho Date: Wed Feb 5 00:42:29 2014 New Revision: 342617 URL: http://svnweb.freebsd.org/changeset/ports/342617 QAT: https://qat.redports.org/buildarchive/r342617/ Log: 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. Added: head/editors/openoffice-devel/files/patch-sal (contents, props changed) head/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite_adaptors.cxx (contents, props changed) head/editors/openoffice-devel/files/patch-webdav (contents, props changed) Modified: head/editors/openoffice-devel/Makefile head/editors/openoffice-devel/distinfo Modified: head/editors/openoffice-devel/Makefile ============================================================================== --- head/editors/openoffice-devel/Makefile Wed Feb 5 00:04:33 2014 (r342616) +++ head/editors/openoffice-devel/Makefile Wed Feb 5 00:42:29 2014 (r342617) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= apache-openoffice -PORTVERSION= 4.0.${SVNREVISION} +PORTVERSION= 4.1.${SVNREVISION} PORTEPOCH= 1 -PORTREVISION= 1 CATEGORIES= editors java MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= maho/openoffice @@ -25,7 +24,7 @@ USE_XORG= x11 ice xaw xau xext xrender x xi xt xcursor xdamage xcomposite xfixes USE_GL= gl glu USE_GSTREAMER= yes -USE_GCC= 4.6+ +USE_GCC= yes USE_PYTHON= yes USE_BZIP2= yes USES+= bison perl5 gmake pkgconfig @@ -72,7 +71,7 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh OOOSRC= ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX} EXTSRC= ApacheOpenOffice.ext_sources.r${SVNREVISION}_2${EXTRACT_SUFX} OOODIR= openoffice4 -SVNREVISION= 1543006 +SVNREVISION= 1560773 INSTALLATION_BASEDIR?= openoffice-r${SVNREVISION} EXECBASE?= openoffice-r${SVNREVISION} DIST_SUBDIR= openoffice @@ -171,7 +170,6 @@ CONFIGURE_ARGS+= --enable-verbose \ --with-system-libxml \ --with-system-libxslt \ --with-system-cairo --enable-cairo \ - --with-system-boost \ --with-system-zlib \ --with-system-python \ --with-system-expat \ @@ -208,7 +206,9 @@ CONFIGURE_ARGS+= --enable-verbose \ --with-beanshell-jar=${JAVALIBDIR}/bsh.jar \ --without-fonts \ --with-system-serf \ - --with-system-nss + --with-system-nss \ + --without-stlport + # --with-system-jpeg # --enable-pdfimport # --without-stlport --disable-mozilla \ Modified: head/editors/openoffice-devel/distinfo ============================================================================== --- head/editors/openoffice-devel/distinfo Wed Feb 5 00:04:33 2014 (r342616) +++ head/editors/openoffice-devel/distinfo Wed Feb 5 00:42:29 2014 (r342617) @@ -1,6 +1,6 @@ -SHA256 (openoffice/ApacheOpenOffice.r1543006.tar.bz2) = ab2b5757564119e85189764b12b108afb95cec12af8859c0d92e1536cb21ad17 -SIZE (openoffice/ApacheOpenOffice.r1543006.tar.bz2) = 243940352 -SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1543006_2.tar.bz2) = cf78c1c9f1a6441fa0f4a4848207af96a208bde9bd4674302ef21fb5fc43901c -SIZE (openoffice/ApacheOpenOffice.ext_sources.r1543006_2.tar.bz2) = 89089218 +SHA256 (openoffice/ApacheOpenOffice.r1560773.tar.bz2) = 5a6247121703b10c44161594c23f439d5488bf011750ed7e0632b3f033e67aea +SIZE (openoffice/ApacheOpenOffice.r1560773.tar.bz2) = 245790501 +SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1560773_2.tar.bz2) = ae9ab2fc1eeead0700ce95b8af01fab4f4b45f3f008d43b214f7ddec7f8c8e41 +SIZE (openoffice/ApacheOpenOffice.ext_sources.r1560773_2.tar.bz2) = 147382699 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice/unowinreg.dll) = 6144 Added: head/editors/openoffice-devel/files/patch-sal ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-devel/files/patch-sal Wed Feb 5 00:42:29 2014 (r342617) @@ -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/po rts/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_INCL UDE_PATH=/usr/local/lib/gcc46/include/c++ -D! SUPD=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 + Added: head/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite_adaptors.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite_adaptors.cxx Wed Feb 5 00:42:29 2014 (r342617) @@ -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 <salgdi.hxx> + +-#include <freetype/ftsynth.h> ++#include <ftsynth.h> + + // Module + #include "gcach_ftyp.hxx" Added: head/editors/openoffice-devel/files/patch-webdav ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-devel/files/patch-webdav Wed Feb 5 00:42:29 2014 (r342617) @@ -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 <apr-util/apr_uri.h> ++#include <apr-1/apr_uri.h> + #include <rtl/ustring.hxx> + #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 <apr/apr_strings.h> ++#include <apr-1/apr_strings.h> + + #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 <serf/serf.h> ++#include <serf-1/serf.h> + + typedef serf_connection_t SerfConnection; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402050042.s150gTXE044469>