LICENSE_ALv2 | 2 +-
NOTICE | 2 +-
cui/source/dialogs/about.cxx | 2 +-
external_deps.lst | 6 +++---
solenv/gbuild/platform/freebsd.mk | 8 ++------
5 files changed, 8 insertions(+), 12 deletions(-)
New commits:
commit 23578f63821e340dc1718dc1ed0d046d63efe523
Author: Damjan Jovanovic <dam...@apache.org>
Date: Wed Jan 25 04:02:55 2017 +0000
Fix a FreeBSD regression in the gbuild gb_CPUDEFS variable caused by
r1773166, where it was always set to POWERPC64 due to a swapped if-else.
This needs further work, on all platforms!
Patch by: me
diff --git a/solenv/gbuild/platform/freebsd.mk
b/solenv/gbuild/platform/freebsd.mk
index d576df1..5c53e9e 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -68,14 +68,10 @@ gb_COMPILERDEFS := \
ifeq ($(CPUNAME),X86_64)
gb_CPUDEFS := -D$(CPUNAME)
-else
-gb_CPUDEFS := -DX86
-endif
-
-ifeq ($(CPUNAME),POWERPC64)
+else ifeq ($(CPUNAME),POWERPC64)
gb_CPUDEFS := -D$(CPUNAME)
else
-gb_CPUDEFS := -DPOWERPC64
+gb_CPUDEFS := -DX86
endif
gb_CFLAGS := \
commit 765f7daa65e8f8fa0fe54f23c16bbbea8e81880e
Author: Ariel Constenla-Haile <arie...@apache.org>
Date: Tue Jan 24 02:34:25 2017 +0000
i127295 - Update the Copyright year to 2017
diff --git a/LICENSE_ALv2 b/LICENSE_ALv2
index 729d018..6e6b456 100644
--- a/LICENSE_ALv2
+++ b/LICENSE_ALv2
@@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright 2011, 2012, 2013, 2014, 2015, 2016 Apache Software Foundation
+ Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 Apache Software
Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/NOTICE b/NOTICE
index ab6cfe8..f9f89c7 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,7 +1,7 @@
$HeadURL$
Apache OpenOffice (http://www.openoffice.org)
-Copyright 2011, 2016 The Apache Software Foundation
+Copyright 2011, 2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index c002ded..ff944f6 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -311,7 +311,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId &
rId ) :
sbcopyright.appendAscii("Copyright ");
sbcopyright.append((sal_Unicode)0x00a9);
sbcopyright.appendAscii(" ");
- rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2016") );
+ rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2017") );
if (vendor.EqualsAscii("Apache Software Foundation")) {
sbcopyright.append(sYear);
sbcopyright.appendAscii(" The Apache Software Foundation.\n\n");
commit 5e052c8193a5e7c8b57f1b11e4e25e2fe11663d2
Author: Pedro Giffuni <p...@apache.org>
Date: Mon Jan 23 22:55:59 2017 +0000
Update Hunspell to version 1.3.3 (minor)
This is the last version available on sourceforge, new versions are
available through github.
Main changes are:
2014-06-02: Hunspell 1.3.3 release:
- OpenDocument (ODF and Flat ODF) support (ODF needs unzip program)
- various bug fixes
diff --git a/external_deps.lst b/external_deps.lst
index 5a02e6a..6988e73 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -296,9 +296,9 @@ if (ENABLE_CATEGORY_B==YES && SYSTEM_HYPH!=YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && SYSTEM_HUNSPELL!=YES)
- name = hunspell-1.3.2.tar.gz
- MD5 = 3121aaf3e13e5d88dfff13fb4a5f1ab8
- URL1 =
http://sourceforge.net/projects/hunspell/files/Hunspell/1.3.2/hunspell-1.3.2.tar.gz/download
+ name = hunspell-1.3.3.tar.gz
+ MD5 = 4967da60b23413604c9e563beacc63b4
+ URL1 =
http://sourceforge.net/projects/hunspell/files/Hunspell/1.3.3/hunspell-1.3.3.tar.gz/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA==TRUE && ENABLE_JAVASCRIPT==YES)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
