Makefile.in | 5 +++++
Repository.mk | 4 +---
configure.ac | 2 +-
solenv/gbuild/platform/MACOSX_X86_64_GCC.mk | 2 +-
svx/Module_svx.mk | 2 --
5 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 11b4f4bfbee257d63f6a52808fb02b903ddea0d5
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Sep 23 00:27:58 2014 +0300
We need the gengal program at build time
But don't bother shipping it on OS X, at least not in the sandboxed
(App Store) case.
Change-Id: Id73bef1ba71d126c2d2962fe846e9c31963d6c24
diff --git a/Makefile.in b/Makefile.in
index af2096a..de9fa46 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -311,6 +311,11 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
# And with it removed, presumably the other stuff in the Python
lib/python3.3/config-3.3m probably does not make sense either.
rm -rf $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]*
#
+ifneq ($ENABLE_MACOSX_SANDBOX),)
+# Remove the gengal.bin binary that we don't want
+ rm $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/gengal.bin
+endif
+#
# Then use the macosx-codesign-app-bundle script
@macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app
endif
diff --git a/Repository.mk b/Repository.mk
index 9976a3c..96224ad 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -76,9 +76,7 @@ $(eval $(call
gb_Helper_register_executables_for_install,SDK,sdk, \
))
$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
- $(if $(ENABLE_MACOSX_SANDBOX),, \
- gengal \
- )\
+ gengal \
))
$(eval $(call gb_Helper_register_executables,OOO, \
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index 0e63435..80f2bd7 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -34,13 +34,11 @@ $(eval $(call gb_Module_add_l10n_targets,svx,\
))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-ifeq (,$(ENABLE_MACOSX_SANDBOX))
$(eval $(call gb_Module_add_targets,svx,\
Executable_gengal.bin \
Package_gengal \
))
endif
-endif
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
commit 914147f74d7e961b74e5a4c284a8c4cc9d64b3e4
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Sep 22 20:28:45 2014 +0300
Let's use -O3
Change-Id: Id7d068df3cabe9e7c01cc90ffdc61fa325f79dab
diff --git a/solenv/gbuild/platform/MACOSX_X86_64_GCC.mk
b/solenv/gbuild/platform/MACOSX_X86_64_GCC.mk
index a31437a..4dc20c9 100644
--- a/solenv/gbuild/platform/MACOSX_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/MACOSX_X86_64_GCC.mk
@@ -8,7 +8,7 @@
#
#*************************************************************************
-gb_COMPILERDEFAULTOPTFLAGS := -O2
+gb_COMPILERDEFAULTOPTFLAGS := -O3
include $(GBUILDDIR)/platform/macosx.mk
commit 9c611469c6f1b3dd1ad895400fe3b2fc2f34cd05
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Sep 22 19:56:15 2014 +0300
Bump patch level for new Mac App Store submit attempt
For some reason the 4.2.10013 build has got stuck in Apple's machinery
or something, and doesn't show up in iTunes Connect, it is not
selectable on the app's page. Let's see if submitting a new build will
help.
Change-Id: I1a38337af7d6b75654ce9fbe06a6d95c20a97056
diff --git a/configure.ac b/configure.ac
index fce44a3..3e254d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[4.2.10.13],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.2.10.14],[],[],[https://libreoffice-from-collabora.com/])
AC_PREREQ([2.59])
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
