aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/openoffice-devel/Makefile4
-rw-r--r--editors/openoffice-devel/distinfo4
-rw-r--r--editors/openoffice-devel/files/freebsd-aoo-about-developer.pngbin0 -> 29491 bytes
-rw-r--r--editors/openoffice-devel/files/freebsd-aoo-intro-developer.pngbin0 -> 43856 bytes
-rw-r--r--editors/openoffice-devel/files/patch-clang34amd6427
5 files changed, 5 insertions, 30 deletions
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 538019a063d0..47f00f7e07a3 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -100,7 +100,7 @@ AOOVERSION2= 2
AOOVERSION3= 0
# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
AOOTAG= AOO420m1\(Build:9800\)
-SVNREVISION= 1694132
+SVNREVISION= 1697984
#AOORC=rc3
EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
@@ -293,6 +293,8 @@ pre-everything::
post-extract:
${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC}
${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
+ ${CP} ${FILESDIR}/freebsd-aoo-intro-developer.png ${WRKSRC}/default_images/introabout/intro.png
+ ${CP} ${FILESDIR}/freebsd-aoo-about-developer.png ${WRKSRC}/default_images/introabout/about.png
${RM} -rf ${WRKSRC}/l10n
${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
${SED} -e '\|^For main/vcl/unx/generic/fontmanager/parseAFM|,/^__/p' \
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index 0f5fd5a94638..a36796238ab3 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,5 +1,5 @@
-SHA256 (openoffice/apache-openoffice-r1694132-src.tar.xz) = 861f9e7c559a3bc345c4a3e5e94fa15683259ee00692034833a40d03bdb2ddce
-SIZE (openoffice/apache-openoffice-r1694132-src.tar.xz) = 215178940
+SHA256 (openoffice/apache-openoffice-r1697984-src.tar.xz) = 50eb71b4af05d55071a03c85449108efb9351ee8c0f158d44413bd4726c557f8
+SIZE (openoffice/apache-openoffice-r1697984-src.tar.xz) = 215196304
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice/unowinreg.dll) = 6144
SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa
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
Binary files differ
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
Binary files differ
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