diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2015-07-13 21:03:26 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2015-07-13 21:03:26 +0000 |
| commit | 8f77e148d93f16a9b17ba4f2ab231ff109edc2ad (patch) | |
| tree | ab54843278a6708ba07a9226e91f6a65c6359548 /editors/openoffice-devel/files/patch-i114430 | |
| parent | Document php spl use-after-free vulnerability (diff) | |
Upgrade to upstream SVN revision 1689959.
patch-jpeg and patch-nss have been upstreamed and are no longer needed.
patch-i118574 no longer seems necessary for a clean build.
Regnerate patch-i114430 with make makepatch.
Always build using boost from ports instead of the bundled boost, updating
the BUILD_DEPENDS with the header that configure looks for.
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.
Reviewed by: pfg
Approved by: mat (mentor)
Differential Revision: https://reviews.freebsd.org/D3064
Notes
Notes:
svn path=/head/; revision=391960
Diffstat (limited to 'editors/openoffice-devel/files/patch-i114430')
| -rw-r--r-- | editors/openoffice-devel/files/patch-i114430 | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/editors/openoffice-devel/files/patch-i114430 b/editors/openoffice-devel/files/patch-i114430 index 01d8a2734019..1d6a270c3c8b 100644 --- a/editors/openoffice-devel/files/patch-i114430 +++ b/editors/openoffice-devel/files/patch-i114430 @@ -1,8 +1,6 @@ -Index: sc/source/core/tool/interpr5.cxx -=================================================================== ---- sc/source/core/tool/interpr5.cxx (revision 1678278) -+++ sc/source/core/tool/interpr5.cxx (working copy) -@@ -1611,7 +1611,7 @@ +--- sc/source/core/tool/interpr5.cxx.orig 2014-09-19 18:03:51 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)) @@ -11,7 +9,6 @@ Index: sc/source/core/tool/interpr5.cxx else pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i); } -@@ -1618,7 +1618,7 @@ else { for ( SCSIZE i = 0; i < nCount; i++ ) if (pMat->IsValue(i)) @@ -20,7 +17,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 |