Upgrade openoffice-devel to upstream SVN r1829757.

The fix for compatibility with boost 1.67 has been upstreamed, so
remove BROKEN.

Upstream has switched from gstreamer 0.10 to gstreamer 1.x, so change
our dependency to match.  Don't specify an explicit LIB_DEPENDS in
addition to USE_GSTREAMER1.

Most of the patches to work around various compiler issues have been
upstreamed, so remove them here.

Modernize patch-framework_Library__fwk.mk.

3 files changed, 8 insertions, 49 deletions

diff --git a/editors/openoffice-devel/files/patch-framework_Library__fwk.mk b/editors/openoffice-devel/files/patch-framework_Library__fwk.mk
index 7750d033fd74..59851178df6a 100644
--- a/editors/openoffice-devel/files/patch-framework_Library__fwk.mk
+++ b/editors/openoffice-devel/files/patch-framework_Library__fwk.mk
@@ -1,14 +1,15 @@
---- framework/Library_fwk.mk.orig	2016-08-29 00:45:25 UTC
+--- framework/Library_fwk.mk.orig	2018-04-13 00:55:26 UTC
 +++ framework/Library_fwk.mk
-@@ -190,4 +190,11 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
- 	framework/source/xml/imagesdocumenthandler \
+@@ -196,5 +196,12 @@ $(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ 	framework/source/loadenv/loadenv, $(gb_COMPILEROPT1FLAGS) \
  ))
- 
-+# i126622 - Base 4.1.2 does not open Tables and Queries in Mac OSX
+ endif
 +# Also affects FreeBSD 10.3 with clang 3.4.1.
 +# Appears to be a clang optimization bug in versions less than 3.8.0
 +ifeq ($(COM)$(CPUNAME),CLANGX86_64)
-+$(call gb_CxxObject_get_target,framework/source/loadenv/loadenv):       T_CXXFLAGS := $(gb_LinkTarget_CXXFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILERNOOPTFLAGS)
++$(eval $(call gb_LinkTarget_set_cxx_optimization, \
++	framework/source/loadenv/loadenv, $(gb_COMPILEROPT1FLAGS) \
++))
 +endif
-+
+ 
  # vim: set noet sw=4 ts=4:
diff --git a/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk b/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk
deleted file mode 100644
index 34dfe1b4a5d1..000000000000
--- a/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk
+++ /dev/null
@@ -1,23 +0,0 @@
---- solenv/gbuild/platform/freebsd.mk.orig	2018-01-25 18:01:47 UTC
-+++ solenv/gbuild/platform/freebsd.mk
-@@ -95,6 +95,7 @@ gb_CXXFLAGS := \
- 	-fno-use-cxa-atexit \
- 	-fvisibility-inlines-hidden \
- 	-fvisibility=hidden \
-+	-std=gnu++98 \
- 	-pipe
- ifeq ($(COM),CLANG)
- gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH
-@@ -143,6 +144,12 @@ gb_LinkTarget_LDFLAGS += \
- 	-Wl,--dynamic-list-cpp-typeinfo \
- 	-Wl,-Bsymbolic-functions \
- 
-+endif
-+
-+ifneq ($(filter $(CPUNAME),INTEL X86_64),)
-+gb_CFLAGS += -fstack-protector
-+gb_CXXFLAGS += -fstack-protector
-+gb_LinkTarget_LDFLAGS += -fstack-protector
- endif
- 
- ifeq ($(gb_DEBUGLEVEL),2)
diff --git a/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk b/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk
deleted file mode 100644
index d4229f98d886..000000000000
--- a/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- solenv/inc/unxfbsd.mk.orig	2017-01-23 03:29:47 UTC
-+++ solenv/inc/unxfbsd.mk
-@@ -105,10 +105,15 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
- CFLAGS_NO_EXCEPTIONS=-fno-exceptions
- 
- # -fpermissive should be removed as soon as possible
--CFLAGSCXX= -pipe $(ARCH_FLAGS) 
-+CFLAGSCXX= -pipe $(ARCH_FLAGS) -std=gnu++98
- .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
- CFLAGSCXX += -fvisibility-inlines-hidden
- .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+.IF "$(CPUNAME)" == "INTEL" || "$(CPUNAME)" == "X86_64"
-+CFLAGSCC += -fstack-protector
-+CFLAGSCXX += -fstack-protector
-+.ENDIF
- 
- # Compiler flags for compiling static object in multi threaded environment with graphical user interface
- CFLAGSOBJGUIMT=