diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2015-08-05 06:13:33 +0800 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2015-08-05 06:13:33 +0800 |
| commit | 999d09cef678efe5fd9ca448382afa859033f493 (patch) | |
| tree | 3f91bae9801d8535d303d3d8684f4e7c5c02330e /editors/openoffice-4 | |
| parent | 26b6b78dd1074f13347666311e84c2f4ef682974 (diff) | |
| download | freebsd-ports-gnome-999d09cef678efe5fd9ca448382afa859033f493.tar.gz freebsd-ports-gnome-999d09cef678efe5fd9ca448382afa859033f493.tar.zst freebsd-ports-gnome-999d09cef678efe5fd9ca448382afa859033f493.zip | |
Various build updates from openoffice-devel (primarily r382334 and
r391960):
* patch-i118574 no longer seems necessary for a clean build
* Regnerate patch-i114430 with make makepatch
* Build using boost from ports instead of the bundled boost
* Build using silgraphite from ports instead of the bundled version
* Add missing LIB_DEPENDS that are brought in by other dependencies,
but are directly linked as requested by pkgconfig/*.pc
* Build using sane and xrender headers from ports instead of bundled
headers
* Update LICENSE* to account for bundled software
* Reformat pkg-message and mention that the scanner interface can be
enabled by installing sane-backends
* Pet portlint
Update patch-bridges*, patch-freebsd.mk, patch-jpeg, patch-nss, patch-sal,
patch-set_soenv.in, patch-unxfbsd.mk, and patch-webdav to the versions
accepted upstream, regenerated with make makepatch.
Regenerate patch-CVE-2015-1774 with make makepatch.
Approved by: mat (mentor, implicit)
Diffstat (limited to 'editors/openoffice-4')
21 files changed, 495 insertions, 593 deletions
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index ca43435d4769..59c345b0a42f 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= editors java MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ @@ -15,6 +15,7 @@ PKGNAMEPREFIX= ${LANG_PKGNAME}- PKGNAMESUFFIX= -${LANG_SUFFIX} .endif DISTFILES= ${OOOSRC} unowinreg.dll:unoreg ${EXTSRC}:extsrc +DIST_SUBDIR= openoffice EXTRACT_ONLY= ${OOOSRC} MAINTAINER= office@FreeBSD.org @@ -22,7 +23,28 @@ MAINTAINER= office@FreeBSD.org #Frequent Patch submitters should optionally sign Apache iCLA COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser -LICENSE= APACHE20 +LICENSE= APACHE20 ADOBE BSD3CLAUSE BSD4CLAUSE BSL ICU MIT MPL \ + PSFL TWAIN W3C +LICENSE_COMB= multi +LICENSE_NAME_ADOBE= Adobe Systems Incorporated license +LICENSE_NAME_ICU= ICU License +LICENSE_NAME_TWAIN= TWAIN Working Group license +LICENSE_NAME_W3C= W3C license +LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE_ALv2 +LICENSE_FILE_ADOBE= ${WRKSRC}/LICENSE_ADOBE +LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE_BSD3CLAUSE +LICENSE_FILE_BSD4CLAUSE= ${WRKSRC}/LICENSE_BSD4CLAUSE +LICENSE_FILE_BSL= ${WRKSRC}/LICENSE_BSL +LICENSE_FILE_ICU= ${WRKSRC}/LICENSE_ICU +LICENSE_FILE_MIT= ${WRKSRC}/LICENSE_MIT +LICENSE_FILE_MPL= ${WRKSRC}/LICENSE_MPL +LICENSE_FILE_PSFL= ${WRKSRC}/LICENSE_PSFL +LICENSE_FILE_TWAIN= ${WRKSRC}/LICENSE_TWAIN +LICENSE_FILE_W3C= ${WRKSRC}/LICENSE_W3C +LICENSE_PERMS_ADOBE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE_PERMS_ICU= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE_PERMS_TWAIN= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE_PERMS_W3C= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= \ p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \ @@ -31,11 +53,13 @@ BUILD_DEPENDS= \ ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \ zip:${PORTSDIR}/archivers/zip \ ant:${PORTSDIR}/devel/apache-ant \ + ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs \ dmake:${PORTSDIR}/devel/dmake \ epm:${PORTSDIR}/devel/epm \ ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ imake:${PORTSDIR}/devel/imake \ gpatch:${PORTSDIR}/devel/patch \ + ${LOCALBASE}/include/sane/sane.h:${PORTSDIR}/graphics/sane-backends \ ${LOCALBASE}/bin/vigra-config:${PORTSDIR}/graphics/vigra \ ${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \ ${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \ @@ -46,10 +70,12 @@ BUILD_DEPENDS= \ p5-libwww>=0:${PORTSDIR}/www/p5-libwww LIB_DEPENDS= \ libapr-1.so:${PORTSDIR}/devel/apr1 \ + libnspr4.so:${PORTSDIR}/devel/nspr \ libcurl.so:${PORTSDIR}/ftp/curl \ libcairo.so:${PORTSDIR}/graphics/cairo \ libpng.so:${PORTSDIR}/graphics/png \ libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \ + libgraphite.so:${PORTSDIR}/graphics/silgraphite \ libCoinMP.so:${PORTSDIR}/math/coinmp \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libnss3.so:${PORTSDIR}/security/nss \ @@ -59,8 +85,8 @@ LIB_DEPENDS= \ libtextcat.so:${PORTSDIR}/textproc/libtextcat \ libmythes-1.2.so:${PORTSDIR}/textproc/mythes \ librdf.so:${PORTSDIR}/textproc/redland \ - libserf-1.so:${PORTSDIR}/www/serf -# libgraphite.so:${PORTSDIR}/graphics/silgraphite + libserf-1.so:${PORTSDIR}/www/serf \ + libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ ${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \ @@ -73,7 +99,7 @@ AOOVERSION3= 1 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD AOOTAG= AOO411m6\(Build:9775\) SVNREVISION= 1617669 -EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20140918.tar.gz +EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3} AOOXXX= ${AOOVERSION1}${AOOVERSION2}${AOOVERSION3} @@ -84,7 +110,6 @@ OOODIR= openoffice${AOOVERSION1} AOOUDIR= .openoffice.org\/${AOOVERSION1} INSTALLATION_BASEDIR?= openoffice-${AOOSUFFIX} EXECBASE?= openoffice-${AOOSUFFIX} -DIST_SUBDIR= openoffice NO_LATEST_LINK= yes @@ -100,7 +125,8 @@ USE_PERL5= build USE_XORG= x11 ice xaw xau xext xrender xrandr \ xi xt xcursor xdamage xcomposite xfixes USES= autoreconf:autoconf bison compiler cpe desktop-file-utils \ - gmake jpeg perl5 pkgconfig python tar:bzip2 + gettext-runtime gmake iconv jpeg perl5 pkgconfig python \ + tar:bzip2 WITHOUT_CPU_CFLAGS= true CPE_PRODUCT= ${PORTNAME:S|apache-||} CPE_VENDOR= apache @@ -141,7 +167,7 @@ CXX= clang++35 CPPFLAGS+= -I${LOCALBASE}/include .else USE_GCC= yes -SUBST= "s/-fexceptions/& -fno-enforce-eh-specs/;s/-DHAVE_STL_INCLUDE_PATH//" +SUBST= "s/-fexceptions/& -fno-enforce-eh-specs/;s/-DHAVE_STL_INCLUDE_PATH/-DBOOST_TR1_DISABLE_INCLUDE_NEXT -DBOOST_TR1_GCC_INCLUDE_PATH=c++/" .endif .if ${ARCH} == amd64 @@ -189,6 +215,7 @@ CONFIGURE_ARGS+= \ --with-system-apr-util \ --with-system-beanshell \ --with-beanshell-jar=${JAVALIBDIR}/bsh.jar \ + --with-system-boost \ --enable-category-b \ --with-system-cairo --enable-cairo \ --with-system-coinmp \ @@ -201,6 +228,7 @@ CONFIGURE_ARGS+= \ --without-fonts \ --with-gnu-patch=${LOCALBASE}/bin/gpatch \ --with-gperf=${LOCALBASE}/bin/gperf \ + --with-system-graphite \ --enable-gtk \ --with-system-hunspell \ --with-external-dict-dir=${LOCALBASE}/share/hunspell \ @@ -225,6 +253,7 @@ CONFIGURE_ARGS+= \ --with-system-poppler \ --with-system-python \ --with-system-redland \ + --with-system-sane \ --with-system-serf \ --with-system-stdlibs \ --enable-symbols=small \ @@ -233,10 +262,8 @@ CONFIGURE_ARGS+= \ --enable-verbose \ --with-system-vigra \ --enable-wiki-publisher \ + --with-system-xrender \ --with-system-zlib -# system-graphite causes breakage when compiled with clang and linked -# with libc++ because aoo is compiled with gcc and linked with libstdc++. -# --with-system-graphite #OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt #OOOEXTENSIONS+= presenter/presenter-screen.oxt @@ -269,6 +296,34 @@ post-extract: ${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC} ${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/ ${RM} -rf ${WRKSRC}/l10n + ${SED} -e '\|^For main/vcl/unx/generic/fontmanager/parseAFM|,/^__/p' \ + -e '\|^For PostScript(R) AFM|,/^__/p' \ + -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_ADOBE} + ${SED} -e '\|^For main/unixODBC|,/^__/p' \ + -e '\|^For main/connectivity|,/^__/p' \ + -e '\|^For main/libtextcat/data|,/^__/p' \ + -e '\|^For integration of HSQLDB|,/^__/p' \ + -e '\|^For C preprocessor|,/^__/p' \ + -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSD3CLAUSE} + ${SED} -e '\|^For ICC |,/^__/p' \ + -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSD4CLAUSE} + ${SED} -e '\|^For integration of the C++ Boost |,/^__/p' \ + -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSL} + ${SED} -e '\|^For main/i18npool/source/breakiterator|,/^__/p' \ + -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_ICU} + ${SED} -e '\|^For Multi-Dimensional Data|,/^__/p' \ + -e '\|^For XSLT MathML Library|,/^__/p' \ + -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_MIT} + ${SED} -e '\|^For XMLSec Library|,/^__/p' \ + -e d ${WRKSRC}/LICENSE_category_b >> ${LICENSE_FILE_MIT} + ${SED} -e '\|^For Graphite|,$$d' \ + ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL} + ${SED} -e '\|^For main/filter/source/config/tools/merge/pyAltFCFGMerge|,/^__/p' \ + -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_PSFL} + ${SED} -e '\|^For main/twain|,/^__/p' \ + -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_TWAIN} + ${SED} -e '\|^For main/MathMLDTD|,/^__/p' \ + -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_W3C} post-patch: .if defined (USE_GCC) diff --git a/editors/openoffice-4/distinfo b/editors/openoffice-4/distinfo index e1c45f26e3d7..933016d385c1 100644 --- a/editors/openoffice-4/distinfo +++ b/editors/openoffice-4/distinfo @@ -1,6 +1,6 @@ SHA256 (openoffice/apache-openoffice-4.1.1-r1617669-src.tar.bz2) = bb89a6d2324ddfe4c475e5484fde0dea316078f6b8ff4d8a4ebc801d17f3ff9f SIZE (openoffice/apache-openoffice-4.1.1-r1617669-src.tar.bz2) = 219054455 -SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20140918.tar.gz) = c7085dbf597a31ef332585ab57041b7ec8baf29c5f6029a60be7b7c63cfcb166 -SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20140918.tar.gz) = 97839277 +SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa +SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice/unowinreg.dll) = 6144 diff --git a/editors/openoffice-4/files/patch-CVE-2015-1774 b/editors/openoffice-4/files/patch-CVE-2015-1774 index df307b7904aa..2c99e8ab1296 100644 --- a/editors/openoffice-4/files/patch-CVE-2015-1774 +++ b/editors/openoffice-4/files/patch-CVE-2015-1774 @@ -1,19 +1,5 @@ -Index: scp2/source/writer/module_writer.scp -=================================================================== ---- scp2/source/writer/module_writer.scp (revision 1677189) -+++ scp2/source/writer/module_writer.scp (revision 1677190) -@@ -40,7 +40,6 @@ - Styles = (HIDDEN_ROOT); - Files = (gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel, - gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard, -- gid_File_Lib_Hwpreader, - gid_File_Lib_Swd, - gid_File_Lib_Swui, - gid_File_Lib_Msword, -Index: scp2/source/writer/file_writer.scp -=================================================================== ---- scp2/source/writer/file_writer.scp (revision 1677189) -+++ scp2/source/writer/file_writer.scp (revision 1677190) +--- scp2/source/writer/file_writer.scp.orig 2014-02-25 08:22:30 UTC ++++ scp2/source/writer/file_writer.scp @@ -25,8 +25,6 @@ STD_LIB_FILE( gid_File_Lib_Swd , swd) @@ -23,11 +9,19 @@ Index: scp2/source/writer/file_writer.scp File gid_File_Exe_Swriter BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; -Index: postprocess/packcomponents/makefile.mk -=================================================================== ---- postprocess/packcomponents/makefile.mk (revision 1677189) -+++ postprocess/packcomponents/makefile.mk (revision 1677190) -@@ -121,7 +121,6 @@ +--- scp2/source/writer/module_writer.scp.orig 2014-02-25 08:22:30 UTC ++++ scp2/source/writer/module_writer.scp +@@ -40,7 +40,6 @@ Module gid_Module_Prg_Wrt_Bin + Styles = (HIDDEN_ROOT); + Files = (gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel, + gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard, +- gid_File_Lib_Hwpreader, + gid_File_Lib_Swd, + gid_File_Lib_Swui, + gid_File_Lib_Msword, +--- postprocess/packcomponents/makefile.mk.orig 2014-06-18 11:45:22 UTC ++++ postprocess/packcomponents/makefile.mk +@@ -121,7 +121,6 @@ my_components = \ fps_office \ frm \ guesslang \ @@ -35,10 +29,8 @@ Index: postprocess/packcomponents/makefile.mk i18npool \ i18nsearch \ lng \ -Index: postprocess/prj/build.lst -=================================================================== ---- postprocess/prj/build.lst (revision 1677189) -+++ postprocess/prj/build.lst (revision 1677190) +--- postprocess/prj/build.lst.orig 2014-02-25 08:23:13 UTC ++++ postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: svgio accessibility automation basctl bean chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign sdext SWEXT:swext smoketestdoc uui writerfilter winaccessibility oox MYSQLC:mysqlc LIBXSLT:libxslt NULL +po postprocess :: svgio accessibility automation basctl bean chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign sdext SWEXT:swext smoketestdoc uui writerfilter winaccessibility oox MYSQLC:mysqlc LIBXSLT:libxslt NULL diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_cpp2uno.cxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_cpp2uno.cxx new file mode 100644 index 000000000000..4ab279e9be84 --- /dev/null +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_cpp2uno.cxx @@ -0,0 +1,32 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx.orig 2014-02-25 08:29:00 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx +@@ -24,6 +24,11 @@ + // MARKER(update_precomp.py): autogen include statement, do not remove + #include "precompiled_bridges.hxx" + ++#include <typeinfo> ++#include <exception> ++#include <cstddef> ++#include <cxxabi.h> ++ + #include <com/sun/star/uno/genfunc.hxx> + #include "com/sun/star/uno/RuntimeException.hpp" + #include <uno/data.h> +@@ -159,7 +164,7 @@ void cpp2uno_call( + (*pThis->getUnoI()->pDispatcher)( + pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); + +- // in case an exception occured... ++ // in case an exception occurred... + if (pUnoExc) + { + // destruct temporary in/inout params +@@ -178,7 +183,7 @@ void cpp2uno_call( + &aUnoExc, pThis->getBridge()->getUno2Cpp() ); + // has to destruct the any + } +- else // else no exception occured... ++ else // else no exception occurred... + { + // temporary params + for ( ; nTempIndizes--; ) diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_except.cxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_except.cxx index 5a0f45064935..c0d5639e0d1c 100644 --- a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_except.cxx +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_except.cxx @@ -4,16 +4,39 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_bridges.hxx" -+#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) || defined(__clang__) ++#include <cstddef> +#include <exception> -+#endif ++#include <typeinfo> + #include <stdio.h> +#include <string.h> #include <dlfcn.h> #include <cxxabi.h> #include <hash_map> -@@ -233,7 +238,7 @@ void raiseException( uno_Any * pUnoExc, +@@ -177,7 +182,12 @@ type_info * RTTI::getRTTI( typelib_Compo + char const * rttiName = symName.getStr() +4; + #if OSL_DEBUG_LEVEL > 1 + fprintf( stderr,"generated rtti for %s\n", rttiName ); ++#ifndef __GLIBCXX__ /* #i124421# */ ++ const OString aCUnoName = OUStringToOString( unoName, RTL_TEXTENCODING_UTF8); ++ OSL_TRACE( "TypeInfo for \"%s\" not found and cannot be generated.\n", aCUnoName.getStr()); ++#endif /* __GLIBCXX__ */ + #endif ++#ifdef __GLIBCXX__ /* #i124421# */ + if (pTypeDescr->pBaseTypeDescription) + { + // ensure availability of base +@@ -191,6 +201,9 @@ type_info * RTTI::getRTTI( typelib_Compo + // this class has no base class + rtti = new __class_type_info( strdup( rttiName ) ); + } ++#else /* __GLIBCXX__ */ ++ rtti = NULL; ++#endif /* __GLIBCXX__ */ + + pair< t_rtti_map::iterator, bool > insertion( + m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) ); +@@ -233,7 +246,7 @@ void raiseException( uno_Any * pUnoExc, OUStringToOString( *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); @@ -22,7 +45,7 @@ #endif void * pCppExc; type_info * rtti; -@@ -307,7 +312,7 @@ void fillUnoException( __cxa_exception * +@@ -307,7 +320,7 @@ void fillUnoException( __cxa_exception * OUString unoName( toUNOname( header->exceptionType->name() ) ); #if OSL_DEBUG_LEVEL > 1 OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx index 534898c4061d..0da4ff6f259f 100644 --- a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx @@ -1,18 +1,17 @@ ---- bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx.orig 2014-09-19 17:51:12 UTC +--- bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx.orig 2014-02-25 08:28:59 UTC +++ bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx -@@ -26,6 +26,11 @@ - #include <typeinfo> - #include <exception> - #include <cstddef> -+#ifndef __GLIBCXX__ -+#include <cxxabi.h> -+ -+using namespace ::__cxxabiv1; -+#endif /* ! __GLIBCXX__ */ +@@ -23,10 +23,6 @@ + #include "uno/mapping.h" + +-#include <typeinfo> +-#include <exception> +-#include <cstddef> +- namespace CPPU_CURRENT_NAMESPACE { -@@ -34,6 +39,7 @@ void dummy_can_throw_anything( char cons + +@@ -34,6 +30,7 @@ void dummy_can_throw_anything( char cons // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h @@ -20,11 +19,12 @@ struct _Unwind_Exception { unsigned exception_class __attribute__((__mode__(__DI__))); -@@ -63,11 +69,13 @@ struct __cxa_exception +@@ -62,18 +59,21 @@ struct __cxa_exception + _Unwind_Exception unwindHeader; }; - +#endif /* __GLIBCXX__ */ + extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) throw(); extern "C" void __cxa_throw ( @@ -34,34 +34,21 @@ struct __cxa_eh_globals { __cxa_exception *caughtExceptions; -@@ -75,6 +83,7 @@ struct __cxa_eh_globals + unsigned int uncaughtExceptions; }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); - +#endif /* __GLIBCXX__ */ + // ----- +@@ -81,6 +81,10 @@ extern "C" __cxa_eh_globals *__cxa_get_g + void raiseException( + uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); //================================================================================================== -@@ -84,3 +93,22 @@ void raiseException( ++#ifndef __GLIBCXX__ ++using __cxxabiv1:: __cxa_exception; ++#endif /* __GLIBCXX__ */ ++ void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } -+#ifndef __GLIBCXX__ -+ -+class __class_type_info : public std::type_info -+{ -+public: -+ explicit __class_type_info( const char* pRttiName) -+ : std::type_info( pRttiName) -+ {} -+}; -+ -+class __si_class_type_info : public __class_type_info -+{ -+ const __class_type_info* mpBaseType; -+public: -+ explicit __si_class_type_info( const char* pRttiName, __class_type_info* pBaseType) -+ : __class_type_info( pRttiName), mpBaseType( pBaseType) -+ {} -+}; -+#endif /* ! __GLIBCXX__ */ diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_uno2cpp.cxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_uno2cpp.cxx index 289424d7bbcc..2f3bfb3fab79 100644 --- a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_uno2cpp.cxx +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_uno2cpp.cxx @@ -1,14 +1,43 @@ ---- bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig 2014-09-19 17:51:13 UTC +--- bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig 2014-02-25 08:29:00 UTC +++ bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx -@@ -305,7 +305,11 @@ static void cpp_call( +@@ -24,6 +24,10 @@ + // MARKER(update_precomp.py): autogen include statement, do not remove + #include "precompiled_bridges.hxx" + ++#include <typeinfo> ++#include <exception> ++#include <cstddef> ++#include <cxxabi.h> + #include <stdlib.h> + + #include <com/sun/star/uno/genfunc.hxx> +@@ -39,6 +43,11 @@ + + using namespace ::rtl; + using namespace ::com::sun::star::uno; ++#ifdef __GLIBCXX__ ++using CPPU_CURRENT_NAMESPACE::__cxa_get_globals; ++#else ++using __cxxabiv1::__cxa_get_globals; ++#endif + + namespace + { +@@ -266,7 +275,7 @@ static void cpp_call( + pAdjustedThisPtr, aVtableSlot.index, + pCppReturn, pReturnTypeDescr->eTypeClass, + (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); +- // NO exception occured... ++ // NO exception occurred... + *ppUnoExc = 0; + + // reconvert temporary params +@@ -305,7 +314,7 @@ static void cpp_call( catch (...) { // fill uno exception -+#ifndef __GLIBCXX__ +- fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); + CPPU_CURRENT_NAMESPACE::fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); -+#else /* __GLIBCXX__ */ - fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); -+#endif /* __GLIBCXX__ */ // temporary params for ( ; nTempIndizes--; ) diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_cpp2uno.cxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_cpp2uno.cxx new file mode 100644 index 000000000000..a7e279417c6a --- /dev/null +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_cpp2uno.cxx @@ -0,0 +1,34 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx.orig 2014-02-25 08:28:59 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx +@@ -24,9 +24,10 @@ + // MARKER(update_precomp.py): autogen include statement, do not remove + #include "precompiled_bridges.hxx" + +-#include <stdio.h> +-#include <stdlib.h> +-#include <hash_map> ++#include <typeinfo> ++#include <exception> ++#include <cstddef> ++#include <cxxabi.h> + + #include <rtl/alloc.h> + #include <osl/mutex.hxx> +@@ -194,7 +195,7 @@ static typelib_TypeClass cpp2uno_call( + // invoke uno dispatch call + (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); + +- // in case an exception occured... ++ // in case an exception occurred... + if ( pUnoExc ) + { + // destruct temporary in/inout params +@@ -213,7 +214,7 @@ static typelib_TypeClass cpp2uno_call( + // is here for dummy + return typelib_TypeClass_VOID; + } +- else // else no exception occured... ++ else // else no exception occurred... + { + // temporary params + for ( ; nTempIndizes--; ) diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx index b463e756b8a0..d7bc3424f438 100644 --- a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx @@ -1,11 +1,57 @@ ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx.orig 2014-09-19 17:51:13 UTC +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx.orig 2014-02-25 08:29:00 UTC +++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx -@@ -24,7 +24,7 @@ +@@ -24,9 +24,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_bridges.hxx" -#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) -+#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) || defined(__clang__) ++#include <cstddef> #include <exception> - #endif +-#endif ++#include <typeinfo> + #include <stdio.h> + #include <string.h> +@@ -182,7 +182,12 @@ type_info * RTTI::getRTTI( typelib_Compo + char const * rttiName = symName.getStr() +4; + #if OSL_DEBUG_LEVEL > 1 + fprintf( stderr,"generated rtti for %s\n", rttiName ); ++#ifndef __GLIBCXX__ /* #i124421# */ ++ const OString aCUnoName = OUStringToOString( unoName, RTL_TEXTENCODING_UTF8); ++ OSL_TRACE( "TypeInfo for \"%s\" not found and cannot be generated.\n", aCUnoName.getStr()); ++#endif /* __GLIBCXX__ */ + #endif ++#ifdef __GLIBCXX__ /* #i124421# */ + if (pTypeDescr->pBaseTypeDescription) + { + // ensure availability of base +@@ -196,7 +201,10 @@ type_info * RTTI::getRTTI( typelib_Compo + // this class has no base class + rtti = new __class_type_info( strdup( rttiName ) ); + } +- ++#else /* __GLIBCXX__ */ ++ rtti = NULL; ++#endif /* __GLIBCXX__ */ ++ + pair< t_rtti_map::iterator, bool > insertion( + m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) ); + OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" ); +@@ -238,7 +246,7 @@ void raiseException( uno_Any * pUnoExc, + OUStringToOString( + *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), + RTL_TEXTENCODING_ASCII_US ) ); +- fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); ++ fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); + #endif + void * pCppExc; + type_info * rtti; +@@ -312,7 +320,7 @@ void fillUnoException( __cxa_exception * + OUString unoName( toUNOname( header->exceptionType->name() ) ); + #if OSL_DEBUG_LEVEL > 1 + OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); +- fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() ); ++ fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() ); + #endif + typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); + if (0 == pExcTypeDescr) diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx index a1e9fa3855fb..e3fe870e1f19 100644 --- a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx @@ -1,18 +1,17 @@ ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx.orig 2014-09-19 10:51:12.000000000 -0700 -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx 2015-03-13 09:58:02.000000000 -0700 -@@ -26,6 +26,11 @@ - #include <typeinfo> - #include <exception> - #include <cstddef> -+#ifndef __GLIBCXX__ -+#include <cxxabi.h> -+ -+using namespace ::__cxxabiv1; -+#endif /* ! __GLIBCXX__ */ +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx.orig 2014-02-25 08:28:59 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx +@@ -23,10 +23,6 @@ + #include "uno/mapping.h" + +-#include <typeinfo> +-#include <exception> +-#include <cstddef> +- namespace CPPU_CURRENT_NAMESPACE { -@@ -34,6 +39,7 @@ + +@@ -34,6 +30,7 @@ void dummy_can_throw_anything( char cons // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h @@ -20,11 +19,12 @@ struct _Unwind_Exception { unsigned exception_class __attribute__((__mode__(__DI__))); -@@ -63,11 +69,13 @@ +@@ -62,18 +59,21 @@ struct __cxa_exception + _Unwind_Exception unwindHeader; }; - +#endif /* __GLIBCXX__ */ + extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) throw(); extern "C" void __cxa_throw ( @@ -34,34 +34,21 @@ struct __cxa_eh_globals { __cxa_exception *caughtExceptions; -@@ -75,6 +83,7 @@ + unsigned int uncaughtExceptions; }; extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); - +#endif /* __GLIBCXX__ */ + // ----- +@@ -81,6 +81,10 @@ extern "C" __cxa_eh_globals *__cxa_get_g + void raiseException( + uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); //================================================================================================== -@@ -84,3 +93,22 @@ ++#ifndef __GLIBCXX__ ++using __cxxabiv1:: __cxa_exception; ++#endif /* __GLIBCXX__ */ ++ void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } -+#ifndef __GLIBCXX__ -+ -+class __class_type_info : public std::type_info -+{ -+public: -+ explicit __class_type_info( const char* pRttiName) -+ : std::type_info( pRttiName) -+ {} -+}; -+ -+class __si_class_type_info : public __class_type_info -+{ -+ const __class_type_info* mpBaseType; -+public: -+ explicit __si_class_type_info( const char* pRttiName, __class_type_info* pBaseType) -+ : __class_type_info( pRttiName), mpBaseType( pBaseType) -+ {} -+}; -+#endif /* ! __GLIBCXX__ */ diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx index 736f9dc61f76..bb283ebe28d8 100644 --- a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx @@ -1,14 +1,45 @@ ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx.orig 2014-09-19 10:51:13.000000000 -0700 -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx 2015-03-13 09:48:24.000000000 -0700 -@@ -446,7 +446,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx.orig 2014-02-25 08:29:00 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx +@@ -24,9 +24,10 @@ + // MARKER(update_precomp.py): autogen include statement, do not remove + #include "precompiled_bridges.hxx" + +-#include <exception> + #include <typeinfo> +-#include <stdio.h> ++#include <exception> ++#include <cstddef> ++#include <cxxabi.h> + #include <stdlib.h> + #include <string.h> + +@@ -47,6 +48,11 @@ + + using namespace ::rtl; + using namespace ::com::sun::star::uno; ++#ifdef __GLIBCXX__ ++using CPPU_CURRENT_NAMESPACE::__cxa_get_globals; ++#else ++using __cxxabiv1::__cxa_get_globals; ++#endif + + //================================================================================================== + static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, +@@ -407,7 +413,7 @@ static void cpp_call( + Reference< XInterface >()); + } + +- // NO exception occured... ++ // NO exception occurred... + *ppUnoExc = 0; + + // reconvert temporary params +@@ -446,7 +452,7 @@ static void cpp_call( catch (...) { // fill uno exception -+#ifndef __GLIBCXX__ +- fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); + CPPU_CURRENT_NAMESPACE::fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); -+#else /* __GLIBCXX__ */ - fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); -+#endif /* __GLIBCXX__ */ // temporary params for ( ; nTempIndizes--; ) diff --git a/editors/openoffice-4/files/patch-freebsd.mk b/editors/openoffice-4/files/patch-freebsd.mk index c8edec5029cf..0a95e1f893f2 100644 --- a/editors/openoffice-4/files/patch-freebsd.mk +++ b/editors/openoffice-4/files/patch-freebsd.mk @@ -1,4 +1,4 @@ ---- solenv/gbuild/platform/freebsd.mk.orig 2014-09-19 18:16:41 UTC +--- solenv/gbuild/platform/freebsd.mk.orig 2014-02-25 08:33:29 UTC +++ solenv/gbuild/platform/freebsd.mk @@ -96,6 +96,7 @@ gb_CXXFLAGS := \ -fvisibility-inlines-hidden \ diff --git a/editors/openoffice-4/files/patch-i114430 b/editors/openoffice-4/files/patch-i114430 index b5c73f6c17ce..aa99950f6b73 100644 --- a/editors/openoffice-4/files/patch-i114430 +++ b/editors/openoffice-4/files/patch-i114430 @@ -1,8 +1,6 @@ -Index: sal/inc/rtl/math.h -=================================================================== ---- sal/inc/rtl/math.h (revision 1447988) -+++ sal/inc/rtl/math.h (working copy) -@@ -396,6 +396,21 @@ +--- sal/inc/rtl/math.h.orig 2014-02-25 08:31:58 UTC ++++ sal/inc/rtl/math.h +@@ -396,6 +396,21 @@ double SAL_CALL rtl_math_round(double fV */ double SAL_CALL rtl_math_pow10Exp(double fValue, int nExp) SAL_THROW_EXTERN_C(); @@ -24,11 +22,9 @@ Index: sal/inc/rtl/math.h /** Rounds value to 15 significant decimal digits. @param fValue -Index: sal/inc/rtl/math.hxx -=================================================================== ---- sal/inc/rtl/math.hxx (revision 1447988) -+++ sal/inc/rtl/math.hxx (working copy) -@@ -186,6 +186,13 @@ +--- sal/inc/rtl/math.hxx.orig 2014-02-25 08:31:58 UTC ++++ sal/inc/rtl/math.hxx +@@ -186,6 +186,13 @@ inline double pow10Exp(double fValue, in return rtl_math_pow10Exp(fValue, nExp); } @@ -42,11 +38,9 @@ Index: sal/inc/rtl/math.hxx /** A wrapper around rtl_math_approxValue. */ inline double approxValue(double fValue) -Index: sal/rtl/source/math.cxx -=================================================================== ---- sal/rtl/source/math.cxx (revision 1447988) -+++ sal/rtl/source/math.cxx (working copy) -@@ -1113,7 +1113,20 @@ +--- sal/rtl/source/math.cxx.orig 2014-02-25 08:31:57 UTC ++++ sal/rtl/source/math.cxx +@@ -1113,6 +1113,19 @@ double SAL_CALL rtl_math_expm1( double f return (fe-1.0) * fValue / log(fe); } @@ -62,16 +56,13 @@ Index: sal/rtl/source/math.cxx + } + return pow(fValue, fExp); +} - + + double SAL_CALL rtl_math_log1p( double fValue ) SAL_THROW_EXTERN_C() { - // Use volatile because a compiler may be too smart "optimizing" the -Index: sal/util/sal.map -=================================================================== ---- sal/util/sal.map (revision 1447988) -+++ sal/util/sal.map (working copy) -@@ -629,6 +629,8 @@ +--- sal/util/sal.map.orig 2014-02-25 08:31:48 UTC ++++ sal/util/sal.map +@@ -629,6 +629,8 @@ UDK_3.12 { # AOO 3.5 global: osl_loadAsciiModule; osl_loadAsciiModuleRelative; @@ -80,11 +71,9 @@ Index: sal/util/sal.map } UDK_3.11; PRIVATE_1.0 { -Index: sc/source/core/tool/interpr5.cxx -=================================================================== ---- sc/source/core/tool/interpr5.cxx (revision 1447988) -+++ sc/source/core/tool/interpr5.cxx (working copy) -@@ -1611,14 +1611,14 @@ +--- sc/source/core/tool/interpr5.cxx.orig 2014-02-25 08:27:49 UTC ++++ sc/source/core/tool/interpr5.cxx +@@ -1611,14 +1611,14 @@ void ScInterpreter::ScPow() if (bFlag) { for ( SCSIZE i = 0; i < nCount; i++ ) if (pMat->IsValue(i)) @@ -101,7 +90,7 @@ Index: sc/source/core/tool/interpr5.cxx else pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i); } -@@ -1628,7 +1628,7 @@ +@@ -1628,7 +1628,7 @@ void ScInterpreter::ScPow() PushIllegalArgument(); } else diff --git a/editors/openoffice-4/files/patch-i118574 b/editors/openoffice-4/files/patch-i118574 deleted file mode 100644 index 4f3c6467c22d..000000000000 --- a/editors/openoffice-4/files/patch-i118574 +++ /dev/null @@ -1,323 +0,0 @@ ---- unoxml/source/dom/attr.hxx.orig 2011-11-03 21:05:47.000000000 -0500 -+++ unoxml/source/dom/attr.hxx 2011-11-03 21:06:26.000000000 -0500 -@@ -30,6 +30,7 @@ - - #include <memory> - -+#include <cwchar> // for std::mbstate_t - #include <libxml/tree.h> - - #include <cppuhelper/implbase1.hxx> ---- unoxml/source/dom/characterdata.hxx.orig 2011-11-03 21:12:41.000000000 -0500 -+++ unoxml/source/dom/characterdata.hxx 2011-11-03 21:13:08.000000000 -0500 -@@ -28,6 +28,7 @@ - #ifndef DOM_CHARACTERDATA_HXX - #define DOM_CHARACTERDATA_HXX - -+#include <cwchar> // for std::mbstate_t - #include <libxml/tree.h> - - #include <sal/types.h> ---- unoxml/source/dom/childlist.cxx.orig 2011-11-03 21:36:22.000000000 -0500 -+++ unoxml/source/dom/childlist.cxx 2011-11-03 21:37:22.000000000 -0500 -@@ -27,6 +27,7 @@ - - #include <childlist.hxx> - -+#include <cwchar> // for std::mbstate_t - #include <libxml/tree.h> - - #include <node.hxx> ---- unoxml/source/dom/document.hxx.orig 2011-11-03 20:59:53.000000000 -0500 -+++ unoxml/source/dom/document.hxx 2011-11-03 21:00:40.000000000 -0500 -@@ -31,6 +31,7 @@ - #include <set> - #include <memory> - -+#include <cwchar> // for std::mbstate_t - #include <libxml/tree.h> - - #include <sal/types.h> ---- unoxml/source/dom/documentbuilder.cxx.orig 2011-11-03 21:15:44.000000000 -0500 -+++ unoxml/source/dom/documentbuilder.cxx 2011-11-03 21:16:26.000000000 -0500 -@@ -31,6 +31,7 @@ - #include <stdio.h> - #include <stdarg.h> - -+#include <cwchar> // for std::mbstate_t - #include <libxml/xmlerror.h> - #include <libxml/tree.h> - ---- unoxml/source/dom/documenttype.hxx.orig 2011-11-03 21:19:12.000000000 -0500 -+++ unoxml/source/dom/documenttype.hxx 2011-11-03 21:19:39.000000000 -0500 -@@ -28,6 +28,7 @@ - #ifndef DOM_DOCUMENTTYPE_HXX - #define DOM_DOCUMENTTYPE_HXX - -+#include <cwchar> // for std::mbstate_t - #include <libxml/tree.h> - - #include <sal/types.h> ---- unoxml/source/dom/element.hxx.orig 2011-11-03 21:02:39.000000000 -0500 -+++ unoxml/source/dom/element.hxx 2011-11-03 21:03:48.000000000 -0500 -@@ -28,6 +28,7 @@ - #ifndef DOM_ELEMENT_HXX - #define DOM_ELEMENT_HXX - -+#include <cwchar> // for std::mbstate_t - #include <libxml/tree.h> - - #include <com/sun/star/uno/Reference.h> ---- unoxml/source/dom/elementlist.hxx.orig 2011-11-03 21:33:35.000000000 -0500 -+++ unoxml/source/dom/elementlist.hxx 2011-11-03 21:34:07.000000000 -0500 -@@ -32,6 +32,7 @@ - - #include <boost/scoped_array.hpp> - -+#include <cwchar> // for std::mbstate_t - #include <libxml/tree.h> - - #include <sal/types.h> ---- unoxml/source/dom/entity.hxx.orig 2011-11-03 21:21:42.000000000 -0500 -+++ unoxml/source/dom/entity.hxx 2011-11-03 21:22:28.000000000 -0500 -@@ -28,6 +28,7 @@ - #ifndef DOM_ENTITY_HXX - #define DOM_ENTITY_HXX - -+#include <cwchar> // for std::mbstate_t - #include <libxml/tree.h> - #include <libxml/entities.h> - ---- unoxml/source/dom/entityreference.hxx.orig 2011-11-03 21:24:36.000000000 -0500 -+++ unoxml/source/dom/entityreference.hxx 2011-11-03 21:25:13.000000000 -0500 -@@ -28,6 +28,7 @@ - #ifndef DOM_ENTITYREFERENCE_HXX - #define DOM_ENTITYREFERENCE_HXX - -+#include <cwchar> // for std::mbstate_t - #include <libxml/tree.h> - - #include <com/sun/star/uno/Reference.h> ---- unoxml/source/dom/node.hxx.orig 2011-11-03 20:54:49.000000000 -0500 -+++ unoxml/source/dom/node.hxx 2011-11-03 20:56:47.000000000 -0500 -@@ -30,6 +30,7 @@ - - #include <hash_map> - -+#include <cwchar> // for std::mbstate_t - #include <libxml/tree.h> - - #include <sal/types.h> ---- unoxml/source/dom/notation.hxx.orig 2011-11-03 21:27:17.000000000 -0500 -+++ unoxml/source/dom/notation.hxx 2011-11-03 21:28:12.000000000 -0500 -@@ -28,6 +28,7 @@ - #ifndef DOM_NOTATION_HXX - #define DOM_NOTATION_HXX - -+#include <cwchar> // for std::mbstate_t - #include <libxml/tree.h> - - #include <com/sun/star/uno/Reference.h> ---- unoxml/source/dom/processinginstruction.hxx.orig 2011-11-03 21:30:54.000000000 -0500 -+++ unoxml/source/dom/processinginstruction.hxx 2011-11-03 21:31:30.000000000 -0500 -@@ -28,6 +28,7 @@ - #ifndef DOM_PROCESSINGINSTRUCTION_HXX - #define DOM_PROCESSINGINSTRUCTION_HXX - -+#include <cwchar> // for std::mbstate_t - #include <libxml/tree.h> - - #include <com/sun/star/uno/Reference.h> ---- unoxml/source/dom/text.hxx.orig 2011-11-03 21:10:46.000000000 -0500 -+++ unoxml/source/dom/text.hxx 2011-11-03 21:11:14.000000000 -0500 -@@ -28,6 +28,7 @@ - #ifndef DOM_TEXT_HXX - #define DOM_TEXT_HXX - -+#include <cwchar> // for std::mbstate_t - #include <libxml/tree.h> - - #include <sal/types.h> ---- unoxml/source/events/eventdispatcher.hxx.orig 2011-11-03 21:51:05.000000000 -0500 -+++ unoxml/source/events/eventdispatcher.hxx 2011-11-03 21:55:59.000000000 -0500 -@@ -31,6 +31,7 @@ - #include <map> - #include <vector> - -+#include <cwchar> // for std::mbstate_t - #include <libxml/tree.h> - - #include <rtl/ustring.hxx> ---- jvmfwk/source/elements.hxx.orig 2011-11-03 14:14:18.000000000 -0500 -+++ jvmfwk/source/elements.hxx 2011-11-03 14:24:14.000000000 -0500 -@@ -32,6 +32,7 @@ - #include "fwkutil.hxx" - #include "rtl/ustring.hxx" - #include "rtl/byteseq.hxx" -+#include <cwchar> // for std::mbstate_t - #include "libxml/parser.h" - #include "boost/optional.hpp" - ---- jvmfwk/source/fwkbase.cxx.orig 2011-11-03 14:31:12.000000000 -0500 -+++ jvmfwk/source/fwkbase.cxx 2011-11-03 14:32:34.000000000 -0500 -@@ -32,6 +32,7 @@ - #include "rtl/uri.hxx" - #include "osl/thread.hxx" - #include "osl/process.h" -+#include <cwchar> // for std::mbstate_t - #include "libxml/xpathInternals.h" - #include "osl/file.hxx" - #include "osl/module.hxx" ---- jvmfwk/source/libxmlutil.hxx.orig 2011-11-03 14:28:02.000000000 -0500 -+++ jvmfwk/source/libxmlutil.hxx 2011-11-03 14:28:52.000000000 -0500 -@@ -27,7 +27,7 @@ - #if !defined INCLUDED_JVMFWK_LIBXMLUTIL_HXX - #define INCLUDED_JVMFWK_LIBXMLUTIL_HXX - -- -+#include <cwchar> // for std::mbstate_t - #include "libxml/parser.h" - #include "libxml/xpath.h" - //#include "libxml/xpathinternals.h" ---- xmlhelp/source/cxxhelp/provider/urlparameter.cxx.orig 2011-11-03 23:28:51.000000000 -0500 -+++ xmlhelp/source/cxxhelp/provider/urlparameter.cxx 2011-11-03 23:33:15.000000000 -0500 -@@ -46,6 +46,7 @@ - #include <comphelper/processfactory.hxx> - #include <rtl/uri.hxx> - #include <rtl/ustrbuf.hxx> -+#include <cwchar> // for std::mbstate_t - #include <libxslt/xslt.h> - #include <libxslt/transform.h> - #include <libxslt/xsltutils.h> ---- unoxml/source/xpath/nodelist.hxx.orig 2011-11-03 21:42:28.000000000 -0500 -+++ unoxml/source/xpath/nodelist.hxx 2011-11-03 21:43:53.000000000 -0500 -@@ -38,6 +38,7 @@ - #include <com/sun/star/xml/dom/XNodeList.hpp> - #include <com/sun/star/xml/xpath/XXPathObject.hpp> - -+#include <cwchar> // for std::mbstate_t - #include "libxml/tree.h" - #include "libxml/xpath.h" - ---- unoxml/source/xpath/xpathapi.cxx.orig 2011-11-03 21:46:02.000000000 -0500 -+++ unoxml/source/xpath/xpathapi.cxx 2011-11-03 21:46:34.000000000 -0500 -@@ -30,6 +30,7 @@ - #include <stdarg.h> - #include <string.h> - -+#include <cwchar> // for std::mbstate_t - #include <libxml/tree.h> - #include <libxml/xmlerror.h> - #include <libxml/xpath.h> -Index: main/forms/source/xforms/xpathlib/xpathlib.hxx -=================================================================== ---- forms/source/xforms/xpathlib/xpathlib.hxx (revision 1235458) -+++ forms/source/xforms/xpathlib/xpathlib.hxx (working copy) -@@ -20,7 +20,7 @@ - *************************************************************/ - - -- -+#include <cwchar> // for std::mbstate_t - #include <libxml/tree.h> - #include <libxml/xpath.h> - #include <libxml/xpathInternals.h> - ---- avmedia/source/gstreamer/gstplayer.hxx 2012-02-02 07:33:58.000000000 +0900 -+++ avmedia/source/gstreamer/gstplayer.hxx 2012-02-02 07:35:03.000000000 +0900 -@@ -24,6 +24,8 @@ - #ifndef _GSTPLAYER_HXX - #define _GSTPLAYER_HXX - -+#include <cwchar> // for std::mbstate_t -+ - #include "gstcommon.hxx" - #include <glib.h> - #include <glib/gatomic.h> - - ---- xmlsecurity/source/xmlsec/biginteger.cxx 2012-02-04 10:36:05.000000000 +0900 -+++ xmlsecurity/source/xmlsec/biginteger.cxx 2012-02-01 16:51:40.000000000 +0900 -@@ -19,7 +19,7 @@ - * - *************************************************************/ - -- -+#include <cwchar> // for std::mbstate_t - - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_xmlsecurity.hxx" - ---- xmlsecurity/source/xmlsec/errorcallback.cxx 2012-02-04 10:37:52.000000000 +0900 -+++ xmlsecurity/source/xmlsec/errorcallback.cxx 2012-02-01 16:51:40.000000000 +0900 -@@ -19,7 +19,7 @@ - * - *************************************************************/ - -- -+#include <cwchar> // for std::mbstate_t - - - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_xmlsecurity.hxx" - ---- xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx 2012-02-03 13:03:47.000000000 +0900 -+++ xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx 2012-02-01 16:51:40.000000000 +0900 -@@ -24,6 +24,8 @@ - #ifndef _XSECURITYENVIRONMENT_NSSIMPL_HXX_ - #define _XSECURITYENVIRONMENT_NSSIMPL_HXX_ - -+#include <cwchar> // for std::mbstate_t -+ - #include <sal/config.h> - #include <rtl/ustring.hxx> - #include <cppuhelper/factory.hxx> - - ---- xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx 2012-02-04 10:33:01.000000000 +0900 -+++ xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx 2012-02-01 16:51:40.000000000 +0900 -@@ -24,6 +24,8 @@ - #ifndef _SEINITIALIZERIMPL_HXX - #define _SEINITIALIZERIMPL_HXX - -+#include <cwchar> // for std::mbstate_t -+ - #include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp> - #include <com/sun/star/xml/crypto/XSEInitializer.hpp> - - ---- xmlsecurity/source/xmlsec/saxhelper.hxx 2012-02-04 10:34:58.000000000 +0900 -+++ xmlsecurity/source/xmlsec/saxhelper.hxx 2012-02-01 16:51:40.000000000 +0900 -@@ -24,6 +24,8 @@ - #ifndef _SAXHELPER_HXX - #define _SAXHELPER_HXX - -+#include <cwchar> // for std::mbstate_t -+ - #include "libxml/tree.h" - - #include <com/sun/star/xml/sax/SAXException.hpp> - ---- xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx 2012-02-04 10:36:45.000000000 +0900 -+++ xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx 2012-02-01 16:51:40.000000000 +0900 -@@ -20,6 +20,7 @@ - *************************************************************/ - - -+#include <cwchar> // for std::mbstate_t - - #ifndef _XMLELEMENTWRAPPER_XMLSECIMPL_HXX - #define _XMLELEMENTWRAPPER_XMLSECIMPL_HXX - ---- xmlsecurity/source/xmlsec/xmlstreamio.hxx 2012-02-04 10:37:09.000000000 +0900 -+++ xmlsecurity/source/xmlsec/xmlstreamio.hxx 2012-02-01 16:51:40.000000000 +0900 -@@ -19,7 +19,7 @@ - * - *************************************************************/ - -- -+#include <cwchar> // for std::mbstate_t - - - #ifndef _XMLSTREAMIO_XMLSECIMPL_HXX_ - #define _XMLSTREAMIO_XMLSECIMPL_HXX_ diff --git a/editors/openoffice-4/files/patch-jpeg b/editors/openoffice-4/files/patch-jpeg index 84a659c0e34c..6786cbe072cb 100644 --- a/editors/openoffice-4/files/patch-jpeg +++ b/editors/openoffice-4/files/patch-jpeg @@ -1,12 +1,15 @@ ---- svtools/Library_svt.mk.orig 2014-02-25 00:28:36.000000000 -0800 -+++ svtools/Library_svt.mk 2014-08-04 21:40:00.000000000 -0700 -@@ -76,6 +76,9 @@ +--- svtools/Library_svt.mk.orig 2014-09-19 17:47:52 UTC ++++ svtools/Library_svt.mk +@@ -76,6 +76,12 @@ $(eval $(call gb_Library_add_linked_libs $(eval $(call gb_Library_set_ldflags,svt,\ $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \ )) ++ifeq ($(OS),FREEBSD) ++# JDK jpeg library on FreeBSD lives under ${JAVA_HOME}/jre/lib/${ARCH}/ +$(eval $(call gb_Library_set_ldflags,svt,\ -+ $$(shell echo $$(LDFLAGS) | sed 's/ -L[^ ]*\/jre\/lib\/[^ ]*//g') \ ++ $$(filter-out -L$$(JAVA_HOME)/jre/lib/%,$$(LDFLAGS)) \ +)) ++endif ifeq ($(GUIBASE),os2) # YD FIXME above is not working... needs ldflags hack... $(eval $(call gb_Library_set_ldflags,svt,\ diff --git a/editors/openoffice-4/files/patch-nss b/editors/openoffice-4/files/patch-nss index a3dec2473dd1..03fdedb13ef5 100644 --- a/editors/openoffice-4/files/patch-nss +++ b/editors/openoffice-4/files/patch-nss @@ -1,6 +1,6 @@ ---- set_soenv.in~ 2014-01-22 15:21:04.000000000 +0900 -+++ set_soenv.in 2014-02-03 12:12:03.000000000 +0900 -@@ -1864,6 +1864,8 @@ +--- set_soenv.in.orig 2014-06-06 06:58:10 UTC ++++ set_soenv.in +@@ -1823,6 +1823,8 @@ ToFile( "PKGFORMAT", "@PKGFORMAT ToFile( "SYSTEM_STDLIBS", "@SYSTEM_STDLIBS@", "e" ); ToFile( "SYSTEM_ZLIB", "@SYSTEM_ZLIB@", "e" ); ToFile( "SYSTEM_NSS", "@SYSTEM_NSS@", "e" ); @@ -9,35 +9,54 @@ ToFile( "SYSTEM_OPENSSL", "@SYSTEM_OPENSSL@", "e" ); ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" ); ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" ); - ---- xmlsecurity/util/makefile.mk 2014-02-03 15:50:50.000000000 +0900 -+++ xmlsecurity/util/makefile.mk 2014-02-03 16:03:11.000000000 +0900 -@@ -98,12 +98,12 @@ +--- xmlsecurity/source/xmlsec/nss/makefile.mk.orig 2014-02-25 08:23:37 UTC ++++ xmlsecurity/source/xmlsec/nss/makefile.mk +@@ -44,12 +44,8 @@ CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) + + .IF "$(SYSTEM_NSS)" != "YES" + MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla +-NSS_INC = $(MOZ_INC)$/nss +-NSPR_INC = $(MOZ_INC)$/nspr +-.ELSE +-# TODO: better use pkgconfig to find the proper system include path +-NSS_INC = /usr/include/nss3 +-NSPR_INC = /usr/include/nspr4 ++NSS_CFLAGS = -I$(MOZ_INC)$/nss ++NSPR_CFLAGS = -I$(MOZ_INC)$/nspr + .ENDIF + + .IF "$(GUI)" == "WNT" +@@ -105,10 +101,10 @@ CDEFS += -DXMLSEC_NO_XSLT + # --- Files -------------------------------------------------------- + + SOLARINC += \ +- -I$(NSPR_INC) \ ++ $(NSPR_CFLAGS) \ + -I$(PRJ)$/source$/xmlsec + +-SOLARINC += -I$(NSS_INC) ++SOLARINC += $(NSS_CFLAGS) + + SLOFILES = \ + $(SLO)$/nssinitializer.obj \ +--- xmlsecurity/util/makefile.mk.orig 2014-02-25 08:23:37 UTC ++++ xmlsecurity/util/makefile.mk +@@ -98,13 +98,17 @@ SHL2STDLIBS += \ SHL2STDLIBS +=-ldl .ENDIF -.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"!="YES" -+.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"=="YES" ++.IF "$(ENABLE_NSS_MODULE)"=="YES" ++.IF "$(SYSTEM_NSS)"!="YES" .IF "$(NSPR_LIB)" != "" SHL2STDLIBS += $(NSPR_LIB) .ENDIF --.IF "$(NSS_LIB)" != "" --SHL2STDLIBS += $(NSS_LIB) -+.IF "$(NSS_LIBS)" != "" -+SHL2STDLIBS += $(NSS_LIBS) - .ENDIF + .IF "$(NSS_LIB)" != "" + SHL2STDLIBS += $(NSS_LIB) .ENDIF - ---- xmlsecurity/source/xmlsec/nss/makefile.mk 2014-01-22 15:07:16.000000000 +0900 -+++ xmlsecurity/source/xmlsec/nss/makefile.mk 2014-02-03 16:13:30.000000000 +0900 -@@ -48,8 +48,8 @@ - NSPR_INC = $(MOZ_INC)$/nspr - .ELSE - # TODO: better use pkgconfig to find the proper system include path --NSS_INC = /usr/include/nss3 --NSPR_INC = /usr/include/nspr4 -+NSS_INC = $(NSS_CFLAGS) -+NSPR_INC = $(NSS_CFLAGS) ++.ELSE ++SHL2STDLIBS += $(NSS_LIBS) ++.ENDIF .ENDIF - .IF "$(GUI)" == "WNT" + .IF "$(CRYPTO_ENGINE)" == "mscrypto" diff --git a/editors/openoffice-4/files/patch-sal b/editors/openoffice-4/files/patch-sal index 25577d2b2b3f..1ccee6152587 100644 --- a/editors/openoffice-4/files/patch-sal +++ b/editors/openoffice-4/files/patch-sal @@ -1,6 +1,6 @@ ---- 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 @@ +--- sal/inc/rtl/string.hxx.orig 2014-06-19 07:47:24 UTC ++++ sal/inc/rtl/string.hxx +@@ -234,8 +234,9 @@ private: @return a pointer to a (not necessarily null-terminated) byte string representing the characters of this string object. */ diff --git a/editors/openoffice-4/files/patch-set_soenv.in b/editors/openoffice-4/files/patch-set_soenv.in index e03a7829946d..afcced627321 100644 --- a/editors/openoffice-4/files/patch-set_soenv.in +++ b/editors/openoffice-4/files/patch-set_soenv.in @@ -1,6 +1,6 @@ ---- set_soenv.in.orig 2015-01-17 23:35:07.000000000 -0800 -+++ set_soenv.in 2015-02-23 16:02:44.000000000 -0800 -@@ -359,7 +359,7 @@ +--- set_soenv.in.orig 2014-06-06 06:58:10 UTC ++++ set_soenv.in +@@ -359,7 +359,7 @@ elsif ( $platform =~ m/kfreebsd/ ) elsif ( $platform =~ m/freebsd/ ) { $BIG_SVX = "TRUE"; $COM = "GCC"; @@ -9,7 +9,7 @@ $CVER = "C300"; $GUI = "UNX"; $GUIBASE = "unx"; -@@ -2617,26 +2617,37 @@ +@@ -2575,26 +2575,37 @@ sub GetCorrectPath my @originalPairs = @_; my @pairs = @originalPairs; my @Path = split /$ps/, $oldPath; @@ -51,7 +51,7 @@ $to_append = 0; last; } else { -@@ -2644,7 +2655,7 @@ +@@ -2602,7 +2613,7 @@ sub GetCorrectPath } } if ($to_append) { @@ -60,7 +60,7 @@ } } -@@ -2654,14 +2665,14 @@ +@@ -2612,14 +2623,14 @@ sub GetCorrectPath my $cmd = shift @pairs; my $realpath; diff --git a/editors/openoffice-4/files/patch-unxfbsd.mk b/editors/openoffice-4/files/patch-unxfbsd.mk index d2db5b64e151..fb1efc7d2a0a 100644 --- a/editors/openoffice-4/files/patch-unxfbsd.mk +++ b/editors/openoffice-4/files/patch-unxfbsd.mk @@ -1,4 +1,4 @@ ---- solenv/inc/unxfbsd.mk.orig 2014-09-19 18:16:56 UTC +--- solenv/inc/unxfbsd.mk.orig 2014-02-25 08:33:35 UTC +++ solenv/inc/unxfbsd.mk @@ -27,7 +27,7 @@ ASM= AFLAGS= @@ -9,7 +9,7 @@ JAVAFLAGSDEBUG=-g # Include arch specific makefile. -@@ -49,7 +49,7 @@ JAVAFLAGSDEBUG=-g +@@ -43,7 +43,7 @@ JAVAFLAGSDEBUG=-g #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl @@ -18,7 +18,7 @@ # enable visibility define in "sal/types.h" .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -@@ -88,7 +88,7 @@ CFLAGSENABLESYMBOLS=-g # was temporarily +@@ -82,7 +82,7 @@ CFLAGSENABLESYMBOLS=-g # was temporarily # flags for the C++ Compiler CFLAGSCC= -pipe $(ARCH_FLAGS) # Flags for enabling exception handling @@ -27,7 +27,7 @@ # Flags for disabling exception handling CFLAGS_NO_EXCEPTIONS=-fno-exceptions -@@ -156,7 +156,7 @@ LINKFLAGSRUNPATH_OXT= +@@ -150,7 +150,7 @@ LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' #LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' LINKFLAGSRUNPATH_NONE= @@ -36,7 +36,7 @@ # linker flags for linking applications LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \ -@@ -199,11 +199,11 @@ STDSHLCUIMT+=-ltcmalloc +@@ -193,11 +193,11 @@ STDSHLCUIMT+=-ltcmalloc .ENDIF # libraries for linking applications diff --git a/editors/openoffice-4/files/patch-webdav b/editors/openoffice-4/files/patch-webdav index aebe1baa6d2c..908f25839b9d 100644 --- a/editors/openoffice-4/files/patch-webdav +++ b/editors/openoffice-4/files/patch-webdav @@ -1,39 +1,5 @@ ---- 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_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_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.h> - - typedef serf_connection_t SerfConnection; - ---- ucb/source/ucp/webdav/SerfCallbacks.hxx.orig 2014-02-25 00:24:42.000000000 -0800 -+++ ucb/source/ucp/webdav/SerfCallbacks.hxx 2014-07-28 01:11:38.000000000 -0700 +--- ucb/source/ucp/webdav/SerfCallbacks.hxx.orig 2014-02-25 08:24:42 UTC ++++ ucb/source/ucp/webdav/SerfCallbacks.hxx @@ -23,7 +23,7 @@ #ifndef INCLUDED_CALLBACKS_HXX #define INCLUDED_CALLBACKS_HXX @@ -43,8 +9,8 @@ extern "C" apr_status_t Serf_ConnectSetup( apr_socket_t *skt, serf_bucket_t **read_bkt, ---- ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx.orig 2014-02-25 00:24:43.000000000 -0800 -+++ ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx 2014-07-28 01:11:43.000000000 -0700 +--- ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx.orig 2014-02-25 08:24:43 UTC ++++ ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx @@ -24,7 +24,7 @@ #include "SerfCopyReqProcImpl.hxx" @@ -54,8 +20,8 @@ namespace http_dav_ucp { ---- ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx.orig 2014-02-25 00:24:42.000000000 -0800 -+++ ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx 2014-07-28 01:11:47.000000000 -0700 +--- ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx.orig 2014-02-25 08:24:42 UTC ++++ ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx @@ -24,7 +24,7 @@ #include "SerfDeleteReqProcImpl.hxx" @@ -65,8 +31,8 @@ namespace http_dav_ucp { ---- ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx.orig 2014-02-25 00:24:43.000000000 -0800 -+++ ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx 2014-07-28 01:11:51.000000000 -0700 +--- ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx.orig 2014-02-25 08:24:43 UTC ++++ ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx @@ -24,7 +24,7 @@ #include "SerfMkColReqProcImpl.hxx" @@ -76,8 +42,8 @@ namespace http_dav_ucp { ---- ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx.orig 2014-02-25 00:24:43.000000000 -0800 -+++ ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx 2014-07-28 01:11:57.000000000 -0700 +--- ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx.orig 2014-02-25 08:24:43 UTC ++++ ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx @@ -24,7 +24,7 @@ #include "SerfMoveReqProcImpl.hxx" @@ -87,8 +53,8 @@ namespace http_dav_ucp { ---- ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx.orig 2014-02-25 00:24:43.000000000 -0800 -+++ ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx 2014-07-28 01:12:00.000000000 -0700 +--- ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx.orig 2014-02-25 08:24:43 UTC ++++ ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx @@ -24,7 +24,7 @@ #include "SerfPostReqProcImpl.hxx" @@ -98,8 +64,8 @@ using namespace com::sun::star; ---- ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx.orig 2014-02-25 00:24:43.000000000 -0800 -+++ ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx 2014-07-28 01:12:05.000000000 -0700 +--- ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx.orig 2014-02-25 08:24:43 UTC ++++ ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx @@ -26,7 +26,7 @@ #include "SerfPutReqProcImpl.hxx" @@ -109,8 +75,8 @@ namespace http_dav_ucp { ---- ucb/source/ucp/webdav/SerfRequestProcessor.hxx.orig 2014-02-25 00:24:43.000000000 -0800 -+++ ucb/source/ucp/webdav/SerfRequestProcessor.hxx 2014-07-28 01:12:10.000000000 -0700 +--- ucb/source/ucp/webdav/SerfRequestProcessor.hxx.orig 2014-02-25 08:24:43 UTC ++++ ucb/source/ucp/webdav/SerfRequestProcessor.hxx @@ -26,7 +26,7 @@ #include <apr_errno.h> #include <apr_pools.h> @@ -120,8 +86,8 @@ #include "DAVTypes.hxx" #include "DAVResource.hxx" ---- ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx.orig 2014-02-25 00:24:42.000000000 -0800 -+++ ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx 2014-07-28 01:12:14.000000000 -0700 +--- ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx.orig 2014-02-25 08:24:42 UTC ++++ ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx @@ -22,7 +22,7 @@ #ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX #define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX @@ -131,3 +97,36 @@ #include <sal/types.h> #include "DAVRequestEnvironment.hxx" +--- ucb/source/ucp/webdav/SerfSession.cxx.orig 2014-02-25 08:24:43 UTC ++++ ucb/source/ucp/webdav/SerfSession.cxx +@@ -30,7 +30,7 @@ + #include "ucbhelper/simplecertificatevalidationrequest.hxx" + + #include "AprEnv.hxx" +-#include <apr/apr_strings.h> ++#include <apr_strings.h> + + #include "DAVAuthListener.hxx" + #include "SerfTypes.hxx" +--- ucb/source/ucp/webdav/SerfTypes.hxx.orig 2014-02-25 08:24:43 UTC ++++ ucb/source/ucp/webdav/SerfTypes.hxx +@@ -24,7 +24,7 @@ + #ifndef INCLUDED_SERFTYPES_HXX + #define INCLUDED_SERFTYPES_HXX + +-#include <serf/serf.h> ++#include <serf.h> + + typedef serf_connection_t SerfConnection; + +--- ucb/source/ucp/webdav/SerfUri.hxx.orig 2014-02-25 08:24:43 UTC ++++ ucb/source/ucp/webdav/SerfUri.hxx +@@ -23,7 +23,7 @@ + #ifndef INCLUDED_SERFURI_HXX + #define INCLUDED_SERFURI_HXX + +-#include <apr-util/apr_uri.h> ++#include <apr_uri.h> + #include <rtl/ustring.hxx> + #include "DAVException.hxx" + diff --git a/editors/openoffice-4/files/pkg-message.in b/editors/openoffice-4/files/pkg-message.in index 4a3474bc2b1b..e551c076647b 100644 --- a/editors/openoffice-4/files/pkg-message.in +++ b/editors/openoffice-4/files/pkg-message.in @@ -6,20 +6,20 @@ Written by: Martin Blapp <mbr@freebsd.org> Apache OpenOffice %%AOOTAG%% will soon be installed in %%PREFIX%%/%%EXECBASE%% -1. User installation +1. Scanner interface -------------------- +To enable the scanner interface, install the sane-backends package. -Just type "%%EXECBASE%%" after you have successfully -installed the package. If there is no installed -.openoffice.org directory in your home directory, the -setup installs the "%%AOOUDIR%%" folder. +2. User installation +-------------------- +Just type "%%EXECBASE%%" after you have successfully installed +the package. If there is no installed .openoffice.org directory in your +home directory, the setup installs the "%%AOOUDIR%%" folder. -2. Starting Apache OpenOffice +3. Starting Apache OpenOffice ----------------------------- - -There are some wrappers installed for faster startup. -Add "%%PREFIX%%/bin/" to your PATH and you will be able -to use them. +There are some wrappers installed for faster startup. Add "%%PREFIX%%/bin/" +to your PATH and you will be able to use them. %%PREFIX%%/bin/%%EXECBASE%% %%PREFIX%%/bin/%%EXECBASE%%-sbase @@ -31,11 +31,10 @@ to use them. %%PREFIX%%/bin/%%EXECBASE%%-spadmin %%PREFIX%%/bin/%%EXECBASE%%-swriter -OO.org does need $LANG to be set to a suitable value. +OpenOffice does need $LANG to be set to a suitable value. -3. If you run into problems +4. If you run into problems -------------------------------------------------- -If you somehow run into problems, please remove the already -installed "%%AOOUDIR%%" directory in your home directory, -then redo the user installation and the problems should go -away. +If you somehow run into problems, please remove the already installed +"%%AOOUDIR%%" directory in your home directory, then redo the +user installation and the problems should go away. |