diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2017-09-30 18:23:26 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2017-09-30 18:23:26 +0000 |
| commit | 27b9fe784cfb8eabc1d6691c16a66356b9fec8c1 (patch) | |
| tree | 183e0625962846449662a818848682c3a1103ff5 /editors/openoffice-devel/files | |
| parent | Un-break build on slave port avidemux-qt4 (diff) | |
Upgrade openoffice-devel to upstream svn revision r1810071.
Make LICENSE more specific by changing MPL to MPL11.
Add the REPORT_BUILDER option to enable building that extension, but
leave it off and mark it broken until we have a way to install the
necessary .jar files.
The new PostgreSQL database connector requires jakarta-commons-lang3.
Make jakarta-commons-codec, jakarta-commons-httpclient, and
jakarta-commons-logging-jar dependencies optional based on the selected
port options.
patch-sal_qa_osl_mutex_osl__Mutex.cxx and
patch-scaddins_source_analysis_analysishelper.hxx have been upstreamed.
Pacify portlint by sorting sections.
Notes
Notes:
svn path=/head/; revision=451002
Diffstat (limited to 'editors/openoffice-devel/files')
3 files changed, 5 insertions, 23 deletions
diff --git a/editors/openoffice-devel/files/patch-extensions.lst b/editors/openoffice-devel/files/patch-extensions.lst index dcbafcdcc378..66222d8fdf3f 100644 --- a/editors/openoffice-devel/files/patch-extensions.lst +++ b/editors/openoffice-devel/files/patch-extensions.lst @@ -1,6 +1,6 @@ --- extensions.lst.orig 2015-10-24 06:26:40 UTC +++ extensions.lst -@@ -37,6 +37,14 @@ +@@ -37,6 +37,18 @@ # [ language=all && ENABLE_XXX ] # file://XXX.oxt @@ -8,6 +8,10 @@ +[ language=all && ENABLE_PDFIMPORT=YES ] + file://pdfimport/pdfimport.oxt + ++# Report Builder extension ++[ language=all && ENABLE_REPORTBUILDER=YES ] ++ file://reportbuilder/reportbuilder.oxt ++ +# Wiki Publisher extension +[ language=all && ENABLE_MEDIAWIKI=YES ] + file://swext/wiki-publisher.oxt diff --git a/editors/openoffice-devel/files/patch-sal_qa_osl_mutex_osl__Mutex.cxx b/editors/openoffice-devel/files/patch-sal_qa_osl_mutex_osl__Mutex.cxx deleted file mode 100644 index fe097f86a625..000000000000 --- a/editors/openoffice-devel/files/patch-sal_qa_osl_mutex_osl__Mutex.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- sal/qa/osl/mutex/osl_Mutex.cxx.orig 2016-06-21 21:57:07 UTC -+++ sal/qa/osl/mutex/osl_Mutex.cxx -@@ -729,7 +729,7 @@ namespace osl_ClearableGuard - - myThread.join(); - -- ASSERT_TRUE(nSec < 7 && nSec > 1) << "ClearableGuard method: clear"; -+ ASSERT_TRUE(nSec <= 7 && nSec > 1) << "ClearableGuard method: clear"; - } - - TEST_F(clear, clear_002 ) diff --git a/editors/openoffice-devel/files/patch-scaddins_source_analysis_analysishelper.hxx b/editors/openoffice-devel/files/patch-scaddins_source_analysis_analysishelper.hxx deleted file mode 100644 index adef7313dad3..000000000000 --- a/editors/openoffice-devel/files/patch-scaddins_source_analysis_analysishelper.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- scaddins/source/analysis/analysishelper.hxx.orig 2014-09-19 18:07:44 UTC -+++ scaddins/source/analysis/analysishelper.hxx -@@ -35,7 +35,7 @@ - - #include <math.h> - --#include <boost/tr1/complex.hpp> -+#include <complex> - #ifndef double_complex - typedef std::complex<double> double_complex; - #endif |