diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2020-10-08 22:56:45 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2020-10-08 22:56:45 +0000 |
| commit | ac0af7737843d3ce6b59f8f4619363d88ae14290 (patch) | |
| tree | 289b9b98cf378eaee7d27924db082f1c353dc3be /editors/openoffice-devel/files | |
| parent | lang/php74: Add missing dependency from php74-xmlreader to php74-dom (diff) | |
Upgrade editors/openoffice-devel to a newer snapshot.
patch-gmake43 has been upstreamed.
Fix LICENSE_MPL11 generation.
Notes
Notes:
svn path=/head/; revision=551736
Diffstat (limited to 'editors/openoffice-devel/files')
| -rw-r--r-- | editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y | 3 | ||||
| -rw-r--r-- | editors/openoffice-devel/files/patch-gmake43 | 11 |
2 files changed, 2 insertions, 12 deletions
diff --git a/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y b/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y index fdad691cd9d9..5d6a8cf71cf0 100644 --- a/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y +++ b/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y @@ -5,11 +5,12 @@ %{ /************************************************************** * -@@ -123,8 +124,6 @@ static connectivity::OSQLInternalNode* newNode(const : +@@ -123,9 +124,6 @@ static connectivity::OSQLInternalNode* newNode(const : connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER; - +-#define YYDEBUG 1 -#define YYERROR_VERBOSE #define SQLyyerror(s) \ diff --git a/editors/openoffice-devel/files/patch-gmake43 b/editors/openoffice-devel/files/patch-gmake43 deleted file mode 100644 index a32207fa2277..000000000000 --- a/editors/openoffice-devel/files/patch-gmake43 +++ /dev/null @@ -1,11 +0,0 @@ ---- solenv/gbuild/Tempfile.mk.orig 2019-09-17 22:55:21 UTC -+++ solenv/gbuild/Tempfile.mk -@@ -27,7 +27,7 @@ $(strip $(1) - $(eval gb_var2file_helpervar := $$(shell printf "%s" "" > $(1) ))\ - $(foreach item,$(3),$(eval gb_var2file_curblock += $(item) - ifeq ($$(words $$(gb_var2file_curblock)),$(2)) -- gb_var2file_helpervar := $$(shell printf "%s" "$$(gb_var2file_curblock)" >> $(1) ) -+ gb_var2file_helpervar := $$(shell printf " %s" "$$(gb_var2file_curblock)" >> $(1) ) - gb_var2file_curblock := - endif - ))\ |