avmedia/Module_avmedia.mk | 2 ++
configure.ac | 19 ++++++++++++++-----
external/firebird/ExternalProject_firebird.mk | 5 +++++
external/python3/ExternalProject_python3.mk | 6 ++++++
postprocess/Rdb_services.mk | 4 +++-
vcl/osx/PictToBmpFlt.cxx | 1 -
6 files changed, 30 insertions(+), 7 deletions(-)
New commits:
commit e145cf15d1b452e575867b990095d176cf53383c
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Sep 16 10:28:07 2016 +0300
Bump version to 5.2.1.4
Change-Id: If89d9d2bc5c92506a32254a107da33a70659061a
diff --git a/configure.ac b/configure.ac
index 96dcd7e..7c4c4d1 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 Vanilla],[5.2.1.3],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice Vanilla],[5.2.1.4],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit c1c3fe67e7e2c878c57aff12240e6ea4814c6f76
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Aug 4 23:29:12 2016 +0300
No QuickTime in the 10.12 SDK
Finally. It has been documented as deprecated for years, after all.
Change-Id: Ia7f81639b2e0b313e0a8931f49c3902c5856339d
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index fb9497d..a037b4d 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -37,11 +37,13 @@ endif
ifeq ($(OS),MACOSX)
ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
+ifneq ($(filter 1080 1090 101000 101100,$(MACOSX_SDK_VERSION)),)
$(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediaQuickTime \
))
endif
endif
+endif
ifeq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,avmedia,\
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 775022a..f56e55b 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -127,7 +127,9 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(filter MACOSX,$(OS)), \
$(call
gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
$(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \
- $(call
gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \
+ $(if $(filter 1080 1090 101000
101100,$(MACOSX_SDK_VERSION)), \
+ $(call
gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \
+ ) \
) \
lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \
fpicker/source/aqua/fps_aqua \
commit feedb662d800373fcf6163e245293272bfea0a34
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Aug 4 23:24:12 2016 +0300
Drop unneeded include
There is no <QuickTime/QuickTime.h> in the 10.12 SDK anyway.
Change-Id: I0d937d4b036d118fcb503543a516e55f859a3718
diff --git a/vcl/osx/PictToBmpFlt.cxx b/vcl/osx/PictToBmpFlt.cxx
index af8740b..153c036 100644
--- a/vcl/osx/PictToBmpFlt.cxx
+++ b/vcl/osx/PictToBmpFlt.cxx
@@ -19,7 +19,6 @@
#include <premac.h>
#include <Carbon/Carbon.h>
-#include <QuickTime/QuickTime.h>
#include <postmac.h>
#include <string.h>
commit ae4544ee0d0e5eec8c868d6d9c9b4ad20468facf
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Sep 14 16:18:49 2016 +0200
external/firebird: Hack around detection of clock_gettime on Mac OS X
...where the 10.12 SDK includes clock_gettime, marked as
__attribute__((availability(macosx,introduced=10.12)))
in time.h. However, the way firebird's configure checks for it, it gets
detected as available regardless of the used -mmacosx-version-min value (and
even if the configure check would go via the time.h header, the availability
attribute would only cause a -Wpartial-availability warning, not an error,
so
we'd need to pass CFLAGS=-Werror=partial-availability into firebird's
configure.)
Change-Id: I67e12743e1df0574e7fc4b2121add9fe1fb7677b
diff --git a/external/firebird/ExternalProject_firebird.mk
b/external/firebird/ExternalProject_firebird.mk
index cd89dfb..6187985 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -70,6 +70,11 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
, \
--enable-shared --disable-static \
) \
+ $(if $(filter MACOSX,$(OS)), \
+ $(if $(filter 1, \
+ $(shell expr
'$(MAC_OS_X_VERSION_MIN_REQUIRED)' \
+ '<' 101200)), \
+ ac_cv_func_clock_gettime=no)) \
&& if [ -n "$${FB_CPU_ARG}" ]; then \
$(MAKE_PRE) $(MAKE) $(INVOKE_FPA) SHELL='$(SHELL)'
firebird_embedded $(MAKE_POST); \
else \
commit 25963594b517c6160567053e739cf62b935cd5c9
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Aug 4 23:09:43 2016 +0300
Don't use functions introduced in 10.12 when building to run on older
getentropy() and clock_gettime() are new in macOS Sierra (10.12).
Change-Id: I93640bbf20056d925c3116df336aeaebaaffda18
diff --git a/external/python3/ExternalProject_python3.mk
b/external/python3/ExternalProject_python3.mk
index 38ed670..b691097 100755
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -57,6 +57,12 @@ endif
$(call gb_ExternalProject_get_state_target,python3,build) :
$(call gb_ExternalProject_run,build,\
+ $(if $(filter MACOSX,$(OS)), \
+ $(if $(filter 10.8 10.9 10.10
10.11,$(MACOSX_DEPLOYMENT_TARGET)), \
+ ac_cv_func_getentropy=no \
+ ac_cv_func_clock_gettime=no \
+ ) \
+ ) \
./configure \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(if $(ENABLE_VALGRIND),--with-valgrind) \
commit c7b992a7e73210c0e24521832e6e3e57a3026f26
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Aug 4 22:48:22 2016 +0300
Accept also macOS SDK 10.12
Change-Id: I2e654de8af40486ef63146ad42a3f2988f9c3579
diff --git a/configure.ac b/configure.ac
index 75f2dd7..96dcd7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2769,7 +2769,7 @@ if test $_os = Darwin; then
AC_MSG_CHECKING([what Mac OS X SDK to use])
- for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11; do
+ for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11 10.12; do
MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2>
/dev/null`
if test -d "$MACOSX_SDK_PATH"; then
with_macosx_sdk="${_macosx_sdk}"
@@ -2800,8 +2800,11 @@ if test $_os = Darwin; then
10.11)
MACOSX_SDK_VERSION=101100
;;
+ 10.12)
+ MACOSX_SDK_VERSION=101200
+ ;;
*)
- AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported
value, supported values are 10.8--11])
+ AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported
value, supported values are 10.8--12])
;;
esac
@@ -2833,8 +2836,11 @@ if test $_os = Darwin; then
10.11)
MAC_OS_X_VERSION_MIN_REQUIRED="101100"
;;
+ 10.12)
+ MAC_OS_X_VERSION_MIN_REQUIRED="101200"
+ ;;
*)
- AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.8--11])
+ AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.8--12])
;;
esac
@@ -2870,8 +2876,11 @@ if test $_os = Darwin; then
10.11)
MAC_OS_X_VERSION_MAX_ALLOWED="101100"
;;
+ 10.12)
+ MAC_OS_X_VERSION_MAX_ALLOWED="101200"
+ ;;
*)
- AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.8--11])
+ AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.8--12])
;;
esac
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
