Upgrade to upstream svn revision r1697984.

Nuke patch-clang34 because it has been incorporated upstream.

Replace the default images in the opening splash window and the
Help->About window with FreeBSD-branded versions that also mark
this as a developer snapshot.  Thanks to pfg for suggesting this
and reviewing the new images.

3 files changed, 0 insertions, 27 deletions

diff --git a/editors/openoffice-devel/files/freebsd-aoo-about-developer.png b/editors/openoffice-devel/files/freebsd-aoo-about-developer.png
new file mode 100644
index 000000000000..4ace9b57279b
--- /dev/null
+++ b/editors/openoffice-devel/files/freebsd-aoo-about-developer.png
diff --git a/editors/openoffice-devel/files/freebsd-aoo-intro-developer.png b/editors/openoffice-devel/files/freebsd-aoo-intro-developer.png
new file mode 100644
index 000000000000..bbacdeca26fa
--- /dev/null
+++ b/editors/openoffice-devel/files/freebsd-aoo-intro-developer.png
diff --git a/editors/openoffice-devel/files/patch-clang34amd64 b/editors/openoffice-devel/files/patch-clang34amd64
deleted file mode 100644
index 6fc0a1589633..000000000000
--- a/editors/openoffice-devel/files/patch-clang34amd64
+++ /dev/null
@@ -1,27 +0,0 @@
---- connectivity/source/drivers/dbase/makefile.mk.orig	2014-09-19 18:15:41 UTC
-+++ connectivity/source/drivers/dbase/makefile.mk
-@@ -76,7 +76,9 @@ EXCEPTIONSFILES=\
- 	$(SLO)$/DDriver.obj
- 
- # [kh] ppc linux gcc compiler problem
--.IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCPOWERPC"
-+# [Don Lewis] clang 3.4 -O2 on amd64 tries to use R_X86_64_PC32 relocation with
-+#             symbol _ZThn192_N12connectivity4file10OFileTable7acquireEvj
-+.IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCPOWERPC" || ("$(OS)$(COM)$(CPUNAME)"=="FREEBSDCLANGX86_64" && $(CCNUMVER)>=000300040000 && $(CCNUMVER)<000300050000)
- EXCEPTIONSNOOPTFILES= \
- 	$(SLO)$/DTable.obj
- .ELSE
---- solenv/inc/tg_compv.mk.orig	2015-08-05 01:53:01 UTC
-+++ solenv/inc/tg_compv.mk
-@@ -38,7 +38,11 @@ CFLAGSNUMVERSION_CMD=-dumpversion $(PIPE
- .ELIF "$(COM)"=="CLANG"
- CFLAGSVERSION=--version
- CFLAGSVERSION_CMD=--version | head -n1 | sed -e"s/.*version //" -e"s/ .*//"
-+.IF "$(OS)"="FREEBSD"
-+CFLAGSNUMVERSION_CMD=${CFLAGSVERSION_CMD} | $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
-+.ELSE
- CFLAGSNUMVERSION_CMD=${CFLAGSVERSION_CMD} | sed -e"s/\.//"
-+.ENDIF
- .ELIF "$(COM)"=="MSC"
- CFLAGSVERSION=
- CFLAGSVERSION_CMD=  $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk