diff options
| -rw-r--r-- | editors/openoffice-3-devel/Makefile | 9 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/distinfo | 8 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/files/patch-graphite | 17 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/files/patch-vcl | 24 |
4 files changed, 47 insertions, 11 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index b2c153688e9f..274f52d26cc8 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -28,7 +28,6 @@ USE_XORG= x11 ice xaw xau xext xrender xrandr \ xi xt xcursor xdamage xcomposite xfixes USE_GL= gl glu USE_GSTREAMER= yes -USE_GCC= 4.6+ USE_GMAKE= yes USE_PYTHON= yes USE_PERL5_BUILD= yes @@ -56,7 +55,7 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh OOOSRC= ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX} EXTSRC= ApacheOpenOffice.ext_sources.r${SVNREVISION}${EXTRACT_SUFX} OOODIR= openoffice.org3 -SVNREVISION= 1245861 +SVNREVISION= 1290975 INSTALLATION_BASEDIR?= openoffice-r${SVNREVISION} EXECBASE?= openoffice-r${SVNREVISION} DIST_SUBDIR= openoffice @@ -174,11 +173,7 @@ CONFIGURE_ARGS+= --enable-verbose \ --with-system-saxon \ --with-saxon-jar=${JAVALIBDIR}/saxon9.jar \ --with-system-beanshell \ - --with-beanshell-jar=${JAVALIBDIR}/bsh.jar \ - --without-stlport - -# stlport_gcc.5:${PORTSDIR}/devel/stlport -# --with-stlport=${LOCALBASE} + --with-beanshell-jar=${JAVALIBDIR}/bsh.jar OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt OOOEXTENSIONS+= presenter/presenter-screen.oxt diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index ca8218b6cfdd..5fa6afd8a5cf 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,6 +1,6 @@ -SHA256 (openoffice/ApacheOpenOffice.r1245861.tar.bz2) = 46eb06c4c927c02673e4393a6ebf7924bc5faa8b4bfb536354c43543f72b2f7d -SIZE (openoffice/ApacheOpenOffice.r1245861.tar.bz2) = 250905951 -SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1245861.tar.bz2) = a94233e6ea773be6adb2ebf6ec481110783c1dbe7f175ed8c8ea74d563dc30ee -SIZE (openoffice/ApacheOpenOffice.ext_sources.r1245861.tar.bz2) = 215140993 +SHA256 (openoffice/ApacheOpenOffice.r1290975.tar.bz2) = 8a4f23db64bc9193afee63b2946625778f9951ab1c53b586cffe1bfeafbeb89b +SIZE (openoffice/ApacheOpenOffice.r1290975.tar.bz2) = 250920298 +SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1290975.tar.bz2) = fb34fbcb1cd924f976f7127bafd5a5fe8771792652e09217a4be5ba2411c5aee +SIZE (openoffice/ApacheOpenOffice.ext_sources.r1290975.tar.bz2) = 215140461 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice/unowinreg.dll) = 6144 diff --git a/editors/openoffice-3-devel/files/patch-graphite b/editors/openoffice-3-devel/files/patch-graphite new file mode 100644 index 000000000000..c087ebebf3e4 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-graphite @@ -0,0 +1,17 @@ +--- graphite/graphite-2.3.1.patch 2012-02-19 18:21:39.000000000 +0900 ++++ graphite/graphite-2.3.1.patch 2012-02-20 08:13:43.000000000 +0900 +@@ -2394,3 +2394,14 @@ + { + bool fRet = true; + ++--- misc/silgraphite-2.3.1/engine/include/graphite/GrFeature.h 2009-01-22 07:36:40.000000000 +0900 +++++ misc/build/silgraphite-2.3.1/engine/include/graphite/GrFeature.h 2012-02-20 08:09:33.000000000 +0900 ++@@ -21,6 +21,8 @@ ++ ++ //:End Ignore ++ +++#define wstring basic_string<wchar_t> //quick dirty hack for not finding _STL::wstring +++ ++ #include "GrAppData.h" ++ ++ namespace gr diff --git a/editors/openoffice-3-devel/files/patch-vcl b/editors/openoffice-3-devel/files/patch-vcl new file mode 100644 index 000000000000..b5897169e595 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-vcl @@ -0,0 +1,24 @@ +temporary hack. -I/usr/local/include appears too early so that graphite +catches it thus build fails. + +/workdir && mkdir -p $W/CxxObject/vcl/unx/generic/gdi/ && mkdir -p $W/Dep/CxxObject/vcl/unx/generic/gdi/ && c++ -DCPPU_ENV=gcc3 -DCUI -DENABLE_GRAPHITE -DENABLE_GTK -DENABLE_LAYOUT=0 -DENABLE_LAYOUT_EXPERIMENTAL=0 -DFREEBSD -DGCC -DGXX_INCLUDE_PATH=/usr/include/c++/4.2 -DHAVE_GCC_VISIBILITY_FEATURE -DNDEBUG -DOPTIMIZE -DOSL_DEBUG_LEVEL=0 -DPRODUCT -DPRODUCT_FULL -DSOLAR_JAVA -DSTLPORT_VERSION=400 -DSUPD=340 -DUNIX -DUNX -DVCL -DX86_64 -D_PTHREADS -D_REENTRANT -D_XSALSET_LIBNAME=\"libspa.so\" -DVCLPLUG_GEN_IMPLEMENTATION -DUSE_RANDR -DUSE_XINERAMA_XORG -Wall -Wendif-labels -Wextra -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -Wshadow -fPIC -fmessage-length=0 -fno-common -fno-strict-aliasing -fno-use-cxa-atexit -fvisibility-inlines-hidden -fvisibility=hidden -pipe -D_THREAD_SAFE -I/usr/local/include -DEXCEPTIONS_ON -fexceptions -fno-enforce-eh-specs -Os -c $S/vcl/unx/generic/gdi/pspgraphics.cxx -o $W/CxxObject/vcl/unx/generic/gdi/pspgraphics.o -MMD -MT $W/CxxObject/vcl/unx/generic/gdi/pspgraphics.o -MF $W/Dep/CxxObject/vcl/unx/generic/gdi/pspgraphics.d -I$S/vcl/unx/generic/gdi/ -I$O/inc/stl -I$O/inc/stl -Iaaa -I$O/inc/external -I$O/inc -I$S/solenv/unxfbsdx/inc -I$S/solenv/inc -I$S/res -I$S/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$S/vcl/inc -I$S/vcl/inc/pch -I$S/solenv/inc -I$O/inc/offuh -I$O/inc/stl -I$O/inc +In file included from /usr/local/include/graphite/GrClient.h:31, + from /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-3-devel/work/ooo/main/vcl/inc/graphite_layout.hxx:40, + from /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-3-devel/work/ooo/main/vcl/unx/generic/gdi/pspgraphics.cxx:52: +/usr/local/include/graphite/GrFeature.h:110: error: 'wstring' in namespace '_STL' does not name a type +/usr/local/include/graphite/GrFeature.h:111: error: 'wstring' in namespace '_STL' does not name a type +/usr/local/include/graphite/GrFeature.h:113: error: 'wstring' in namespace '_STL' does not name a type +In file included from /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-3-devel/work/ooo/main/vcl/inc/graphite_layout.hxx:41, + from /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-3-devel/work/ooo/main/vcl/unx/generic/gdi/pspgraphics.cxx:52: + + +--- vcl/Library_vclplug_gen.mk 2012-02-20 11:32:20.000000000 +0900 ++++ vcl/Library_vclplug_gen.mk 2012-02-20 11:53:47.000000000 +0900 +@@ -125,7 +125,6 @@ + ifeq ($(XRANDR_DLOPEN),FALSE) + $(eval $(call gb_Library_set_cxxflags,vclplug_gen,\ + $$(CXXFLAGS) \ +- $$(XRANDR_CFLAGS) \ + )) + $(eval $(call gb_Library_set_ldflags,vclplug_gen,\ + $$(LDFLAGS) \ |