[Libreoffice-commits] core.git: 4 commits - configure.ac sal/osl solenv/gbuild vcl/aqua
Norbert Thiebaud
nthiebaud at gmail.com
Fri Aug 2 20:17:39 PDT 2013
configure.ac | 108 ++++++++++++++++---------------
sal/osl/unx/system.c | 7 +-
solenv/gbuild/platform/macosx.mk | 5 +
vcl/aqua/source/gdi/salnativewidgets.cxx | 4 +
4 files changed, 70 insertions(+), 54 deletions(-)
New commits:
commit 33ed80c271d08b1756d2b60c3d62f474dff5f0c8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Aug 2 21:22:10 2013 -0500
the compiler of the 10.6 SDK is pretty confused wrt to aliasing warning
Change-Id: I7628a7cf862642e2fa85bf25bfc60cd7f06c2dbe
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 1becf71..cb27bf2 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -71,6 +71,11 @@ gb_COMPILERDEFS += \
endif
+ifneq ($(filter 1060,$(MACOSX_SDK_VERSION)),)
+gb_COMPILERNOOPTFLAGS := -O0 -fstrict-overflow
+
+endif
+
ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE)
gb_CXXFLAGS += -Wno-long-double
endif
commit 1526e6fde2a82e494f1e7993eb8bbe1a08f5f375
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Aug 2 21:08:14 2013 -0500
NSAppKitVersionNumber10_7 is not surprisingly not defined in 10.6 SDK
Change-Id: I68cba736de084a19d1dc92a3ccdd66b653f975c6
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx
index dcdba2b..8e5b24b 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -31,6 +31,10 @@
#include <Carbon/Carbon.h>
#include "postmac.h"
+#ifndef NSAppKitVersionNumber10_7
+#define NSAppKitVersionNumber10_7 1138
+#endif
+
class AquaBlinker : public Timer
{
AquaSalFrame* mpFrame;
commit 0b468e9f16dbd6bdc06064672b8c78ca91f55ef9
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Aug 2 21:07:18 2013 -0500
CFErrorRef is apparently not always initialized by the callee
on 10.6 SDK this coredumped in some case in CFRelease(cferror)
Maing sure that cferror is initialized to NULL
avoid the problem
Change-Id: I5624416867670bfd4c8db9b35e3b3d37494f79fd
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index 20621a6..55a5bb5 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -169,12 +169,15 @@ int macxp_resolveAlias(char *path, int buflen)
CFStringRef cfpath = CFStringCreateWithCString( NULL, path, kCFStringEncodingUTF8 );
CFURLRef cfurl = CFURLCreateWithFileSystemPath( NULL, cfpath, kCFURLPOSIXPathStyle, false );
CFRelease( cfpath );
- CFErrorRef cferror;
+ CFErrorRef cferror = NULL;
CFDataRef cfbookmark = CFURLCreateBookmarkDataFromFile( NULL, cfurl, &cferror );
CFRelease( cfurl );
if ( cfbookmark == NULL )
{
- CFRelease( cferror );
+ if(cferror)
+ {
+ CFRelease( cferror );
+ }
}
else
{
commit 3961c28659c961351d1b2b0d5cb5551d4940e8c3
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Aug 2 21:05:13 2013 -0500
configure: openCl does not build on 10.6 mac default no in that case
Change-Id: I84b74cb9e9893996179b4b0229853903e29fe28d
diff --git a/configure.ac b/configure.ac
index bc6ddb5..7809430 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9995,13 +9995,17 @@ OPENCL_LIBS=
OPENCL_CFLAGS=
ENABLE_OPENCL=
AC_MSG_CHECKING([OpenCL])
-if test \( -z "$with_opencl_sdk" -o "$with_opencl_sdk" = yes \) -a $_os = Darwin; then
- # OS X
- AC_MSG_RESULT([yes, always on OS X])
- ENABLE_OPENCL=TRUE
- OPENCL_CFLAGS=
- OPENCL_LIBS="-framework OpenCL"
- AC_DEFINE(HAVE_FEATURE_OPENCL)
+if test \( -z "$with_opencl_sdk" -o "$with_opencl_sdk" = yes \) -a $_os = Darwin ; then
+ # OS X
+ if test "$with_open_sdk" = yes -o "$with_macosx_sdk" != "10.6" ; then
+ AC_MSG_RESULT([yes, always on OS X])
+ ENABLE_OPENCL=TRUE
+ OPENCL_CFLAGS=
+ OPENCL_LIBS="-framework OpenCL"
+ AC_DEFINE(HAVE_FEATURE_OPENCL)
+ else
+ AC_MSG_RESULT([no])
+ fi
elif test -z "$with_opencl_sdk" -o "$with_opencl_sdk" = no; then
AC_MSG_RESULT([no])
else
@@ -10028,49 +10032,49 @@ AC_SUBST(ENABLE_OPENCL)
# presenter minimizer extension?
AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
if test "x$enable_ext_presenter_minimizer" != "xno" -a "x$enable_extension_integration" != "xno"; then
- AC_MSG_RESULT([yes])
- ENABLE_MINIMIZER=YES
+ AC_MSG_RESULT([yes])
+ ENABLE_MINIMIZER=YES
else
- AC_MSG_RESULT([no])
- ENABLE_MINIMIZER=NO
- SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MINIMIZER"
+ AC_MSG_RESULT([no])
+ ENABLE_MINIMIZER=NO
+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MINIMIZER"
fi
AC_SUBST(ENABLE_MINIMIZER)
# pdf import?
AC_MSG_CHECKING([whether to build the PDF import])
if test "$_os" != Android -a "$_os" != iOS -a "$ENABLE_PDFIMPORT" != FALSE; then
- AC_MSG_RESULT([yes])
- ENABLE_PDFIMPORT=TRUE
-
- dnl ===================================================================
- dnl Check for system poppler
- dnl ===================================================================
- AC_MSG_CHECKING([which pdf backend to use])
- if test "$with_system_poppler" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_POPPLER=YES
- PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
- AC_LANG_PUSH([C++])
- save_CXXFLAGS=$CXXFLAGS
- save_CPPFLAGS=$CPPFLAGS
- CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
- CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
- AC_CHECK_HEADER([cpp/poppler-version.h], [],
+ AC_MSG_RESULT([yes])
+ ENABLE_PDFIMPORT=TRUE
+
+ dnl ===================================================================
+ dnl Check for system poppler
+ dnl ===================================================================
+ AC_MSG_CHECKING([which pdf backend to use])
+ if test "$with_system_poppler" = "yes"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_POPPLER=YES
+ PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
+ AC_LANG_PUSH([C++])
+ save_CXXFLAGS=$CXXFLAGS
+ save_CPPFLAGS=$CPPFLAGS
+ CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
+ AC_CHECK_HEADER([cpp/poppler-version.h], [],
[AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], [])
- CXXFLAGS=$save_CXXFLAGS
- CPPFLAGS=$save_CPPFLAGS
- AC_LANG_POP([C++])
- libo_MINGW_CHECK_DLL([libpoppler])
- POPPLER_CFLAGS=$(printf '%s' "$POPPLER_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
- else
- AC_MSG_RESULT([internal])
- SYSTEM_POPPLER=NO
- BUILD_TYPE="$BUILD_TYPE POPPLER"
- fi
-else
- AC_MSG_RESULT([no])
- ENABLE_PDFIMPORT=FALSE
+ CXXFLAGS=$save_CXXFLAGS
+ CPPFLAGS=$save_CPPFLAGS
+ AC_LANG_POP([C++])
+ libo_MINGW_CHECK_DLL([libpoppler])
+ POPPLER_CFLAGS=$(printf '%s' "$POPPLER_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+ else
+ AC_MSG_RESULT([internal])
+ SYSTEM_POPPLER=NO
+ BUILD_TYPE="$BUILD_TYPE POPPLER"
+ fi
+else
+ AC_MSG_RESULT([no])
+ ENABLE_PDFIMPORT=FALSE
fi
AC_SUBST(ENABLE_PDFIMPORT)
AC_SUBST(SYSTEM_POPPLER)
@@ -10079,16 +10083,16 @@ AC_SUBST(POPPLER_LIBS)
AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
if test "x$enable_ext_wiki_publisher" = "xyes" -a "x$enable_extension_integration" != "xno" -a "$with_java" != "no"; then
- AC_MSG_RESULT([yes])
- ENABLE_MEDIAWIKI=YES
- BUILD_TYPE="$BUILD_TYPE XSLTML"
- if test "x$with_java" = "xno"; then
- AC_MSG_ERROR([Wiki Publisher requires Java! Enable Java if you want to build it.])
- fi
-else
- AC_MSG_RESULT([no])
- ENABLE_MEDIAWIKI=NO
- SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI"
+ AC_MSG_RESULT([yes])
+ ENABLE_MEDIAWIKI=YES
+ BUILD_TYPE="$BUILD_TYPE XSLTML"
+ if test "x$with_java" = "xno"; then
+ AC_MSG_ERROR([Wiki Publisher requires Java! Enable Java if you want to build it.])
+ fi
+else
+ AC_MSG_RESULT([no])
+ ENABLE_MEDIAWIKI=NO
+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI"
fi
AC_SUBST(ENABLE_MEDIAWIKI)
More information about the Libreoffice-commits
mailing list