Rebased ref, commits from common ancestor: commit b7957406a90649af1740a15559c2784f29b39578 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Wed Dec 24 10:47:02 2014 -0500
use -lobjc-gnu and GNUstep libraries when compiler is GCC for: vcl toolkit apple_remote sfx2 avmedia-quicktime fpicker-aqua shell-macbe1 { note: path to GNUstep libraries is currently hard-coded } Change-Id: Ia28778f3e262e71c87c48e71fbfd9001d5d6ac7a diff --git a/apple_remote/Library_AppleRemote.mk b/apple_remote/Library_AppleRemote.mk index cf48553..5d8cbfd 100644 --- a/apple_remote/Library_AppleRemote.mk +++ b/apple_remote/Library_AppleRemote.mk @@ -17,6 +17,10 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,AppleRemote,\ IOKit \ )) +$(eval $(call gb_Library_add_libs,AppleRemote,\ + $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),-lobjc,-lobjc-gnu -L/usr/GNUstep/System/Library/Libraries -lgnustep-base -lgnustep-gui) \ +)) + $(eval $(call gb_Library_add_objcobjects,AppleRemote,\ apple_remote/source/KeyspanFrontRowControl \ apple_remote/source/AppleRemote \ diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk index 20bf9c3..8bc097d 100644 --- a/avmedia/Library_avmediaQuickTime.mk +++ b/avmedia/Library_avmediaQuickTime.mk @@ -35,6 +35,10 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,avmediaQuickTime,\ QTKit \ )) +$(eval $(call gb_Library_add_libs,avmediaQuickTime,\ + $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),-lobjc,-lobjc-gnu -L/usr/GNUstep/System/Library/Libraries -lgnustep-base -lgnustep-gui) \ +)) + $(eval $(call gb_Library_add_objcxxobjects,avmediaQuickTime,\ avmedia/source/quicktime/framegrabber \ avmedia/source/quicktime/manager \ diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk index e4b7ef5..c8a2dc5 100644 --- a/fpicker/Library_fps_aqua.mk +++ b/fpicker/Library_fps_aqua.mk @@ -44,4 +44,8 @@ $(eval $(call gb_Library_add_objcxxobjects,fps_aqua,\ fpicker/source/aqua/SalAquaPicker \ )) +$(eval $(call gb_Library_add_libs,fps_aqua,\ + $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),-lobjc,-lobjc-gnu -L/usr/GNUstep/System/Library/Libraries -lgnustep-base -lgnustep-gui) \ +)) + # vim: set noet sw=4 ts=4: diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index faba426..d75c41a 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -326,7 +326,7 @@ $(eval $(call gb_Library_add_objcxxobjects,sfx,\ sfx2/source/appl/shutdowniconaqua \ )) $(eval $(call gb_Library_add_libs,sfx,\ - -lobjc \ + $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),-lobjc,-lobjc-gnu -L/usr/GNUstep/System/Library/Libraries -lgnustep-base -lgnustep-gui) \ )) $(eval $(call gb_Library_use_system_darwin_frameworks,sfx,\ Cocoa \ diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk index c693e11..5b13704 100644 --- a/shell/Library_macbe.mk +++ b/shell/Library_macbe.mk @@ -18,6 +18,10 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,macbe1,\ SystemConfiguration \ )) +$(eval $(call gb_Library_add_libs,macbe1,\ + $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),-lobjc,-lobjc-gnu -L/usr/GNUstep/System/Library/Libraries -lgnustep-base -lgnustep-gui) \ +)) + $(eval $(call gb_Library_use_libraries,macbe1,\ cppu \ cppuhelper \ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 148a236..7d8958f 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -120,7 +120,7 @@ $(eval $(call gb_Library_add_objcxxflags_exception_objects,tk,\ ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_libs,tk,\ - -lobjc \ + $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),-lobjc,-lobjc-gnu -L/usr/GNUstep/System/Library/Libraries -lgnustep-base -lgnustep-gui) \ )) endif diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index ffaf49b..cc29e10 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -90,7 +90,7 @@ $(eval $(call gb_Library_add_libs,vcl,\ -framework IOKit \ -F/System/Library/PrivateFrameworks \ -framework CoreUI \ - -lobjc \ + $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),-lobjc,-lobjc-gnu -L/usr/GNUstep/System/Library/Libraries -lgnustep-base -lgnustep-gui) \ )) endif commit af363ba422e9618e1b83294729570150dfa9b286 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Tue Sep 8 08:06:37 2015 -0400 ctfonts.cxx: add kCTForegroundColorFromContextAttributeName as extern Although the Apple documentation claims kCTForegroundColorFromContextAttributeName is supported on 10.5 and later, it is not defined in CTStringAttributes.h or anywhere else. I think it was inadvertently omitted from CTStringAttributes.h on 10.5, along with a few other symbols. related commit: 507efabe8b40e34c2bebfdaa00d4264c5345d3dd Change-Id: I8ea33f64d79eff4b73552ec48ea2016c7d9d0bb4 diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 1978c91..f3d3116 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -30,6 +30,10 @@ #ifdef MACOSX #include "osx/saldata.hxx" #include "osx/salinst.h" +# if MACOSX_SDK_VERSION < 1060 +/* symbol is defined in 10.5.x dylib but not in headers */ +extern const CFStringRef kCTForegroundColorFromContextAttributeName; +# endif #endif #include "outfont.hxx" #include "PhysicalFontCollection.hxx" commit b78e4c69dae1c0a63db62c8a9cab318cb05a6735 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Mon Sep 7 06:15:08 2015 -0400 vcl, toolkit: don't force gb_OBJCXXFLAGS for every .cxx file Change-Id: I6abc1e3d325e2f5e28fb8fe084b3bfab3803d92f diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index e5aaad5..148a236 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -64,13 +64,9 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/awt/vclxprinter \ toolkit/source/awt/vclxregion \ toolkit/source/awt/vclxspinbutton \ - toolkit/source/awt/vclxsystemdependentwindow \ toolkit/source/awt/vclxtabpagecontainer \ toolkit/source/awt/animatedimagespeer \ - toolkit/source/awt/vclxtoolkit \ - toolkit/source/awt/vclxtopwindow \ toolkit/source/awt/vclxwindow \ - toolkit/source/awt/vclxwindow1 \ toolkit/source/awt/vclxwindows \ toolkit/source/controls/accessiblecontrolcontext \ toolkit/source/controls/controlmodelcontainerbase \ @@ -115,18 +111,17 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/helper/vclunohelper \ )) -ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_add_cxxflags,tk,\ - $(gb_OBJCXXFLAGS) \ +$(eval $(call gb_Library_add_objcxxflags_exception_objects,tk,\ + toolkit/source/awt/vclxwindow1 \ + toolkit/source/awt/vclxsystemdependentwindow \ + toolkit/source/awt/vclxtopwindow \ + toolkit/source/awt/vclxtoolkit \ )) + +ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_libs,tk,\ -lobjc \ )) endif -ifeq ($(OS),IOS) -$(eval $(call gb_Library_add_cxxflags,tk,\ - $(gb_OBJCXXFLAGS))) -endif - # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index faa8f43..ffaf49b 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -93,16 +93,11 @@ $(eval $(call gb_Library_add_libs,vcl,\ -lobjc \ )) endif -ifeq ($(OS),MACOSX) - -$(eval $(call gb_Library_add_cxxflags,vcl,\ - $(gb_OBJCXXFLAGS) \ -)) -$(eval $(call gb_Library_add_exception_objects,vcl,\ +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_add_objcxxflags_exception_objects,vcl,\ vcl/osx/OpenGLWrapper \ )) - endif ifeq ($(ENABLE_JAVA),TRUE) @@ -133,7 +128,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/opengl/program \ vcl/opengl/texture \ vcl/opengl/FixedTextureAtlas \ - vcl/source/opengl/OpenGLContext \ vcl/source/opengl/OpenGLHelper \ vcl/source/window/cairo_cairo \ vcl/source/window/openglwin \ @@ -391,6 +385,10 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/fontsubset/xlat \ )) +$(eval $(call gb_Library_add_objcxxflags_exception_objects,vcl,\ + vcl/source/opengl/OpenGLContext \ +)) + $(eval $(call gb_Library_add_cobjects,vcl,\ vcl/source/filter/jpeg/transupp \ )) @@ -432,15 +430,11 @@ vcl_coretext_code= \ ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_add_cxxflags,vcl,\ - $(gb_OBJCXXFLAGS) \ -)) - $(eval $(call gb_Library_add_defs,vcl,\ -DMACOSX_BUNDLE_IDENTIFIER=\"$(MACOSX_BUNDLE_IDENTIFIER)\" \ )) -$(eval $(call gb_Library_add_exception_objects,vcl,\ +$(eval $(call gb_Library_add_objcxxflags_exception_objects,vcl,\ $(vcl_coretext_code) \ )) @@ -482,7 +476,7 @@ $(eval $(call gb_Library_add_objcxxobjects,vcl,\ vcl/osx/salframeview \ vcl/osx/salnsmenu \ )) -$(eval $(call gb_Library_add_exception_objects,vcl,\ +$(eval $(call gb_Library_add_objcxxflags_exception_objects,vcl,\ vcl/osx/a11yfocuslistener \ vcl/osx/a11yfocustracker \ vcl/osx/a11ylistener \ @@ -648,10 +642,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ endif ifeq ($(OS),IOS) -$(eval $(call gb_Library_add_cxxflags,vcl,\ - $(gb_OBJCXXFLAGS) \ -)) -$(eval $(call gb_Library_add_exception_objects,vcl,\ +$(eval $(call gb_Library_add_objcxxflags_exception_objects,vcl,\ vcl/ios/iosinst \ vcl/ios/dummies \ $(vcl_really_generic_code) \ diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk index dd7b27d..9ab7305 100644 --- a/vcl/StaticLibrary_vclmain.mk +++ b/vcl/StaticLibrary_vclmain.mk @@ -19,12 +19,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain)) -ifeq ($(OS),IOS) -$(eval $(call gb_StaticLibrary_add_cxxflags,vclmain,\ - $(gb_OBJCXXFLAGS) \ -)) -endif - $(eval $(call gb_StaticLibrary_set_include,vclmain,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ @@ -35,7 +29,7 @@ $(eval $(call gb_StaticLibrary_use_api,vclmain,\ udkapi \ )) -$(eval $(call gb_StaticLibrary_add_exception_objects,vclmain,\ +$(eval $(call gb_StaticLibrary_add_objcxxflags_exception_objects,vclmain,\ vcl/source/salmain/salmain \ )) commit 14652793fbba4c7b8e5972c2b8be357e4b1b94bc Author: Douglas Mencken <dougmenc...@gmail.com> Date: Mon Sep 7 05:59:05 2015 -0400 gbuild: introduce add_objcxxflags_exception_object/objects add_objcxxflags_exception_object is the same as add_exception_object but with gb_OBJCXXFLAGS changes to Library_sal.mk ~- * adapt to add_objcxxflags_exception_objects * remove redundant sal/osl/unx/uunxapi.mm Change-Id: If54cf29f572175869ef4c461d755e3b1518c983b diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 14b72ae..e9b6157 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -127,12 +127,6 @@ $(eval $(call gb_Library_add_exception_objects,sal,\ sal/textenc/unichars \ )) -ifeq ($(OS),IOS) -$(eval $(call gb_Library_add_cxxflags,sal,\ - $(gb_OBJCXXFLAGS) \ -)) -endif - ifeq ($(OS),ANDROID) $(eval $(call gb_Library_add_exception_objects,sal,\ sal/textenc/context \ @@ -181,16 +175,9 @@ $(eval $(call gb_Library_add_exception_objects,sal,\ $(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \ )) -# Note that the uunxapi.mm file just includes the uunxapi.cxx one -ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_add_objcxxobjects,sal,\ +$(eval $(call gb_Library_add_objcxxflags_exception_objects,sal,\ sal/osl/unx/uunxapi \ )) -else -$(eval $(call gb_Library_add_exception_objects,sal,\ - sal/osl/unx/uunxapi \ -)) -endif ifneq ($(filter $(OS),MACOSX IOS),) $(eval $(call gb_Library_add_exception_objects,sal,\ diff --git a/sal/osl/unx/uunxapi.mm b/sal/osl/unx/uunxapi.mm deleted file mode 100644 index 5a7e17f..0000000 --- a/sal/osl/unx/uunxapi.mm +++ /dev/null @@ -1 +0,0 @@ -#include "uunxapi.cxx" diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 8042f33..06f61de 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -178,6 +178,7 @@ $(eval $(foreach method,\ add_asmobject \ add_asmobjects \ add_exception_objects \ + add_objcxxflags_exception_objects \ add_x64_generated_exception_objects \ add_generated_cobjects \ add_generated_cxxobjects \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index b4b9060..ca13792 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -943,6 +943,11 @@ endif endef +# call gb_LinkTarget_add_objcxxflags_exception_object,linktarget,sourcefile,cxxflags,linktargetmakefilename +define gb_LinkTarget_add_objcxxflags_exception_object +$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(call gb_LinkTarget__get_cxxflags,$(3)) $(gb_OBJCXXFLAGS)) +endef + # call gb_LinkTarget_add_objcobject,linktarget,sourcefile,objcflags,linktargetmakefilename define gb_LinkTarget_add_objcobject $(if $(wildcard $(call gb_ObjCObject_get_source,$(SRCDIR),$(2))),,$(eval $(call gb_Output_error,No such source file $(call gb_ObjCObject_get_source,$(SRCDIR),$(2))))) @@ -1144,6 +1149,11 @@ define gb_LinkTarget_add_objcxxobjects $(foreach obj,$(2),$(call gb_LinkTarget_add_objcxxobject,$(1),$(obj),$(3),$(4))) endef +# call gb_LinkTarget_add_objcxxflags_exception_objects,linktarget,sourcefiles,cxxflags,linktargetmakefilename +define gb_LinkTarget_add_objcxxflags_exception_objects +$(foreach obj,$(2),$(call gb_LinkTarget_add_objcxxflags_exception_object,$(1),$(obj),$(3),$(4))) +endef + # call gb_LinkTarget_add_asmobjects,linktarget,sourcefiles,asmflags,linktargetmakefilename define gb_LinkTarget_add_asmobjects $(foreach obj,$(2),$(call gb_LinkTarget_add_asmobject,$(1),$(obj),$(3))) diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index dc7778f..1b5ab3f 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -77,6 +77,7 @@ $(eval $(foreach method,\ add_asmobject \ add_asmobjects \ add_exception_objects \ + add_objcxxflags_exception_objects \ add_x64_generated_exception_objects \ add_generated_cobjects \ add_x64_generated_cobjects \ commit dc10e5029f07010a9299d214f6797fb6b896a49a Author: Douglas Mencken <dougmenc...@gmail.com> Date: Sun Sep 6 12:38:02 2015 -0400 fix build for some `external/' packages also move patch entries for tracking them in future * restore osx-ppc hunks @ external/nss/nss_macosx.patch related commit: 6e7991dfd8c54a833f4a9795a0d57f4690e92e6b * --noexecstack isn't very compatible with some versions of `as' ( FATAL:/usr/bin/../libexec/gcc/darwin/ppc/as: I don't understand '-' flag! ) related: 04a98015101b8fea3b200e0bf3a2469d8c75fdf7 Change-Id: I6cd3192121b74d105ac478f71f42bca872f92541 diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index d297ee4b..13aca66 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -15,13 +15,13 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss.patch \ external/nss/nss.aix.patch \ external/nss/nss-3.13.5-zlib-werror.patch \ - external/nss/nss_macosx.patch \ external/nss/nss-win32-make.patch.1 \ $(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch \ external/nss/nss.vs2015.patch) \ $(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \ external/nss/nss-3.13.3-build.patch.3 \ external/nss/nss.mingw.patch.3) \ + external/nss/nss_macosx.patch \ external/nss/ubsan.patch.0 \ $(if $(filter IOS,$(OS)), \ external/nss/nss-chromium-nss-static.patch \ diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch index 40d02c9..cb0ec68 100644 --- a/external/nss/nss_macosx.patch +++ b/external/nss/nss_macosx.patch @@ -1,6 +1,17 @@ diff -ru a/nspr/configure b/nspr/configure --- a/a/nspr/configure 2014-09-29 16:50:33.907375937 +0100 +++ b/b/nspr/configure 2014-09-29 16:51:59.213931947 +0100 +@@ -6568,7 +6568,9 @@ + ;; + esac + if test "`echo $CC | grep -c '\-arch '`" = "0"; then +- CC="$CC -arch $CPU_ARCH" ++ if test "$CPU_ARCH" != "ppc"; then ++ CC="$CC -arch $CPU_ARCH" ++ fi + fi + ac_fn_c_check_header_mongrel "$LINENO" "crt_externs.h" "ac_cv_header_crt_externs_h" "$ac_includes_default" + if test "x$ac_cv_header_crt_externs_h" = xyes; then : @@ -6577,7 +6579,7 @@ @@ -10,6 +21,20 @@ diff -ru a/nspr/configure b/nspr/configure _OPTIMIZE_FLAGS=-O2 MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' STRIP="$STRIP -x -S" +diff -ru a/nspr/configure.in b/nspr/configure.in +--- a/a/nspr/configure.in 2014-09-29 16:50:33.908375942 +0100 ++++ b/b/nspr/configure.in 2014-09-29 16:51:59.209931921 +0100 +@@ -1402,7 +1402,9 @@ + ;; + esac + if test "`echo $CC | grep -c '\-arch '`" = "0"; then +- CC="$CC -arch $CPU_ARCH" ++ if test "$CPU_ARCH" != "ppc"; then ++ CC="$CC -arch $CPU_ARCH" ++ fi + fi + AC_CHECK_HEADER(crt_externs.h) + DSO_CFLAGS=-fPIC diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk --- a/a/nss/coreconf/Darwin.mk 2014-09-29 16:50:22.992304799 +0100 +++ b/b/nss/coreconf/Darwin.mk 2014-09-29 16:51:59.214931953 +0100 @@ -44,7 +69,12 @@ diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk override CPU_ARCH = x86 endif else -@@ -31,12 +39,16 @@ +@@ -31,17 +39,20 @@ + # Nothing set for arm currently. + else + OS_REL_CFLAGS = -Dppc +-CC += -arch ppc + endif endif ifneq (,$(MACOS_SDK_DIR)) diff --git a/external/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk index b44f576..4ae5357 100644 --- a/external/openssl/UnpackedTarball_openssl.mk +++ b/external/openssl/UnpackedTarball_openssl.mk @@ -22,14 +22,14 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,openssl,\ endif $(eval $(call gb_UnpackedTarball_add_patches,openssl,\ - external/openssl/openssllnx.patch \ + $(if $(filter MACOSX,$(OS)),,external/openssl/openssllnx.patch) \ + external/openssl/opensslosxppc.patch \ external/openssl/opensslmingw.patch \ external/openssl/opensslwnt.patch \ external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1 \ external/openssl/openssl-1.0.1h-win64.patch.1 \ external/openssl/opensslsol.patch \ external/openssl/opensslios.patch \ - external/openssl/opensslosxppc.patch \ external/openssl/openssl-3650-masm.patch.1 \ )) commit f6ed730816c8a2ad42f686a72a4ae9ccd5ac7046 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Fri Dec 26 08:59:41 2014 -0500 fpicker:aqua - deal with OBJC_EXPORT and objc_msgSend Change-Id: I414f5dcbfca9697b22a20d2d45f94c91ec4cd691 diff --git a/fpicker/source/aqua/CFStringUtilities.hxx b/fpicker/source/aqua/CFStringUtilities.hxx index 3c76a81..15a0acf 100644 --- a/fpicker/source/aqua/CFStringUtilities.hxx +++ b/fpicker/source/aqua/CFStringUtilities.hxx @@ -21,6 +21,9 @@ #define INCLUDED_FPICKER_SOURCE_AQUA_CFSTRINGUTILITIES_HXX #include <premac.h> +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include <Carbon/Carbon.h> #include <Cocoa/Cocoa.h> #include <postmac.h> diff --git a/fpicker/source/aqua/ControlHelper.hxx b/fpicker/source/aqua/ControlHelper.hxx index c564c18..966c678 100644 --- a/fpicker/source/aqua/ControlHelper.hxx +++ b/fpicker/source/aqua/ControlHelper.hxx @@ -27,6 +27,9 @@ #include <map> #include <premac.h> +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include <Cocoa/Cocoa.h> #include <postmac.h> #include "SalAquaConstants.h" diff --git a/fpicker/source/aqua/NSString_OOoAdditions.hxx b/fpicker/source/aqua/NSString_OOoAdditions.hxx index 08bfbd4..62b824f 100644 --- a/fpicker/source/aqua/NSString_OOoAdditions.hxx +++ b/fpicker/source/aqua/NSString_OOoAdditions.hxx @@ -21,6 +21,9 @@ #define INCLUDED_FPICKER_SOURCE_AQUA_NSSTRING_OOOADDITIONS_HXX #include <premac.h> +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #import <Cocoa/Cocoa.h> #include <postmac.h> #include <rtl/ustring.hxx> diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index 209a943..5678b71 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -204,12 +204,13 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException ) //Set the delegate to be notified of certain events - // I don't know why, but with gcc 4.2.1, this line results in the warning: +#if MACOSX_SDK_VERSION < 1060 + [m_pDialog setDelegate:m_pDelegate]; +#else + // with gcc 4.2.1, [m_pDialog setDelegate:m_pDelegate] results in the warning // class 'AquaFilePickerDelegate' does not implement the 'NSOpenSavePanelDelegate' protocol - // So instead of: - // [m_pDialog setDelegate:m_pDelegate]; - // do: objc_msgSend(m_pDialog, @selector(setDelegate:), m_pDelegate); +#endif int nStatus = runandwaitforresult(); diff --git a/fpicker/source/aqua/resourceprovider.hxx b/fpicker/source/aqua/resourceprovider.hxx index fd6647e..e736801 100644 --- a/fpicker/source/aqua/resourceprovider.hxx +++ b/fpicker/source/aqua/resourceprovider.hxx @@ -23,6 +23,10 @@ #include <sal/types.h> +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif + #include <premac.h> #include <Cocoa/Cocoa.h> #include <postmac.h> commit e124831bd9d5eef88428ef732a847be7be6c3ef2 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Wed Dec 24 12:59:04 2014 -0500 sfx2:shutdowniconaqua.mm: deal with OBJC_EXPORT and objc_msgSend Change-Id: I7ad0ce3067d8f51d968d4233f77d70300d0d913e diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm index 19d9eaf..75606a8 100644 --- a/sfx2/source/appl/shutdowniconaqua.mm +++ b/sfx2/source/appl/shutdowniconaqua.mm @@ -41,6 +41,9 @@ #include "premac.h" #include <objc/objc-runtime.h> +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include <Cocoa/Cocoa.h> #include "postmac.h" @@ -352,15 +355,13 @@ static void appendRecentMenu( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const OUStri [pItem setEnabled: YES]; NSMenu* pRecentMenu = [[NSMenu alloc] initWithTitle: getAutoreleasedString( i_rTitle ) ]; +#if MACOSX_SDK_VERSION < 1060 + [pRecentMenu setDelegate: pRecentDelegate]; +#else // When compiling against 10.6 SDK, we get the warning: // class 'RecentMenuDelegate' does not implement the 'NSMenuDelegate' protocol - - // No idea if that is a bogus warning, or if the way this is - // implemented just is so weird that the compiler gets - // confused. Anyway, to avoid warnings, instead of this: - // [pRecentMenu setDelegate: pRecentDelegate]; - // do this: objc_msgSend(pRecentMenu, @selector(setDelegate:), pRecentDelegate); +#endif [pRecentMenu setAutoenablesItems: NO]; [pItem setSubmenu: pRecentMenu]; @@ -375,9 +376,11 @@ static void appendRecentMenu( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const OUStri [pItem setEnabled: YES]; pRecentMenu = [[NSMenu alloc] initWithTitle: getAutoreleasedString( i_rTitle ) ]; - // See above - // [pRecentMenu setDelegate: pRecentDelegate]; +#if MACOSX_SDK_VERSION < 1060 + [pRecentMenu setDelegate: pRecentDelegate]; +#else objc_msgSend(pRecentMenu, @selector(setDelegate:), pRecentDelegate); +#endif [pRecentMenu setAutoenablesItems: NO]; [pItem setSubmenu: pRecentMenu]; commit 5ae77abfc379b5ac08577cee527f5983d5fd5ac5 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Sat Oct 25 11:03:56 2014 -0400 vcl: workarounds for `objc_msgSend setDelegate' on OS X 10.5 (vcl/osx/salframe.cxx, vcl/osx/salmenu.cxx) plus, move conditional includes in salframe.cxx down a bit Change-Id: I39886b4590f227ec69042fed0f5240ba0b0fd7f2 diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index f9a8436..6eac68d 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -38,11 +38,6 @@ #include "osx/a11yfactory.h" #include "quartz/utils.h" -#if MACOSX_SDK_VERSION < 1060 -#include "vcl/timer.hxx" -#include "osx/saltimer.h" -#endif - #include "salwtype.hxx" #include "premac.h" @@ -55,6 +50,11 @@ #include <Carbon/Carbon.h> #include "postmac.h" +#if MACOSX_SDK_VERSION < 1060 +#include "vcl/timer.hxx" +#include "osx/saltimer.h" +#endif + using namespace std; AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL; @@ -202,16 +202,16 @@ void AquaSalFrame::initWindowAndView() [mpNSWindow setAcceptsMouseMovedEvents: YES]; [mpNSWindow setHasShadow: YES]; -#if MACOSX_SDK_VERSION < 1060 - objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow); -#else +#if MACOSX_SDK_VERSION >= 1060 + /* objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow); */ [mpNSWindow setDelegate: static_cast<id<NSWindowDelegate> >(mpNSWindow)]; -#endif if( [mpNSWindow respondsToSelector: @selector(setRestorable:)]) { objc_msgSend(mpNSWindow, @selector(setRestorable:), NO); } +#endif + const NSRect aRect = { NSZeroPoint, NSMakeSize( maGeometry.nWidth, maGeometry.nHeight )}; mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView userData: nil assumeInside: NO]; diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx index 2bdc20c..55d9c5f 100644 --- a/vcl/osx/salmenu.cxx +++ b/vcl/osx/salmenu.cxx @@ -264,9 +264,8 @@ AquaSalMenu::AquaSalMenu( bool bMenuBar ) : if( ! mbMenuBar ) { mpMenu = [[SalNSMenu alloc] initWithMenu: this]; -#if MACOSX_SDK_VERSION < 1060 - objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu); -#else +#if MACOSX_SDK_VERSION >= 1060 + /* objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu); */ [mpMenu setDelegate: reinterpret_cast< id<NSMenuDelegate> >(mpMenu)]; #endif } commit c87b0f51ded42d5ca7afd856763229888f478e9c Author: Douglas Mencken <dougmenc...@gmail.com> Date: Sun Oct 26 06:38:10 2014 -0400 vcl: fix some "cannot convert 'objc_object*' to..." issues Change-Id: I4b0e32c412937da4b2ea4bf350be32ea31362b3c diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index 35ea1e2..ba689c9 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -484,7 +484,7 @@ static AquaSalFrame* getMouseContainerFrame() mpFrame = pFrame; mMarkedRange = NSMakeRange(NSNotFound, 0); mSelectedRange = NSMakeRange(NSNotFound, 0); - mpReferenceWrapper = nil; + mpReferenceWrapper = reinterpret_cast<ReferenceWrapper*>(nil); mpMouseEventListener = nil; mpLastSuperEvent = nil; } @@ -1791,7 +1791,7 @@ private: // some frames never become visible .. vcl::Window *pWindow = mpFrame -> GetWindow(); if ( ! pWindow ) - return nil; + return reinterpret_cast<::com::sun::star::accessibility::XAccessibleContext*>(nil); mpReferenceWrapper = new ReferenceWrapper; mpReferenceWrapper -> rAccessibleContext = pWindow -> /*GetAccessibleChildWindow( 0 ) ->*/ GetAccessible() -> getAccessibleContext(); diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx index c1734b2..3539910 100644 --- a/vcl/osx/salnativewidgets.cxx +++ b/vcl/osx/salnativewidgets.cxx @@ -422,7 +422,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType, [NSNumber numberWithBool:NO], @"kCUIWindowFrameDrawTitleSeparatorKey", [NSNumber numberWithBool:YES], @"is.flipped", nil]), - nil);; + reinterpret_cast<const __CFDictionary**>(nil));; } else { commit ba2a28161827b697b73eecc398b048beebcb5011 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Tue Oct 28 13:18:59 2014 -0400 fix "trying to encode non-integer type as a bitfield" this problem arises when you compile with GCC (GNU objective-C mode) Change-Id: Ifa4ff252ae5a7b71320d41873a2c412a32dd0333 diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index a1116d2..61f7b28 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -62,13 +62,13 @@ public: int mnMaxWidth; // max. client width in pixels int mnMaxHeight; // max. client height in pixels NSRect maFullScreenRect; // old window size when in FullScreen - bool mbGraphics:1; // is Graphics used? - bool mbFullScreen:1; // is Window in FullScreen? - bool mbShown:1; - bool mbInitShow:1; - bool mbPositioned:1; - bool mbSized:1; - bool mbPresentation:1; + int mbGraphics:1; // is Graphics used? + int mbFullScreen:1; // is Window in FullScreen? + int mbShown:1; + int mbInitShow:1; + int mbPositioned:1; + int mbSized:1; + int mbPresentation:1; sal_uLong mnStyle; unsigned int mnStyleMask; // our style mask from NSWindow creation commit ce02e6c9e978ba50e5591fedabe640e552d36d34 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Sun Oct 26 03:17:10 2014 -0400 vcl, apple_remote, toolkit: fix "OBJC_EXPORT is not defined" ( include <objc/objc-api.h> ) Change-Id: Idcbfff670fb9d83e950e7eac60000ef3e0130f95 diff --git a/apple_remote/source/AppleRemote.h b/apple_remote/source/AppleRemote.h index f80431b..a5da1b9 100644 --- a/apple_remote/source/AppleRemote.h +++ b/apple_remote/source/AppleRemote.h @@ -29,6 +29,9 @@ * *****************************************************************************/ +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #import <Cocoa/Cocoa.h> #import "HIDRemoteControlDevice.h" diff --git a/apple_remote/source/KeyspanFrontRowControl.h b/apple_remote/source/KeyspanFrontRowControl.h index c75e86b..fa527bb 100644 --- a/apple_remote/source/KeyspanFrontRowControl.h +++ b/apple_remote/source/KeyspanFrontRowControl.h @@ -29,6 +29,9 @@ * *****************************************************************************/ +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #import <Cocoa/Cocoa.h> #import "HIDRemoteControlDevice.h" diff --git a/include/apple_remote/RemoteControl.h b/include/apple_remote/RemoteControl.h index 04fab5a..589cfd9 100644 --- a/include/apple_remote/RemoteControl.h +++ b/include/apple_remote/RemoteControl.h @@ -31,6 +31,9 @@ #include <sal/config.h> +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #import <Cocoa/Cocoa.h> #include <sal/types.h> diff --git a/include/apple_remote/RemoteMainController.h b/include/apple_remote/RemoteMainController.h index c4ee0ac..158ba6d 100644 --- a/include/apple_remote/RemoteMainController.h +++ b/include/apple_remote/RemoteMainController.h @@ -31,6 +31,9 @@ #include <sal/config.h> +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #import <Cocoa/Cocoa.h> #include <sal/types.h> diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 1ee5600..7e6d93f 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -30,6 +30,9 @@ #ifdef MACOSX #include "premac.h" +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include <Cocoa/Cocoa.h> #include "postmac.h" #endif diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 43174f5..5242dce 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -61,6 +61,9 @@ #ifdef MACOSX #include "premac.h" +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include <Cocoa/Cocoa.h> #include "postmac.h" #endif diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index 06cba55..e3fd071 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -22,6 +22,9 @@ #if defined ( MACOSX ) #include "premac.h" +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include <Cocoa/Cocoa.h> #include "postmac.h" #endif diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index 46b2e72..f2cc331 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -28,6 +28,9 @@ #include <postwin.h> #elif defined ( MACOSX ) #include "premac.h" +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include <Cocoa/Cocoa.h> #include "postmac.h" #endif diff --git a/vcl/inc/OpenGLWrapper.hxx b/vcl/inc/OpenGLWrapper.hxx index 9134801..833a070 100644 --- a/vcl/inc/OpenGLWrapper.hxx +++ b/vcl/inc/OpenGLWrapper.hxx @@ -7,6 +7,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif + #include "AppKit/NSOpenGLView.h" #include "AppKit/NSOpenGL.h" diff --git a/vcl/inc/osx/a11yfactory.h b/vcl/inc/osx/a11yfactory.h index c739f3e..4e92126 100644 --- a/vcl/inc/osx/a11yfactory.h +++ b/vcl/inc/osx/a11yfactory.h @@ -20,6 +20,10 @@ #ifndef INCLUDED_VCL_INC_OSX_A11YFACTORY_H #define INCLUDED_VCL_INC_OSX_A11YFACTORY_H +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif + #include "osxvcltypes.h" #include "a11ywrapper.h" #include <com/sun/star/accessibility/XAccessibleContext.hpp> diff --git a/vcl/inc/osx/osxvcltypes.h b/vcl/inc/osx/osxvcltypes.h index f1659c4..96edccc 100644 --- a/vcl/inc/osx/osxvcltypes.h +++ b/vcl/inc/osx/osxvcltypes.h @@ -21,6 +21,9 @@ #define INCLUDED_VCL_INC_OSX_OSXVCLTYPES_H #include "premac.h" +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #import <Cocoa/Cocoa.h> #import <AppKit/NSEvent.h> #include "postmac.h" diff --git a/vcl/inc/osx/printview.h b/vcl/inc/osx/printview.h index e396bd8..b63900b 100644 --- a/vcl/inc/osx/printview.h +++ b/vcl/inc/osx/printview.h @@ -21,6 +21,9 @@ #define INCLUDED_VCL_INC_OSX_PRINTVIEW_H #include "premac.h" +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include <Cocoa/Cocoa.h> #include "postmac.h" diff --git a/vcl/inc/osx/saldata.hxx b/vcl/inc/osx/saldata.hxx index fc8d3e8..6c1650d 100644 --- a/vcl/inc/osx/saldata.hxx +++ b/vcl/inc/osx/saldata.hxx @@ -23,6 +23,9 @@ #include <config_features.h> #include "premac.h" +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include <Cocoa/Cocoa.h> #include "postmac.h" diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h index ba0eb12..e8f797e 100644 --- a/vcl/inc/osx/salinst.h +++ b/vcl/inc/osx/salinst.h @@ -27,6 +27,9 @@ #include <osl/thread.hxx> #ifdef MACOSX +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include "osx/osxvcltypes.h" #endif #include "salinst.hxx" diff --git a/vcl/inc/osx/saltimer.h b/vcl/inc/osx/saltimer.h index b751a81..e663c65 100644 --- a/vcl/inc/osx/saltimer.h +++ b/vcl/inc/osx/saltimer.h @@ -21,6 +21,9 @@ #define INCLUDED_VCL_INC_OSX_SALTIMER_H #include "premac.h" +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include <Cocoa/Cocoa.h> #include "postmac.h" diff --git a/vcl/inc/osx/vclnsapp.h b/vcl/inc/osx/vclnsapp.h index c899ffc..9a603a5 100644 --- a/vcl/inc/osx/vclnsapp.h +++ b/vcl/inc/osx/vclnsapp.h @@ -23,6 +23,9 @@ #include <config_features.h> #include "premac.h" +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include "Cocoa/Cocoa.h" #include "postmac.h" diff --git a/vcl/inc/quartz/utils.h b/vcl/inc/quartz/utils.h index 57a0402..ed7876a 100644 --- a/vcl/inc/quartz/utils.h +++ b/vcl/inc/quartz/utils.h @@ -23,6 +23,9 @@ #include <iostream> #include <premac.h> +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include <CoreFoundation/CoreFoundation.h> #include <Foundation/Foundation.h> #ifdef MACOSX diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx index 374ac54..7ff2819 100644 --- a/vcl/osx/DataFlavorMapping.cxx +++ b/vcl/osx/DataFlavorMapping.cxx @@ -35,6 +35,9 @@ #include <string.h> #include <premac.h> +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include <Cocoa/Cocoa.h> #include <postmac.h> diff --git a/vcl/osx/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx index b05d122..b3600bd 100644 --- a/vcl/osx/DataFlavorMapping.hxx +++ b/vcl/osx/DataFlavorMapping.hxx @@ -26,6 +26,9 @@ #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <premac.h> +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #import <Cocoa/Cocoa.h> #include <postmac.h> diff --git a/vcl/osx/DragActionConversion.hxx b/vcl/osx/DragActionConversion.hxx index fbb5ea3..b77047d 100644 --- a/vcl/osx/DragActionConversion.hxx +++ b/vcl/osx/DragActionConversion.hxx @@ -23,6 +23,9 @@ #include <sal/types.h> #include <premac.h> +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #import <Cocoa/Cocoa.h> #include <postmac.h> diff --git a/vcl/osx/DragSource.hxx b/vcl/osx/DragSource.hxx index 45fc71c..a51fdcf 100644 --- a/vcl/osx/DragSource.hxx +++ b/vcl/osx/DragSource.hxx @@ -33,6 +33,9 @@ #include <boost/noncopyable.hpp> #include <premac.h> +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #import <Cocoa/Cocoa.h> #include <postmac.h> diff --git a/vcl/osx/PictToBmpFlt.cxx b/vcl/osx/PictToBmpFlt.cxx index dc04348..f8d8c63 100644 --- a/vcl/osx/PictToBmpFlt.cxx +++ b/vcl/osx/PictToBmpFlt.cxx @@ -18,6 +18,9 @@ */ #include <premac.h> +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include <Carbon/Carbon.h> #include <QuickTime/QuickTime.h> #include <postmac.h> diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index d235a81..f9a8436 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -46,6 +46,9 @@ #include "salwtype.hxx" #include "premac.h" +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include <objc/objc-runtime.h> // needed for theming // FIXME: move theming code to salnativewidgets.cxx commit 24f138960afcf4d2ff61bacfbf4a792d260ed334 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Wed Oct 8 10:38:28 2014 -0400 Use GNU objc ABI/runtime instead of NeXT ABI/runtime when compiler is GCC also, + fix "cannot find interface declaration for NXConstantString" + sal/osl/unx/system.h: include <objc/objc-api.h> when OBJC_EXPORT is not defined Change-Id: I5f0df322435be8244d372642dee1c21d783306f1 diff --git a/sal/osl/unx/system.hxx b/sal/osl/unx/system.hxx index 82e3b1d..d2b05f1 100644 --- a/sal/osl/unx/system.hxx +++ b/sal/osl/unx/system.hxx @@ -215,6 +215,9 @@ #ifdef MACOSX #define __OPENTRANSPORTPROVIDERS__ // these are already defined #define TimeValue CFTimeValue // Do not conflict with TimeValue in sal/inc/osl/time.h +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include <Carbon/Carbon.h> #undef TimeValue # ifndef ETIME diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 81b6fef..5ac6328 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -59,9 +59,21 @@ gb_CXXFLAGS := \ # these are to get g++ to switch to Objective-C++ mode # (see toolkit module for a case where it is necessary to do it this way) -gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions - -gb_OBJCFLAGS := -x objective-c -fobjc-exceptions +gb_OBJCXXFLAGS := \ + -x objective-c++ \ + -fobjc-exceptions \ + $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),,\ + -fgnu-runtime \ + -fconstant-string-class=NSConstantString \ + ) + +gb_OBJCFLAGS := \ + -x objective-c \ + -fobjc-exceptions \ + $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),,\ + -fgnu-runtime \ + -fconstant-string-class=NSConstantString \ + ) # LinkTarget class commit 28d3bd5bbe96a81ed19b5ad38cb7ac6581fb21a0 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Fri Dec 26 09:48:06 2014 -0500 lingucomponent:MacOSXSpell: switch off for OS X 10.5 Change-Id: I8f8eb6717b904aa4c231466ee7a1b873bc0035c1 diff --git a/Repository.mk b/Repository.mk index 71be7d8..f6c3271 100644 --- a/Repository.mk +++ b/Repository.mk @@ -457,7 +457,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ AppleRemote \ ) \ fps_aqua \ - MacOSXSpell \ + $(if $(filter-out 1050,$(MACOSX_SDK_VERSION)),MacOSXSpell) \ ) \ )) diff --git a/lingucomponent/Module_lingucomponent.mk b/lingucomponent/Module_lingucomponent.mk index 92d582c..68dcb78 100644 --- a/lingucomponent/Module_lingucomponent.mk +++ b/lingucomponent/Module_lingucomponent.mk @@ -14,7 +14,9 @@ $(eval $(call gb_Module_add_targets,lingucomponent,\ Library_guesslang \ Library_hyphen \ Library_lnth \ - $(if $(filter MACOSX,$(OS)),Library_MacOSXSpell) \ + $(if $(filter MACOSX,$(OS)),\ + $(if $(filter-out 1050,$(MACOSX_SDK_VERSION)),Library_MacOSXSpell) \ + ) \ Library_spell \ StaticLibrary_ulingu \ )) diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index e567683..7009484 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -132,7 +132,7 @@ $(eval $(call gb_Rdb_add_components,services,\ $(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \ ) \ ) \ - lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \ + $(if $(filter-out 1050,$(MACOSX_SDK_VERSION)),lingucomponent/source/spellcheck/macosxspell/MacOSXSpell) \ fpicker/source/aqua/fps_aqua \ shell/source/backends/macbe/macbe1 \ vcl/vcl.macosx \ commit f4d659d08684b64db19f58e0056a95c6dac053c3 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Thu Dec 25 16:19:29 2014 -0500 Disable OOoSpotlightImporter extension for OS X 10.5 Change-Id: I0d9c48d511094fe3a5464f6abc811c2fb33bab4e diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index fa527f5..c7d478c 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -113,9 +113,9 @@ endif # ENABLE_NPAPI_FROM_BROWSER=TRUE ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,extensions,\ - Library_OOoSpotlightImporter \ - Package_mdibundle \ - Package_OOoSpotlightImporter \ + $(if $(filter-out 1050,$(MACOSX_SDK_VERSION)),Library_OOoSpotlightImporter) \ + $(if $(filter-out 1050,$(MACOSX_SDK_VERSION)),Package_mdibundle) \ + $(if $(filter-out 1050,$(MACOSX_SDK_VERSION)),Package_OOoSpotlightImporter) \ )) endif # OS=MACOSX diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index b0f3382..32de282 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -408,6 +408,7 @@ End #endif #ifdef MACOSX +#if MACOSX_SDK_VERSION >= 1060 File gid_File_Spotlight_Bundle TXT_FILE_BODY; Dir = FILELIST_DIR; @@ -422,6 +423,7 @@ File gid_File_Spotlight_Bundle_lib Styles = (FILELIST,USE_INTERNAL_RIGHTS); End #endif +#endif File gid_File_Images TXT_FILE_BODY; commit ff5e96eb1b618e6472a6643b522fdc960c79c11c Author: Douglas Mencken <dougmenc...@gmail.com> Date: Wed Dec 24 15:03:00 2014 -0500 avmedia: disable avmediaQuickTime for OS X 10.5 + fix `OBJC_EXPORT is not defined' and `cannot convert to NSError**' Change-Id: I4842a74feffe9707b031b81c7941eccac0211ce0 diff --git a/Repository.mk b/Repository.mk index 79400ed..71be7d8 100644 --- a/Repository.mk +++ b/Repository.mk @@ -271,7 +271,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(call gb_Helper_optional,AVMEDIA,avmedia) \ $(if $(filter MACOSX,$(OS)),\ $(if $(filter-out 1050 1060,$(MACOSX_SDK_VERSION)),avmediaMacAVF) \ - $(if $(ENABLE_MACOSX_SANDBOX),,avmediaQuickTime) \ + $(if $(filter-out 1050,$(MACOSX_SDK_VERSION)), \ + $(if $(ENABLE_MACOSX_SANDBOX),,avmediaQuickTime) \ + ) \ ) \ $(call gb_Helper_optional,SCRIPTING, \ basctl \ diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index 27b588d..f2eecc3 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -36,12 +36,14 @@ $(eval $(call gb_Module_add_targets,avmedia,\ endif ifeq ($(OS),MACOSX) +ifneq (1050,$(MACOSX_SDK_VERSION)) ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE) $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmediaQuickTime \ )) endif endif +endif ifeq ($(OS),MACOSX) ifneq (1050,$(MACOSX_SDK_VERSION)) diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm index 401c17d..0bf06d9 100644 --- a/avmedia/source/quicktime/framegrabber.mm +++ b/avmedia/source/quicktime/framegrabber.mm @@ -74,7 +74,7 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL ) // create the Movie - mpMovie = [mpMovie initWithURL:aURL error:nil]; + mpMovie = [mpMovie initWithURL:aURL error:reinterpret_cast<NSError **>(nil)]; if(mpMovie) { [mpMovie retain]; diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx index 1dedfab..637619c 100644 --- a/avmedia/source/quicktime/quicktimecommon.hxx +++ b/avmedia/source/quicktime/quicktimecommon.hxx @@ -21,6 +21,9 @@ #define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_QUICKTIMECOMMON_HXX #ifdef MACOSX +#ifndef OBJC_EXPORT +#include <objc/objc-api.h> +#endif #include <premac.h> #import <Cocoa/Cocoa.h> #import <QTKit/QTKit.h> diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index b9bea85..e567683 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -128,7 +128,9 @@ $(eval $(call gb_Rdb_add_components,services,\ $(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-out 1050,$(MACOSX_SDK_VERSION)), \ + $(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \ + ) \ ) \ lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \ fpicker/source/aqua/fps_aqua \ commit 8c82e7486ba43cdb91f89006584d520fd4d07bb3 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Thu Dec 25 11:01:26 2014 -0500 disable OpenCL (and glew) on OS X 10.5 Change-Id: I6d3fdcca15b3c5191851feea33434b9b5df7b26f diff --git a/configure.ac b/configure.ac index 1ede6d2..c507cbd 100644 --- a/configure.ac +++ b/configure.ac @@ -10334,11 +10334,15 @@ dnl ================================================= dnl Check whether to build with OpenCL support. dnl ================================================= -if test $_os != iOS -a $_os != Android; then +if test "$_os" = "Darwin" -a "$with_macosx_sdk" = "10.5"; then + HAVE_FEATURE_OPENCL= +else + if test $_os != iOS -a $_os != Android; then # OPENCL in BUILD_TYPE tells that OpenCL is potentially available on the platform (optional at run-time, # used through clew). BUILD_TYPE="$BUILD_TYPE OPENCL" AC_DEFINE(HAVE_FEATURE_OPENCL) + fi fi dnl =================================================================== commit 1551c5bc57a41ac0df88a19ad2237080b4f2f0ca Author: Douglas Mencken <dougmenc...@gmail.com> Date: Tue Nov 4 12:21:54 2014 -0500 sd/source/ui/remotecontrol: there're not only OS X >=10.8 related commit: 8bfc9a20ccea2689fec1ffe0654db1f95179bd4f Change-Id: I9862aecc02a9cfb8f4db97159f1bd4560eff1cef diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 0de7b9a..e288874 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -42,7 +42,7 @@ #ifdef MACOSX #include <osl/conditn.hxx> #include <premac.h> - #if MACOSX_SDK_VERSION == 1080 + #if MACOSX_SDK_VERSION >= 1070 #import <IOBluetooth/IOBluetooth.h> #else #import <CoreFoundation/CoreFoundation.h> commit f4b525fcd6f67d44b88fcccb41f0569c51189fc4 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Fri Dec 26 23:41:06 2014 -0500 solenv-filelists.pm: fix "can't call method `mode' on an undefined value" Change-Id: I2b69aad61b8fa674be510b8822b6f1959a1c501e diff --git a/solenv/bin/modules/installer/filelists.pm b/solenv/bin/modules/installer/filelists.pm index bf9dc2f..bc1dafd 100644 --- a/solenv/bin/modules/installer/filelists.pm +++ b/solenv/bin/modules/installer/filelists.pm @@ -88,7 +88,10 @@ sub resolve_filelist_flag if ($use_internal_rights) { my $st = stat($path); - $newfile{'UnixRights'} = sprintf("%o", $st->mode & 0777); + if ($st) + { + $newfile{'UnixRights'} = sprintf("%o", $st->mode & 0777); + } } push @newfiles, \%newfile; commit 2ba1a16c094fb0e3a227a556cb9f7bece09b06d5 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Sat Jun 13 10:51:22 2015 -0400 restore testsuite workarounds for pre-10.6 OS X Change-Id: I4edf27007a25ad52385c67c51b8a1ac83f14460d diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx index a424c98..72d7d87 100644 --- a/filter/qa/cppunit/xslt-test.cxx +++ b/filter/qa/cppunit/xslt-test.cxx @@ -46,8 +46,10 @@ public: void testXsltCopyNew(); CPPUNIT_TEST_SUITE(XsltFilterTest); +#if !( defined(MACOSX) && (MACOSX_SDK_VERSION < 1060) ) CPPUNIT_TEST(testXsltCopyOld); CPPUNIT_TEST(testXsltCopyNew); +#endif CPPUNIT_TEST_SUITE_END(); }; diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index ea430f9..5a1a7ea 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -469,8 +469,8 @@ public: } CPPUNIT_TEST_SUITE(Test_osl_executeProcess); - //TODO: Repair these (at least under Windows) -#if !defined(WNT) + //TODO: Repair these +#if !defined(WNT) && !(defined(MACOSX) && (MACOSX_SDK_VERSION < 1060)) CPPUNIT_TEST(osl_execProc_parent_equals_child_environment); CPPUNIT_TEST(osl_execProc_merged_child_environment); #endif commit 2503c37c23165ca306abf97236452c5d030206e6 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Fri Oct 31 13:40:18 2014 -0400 vlc: use OpenGL "2.1 legacy context" for OS X versions < 10.7 ``With Mac OS X 10.7 Lion OpenGL 3.2 support was added. Till then only OpenGL 2.1 was available.'' related commit: 8b384c946cb6725d691123152f5e7c6ac0692185 diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 6d8c460..dd773f93 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -778,7 +778,13 @@ SalObject* AquaSalInstance::CreateObject( SalFrame* pParent, SystemWindowData* p AquaSalObject *pObject = NULL; if ( pParent ) + { +#if defined(MACOSX) && MACOSX_SDK_VERSION < 1070 + if (pWindowData && pWindowData->bOpenGL) + pWindowData->bLegacy = true; +#endif pObject = new AquaSalObject( static_cast<AquaSalFrame*>(pParent), pWindowData ); + } return pObject; } diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx index 58e2c64..4657d52 100644 --- a/vcl/osx/salobj.cxx +++ b/vcl/osx/salobj.cxx @@ -66,6 +66,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame, SystemWindowData* pWindowDat }; pixFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:aAttributes]; } +#if defined(MACOSX) && MACOSX_SDK_VERSION >= 1070 else { NSOpenGLPixelFormatAttribute aAttributes[] = @@ -81,6 +82,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame, SystemWindowData* pWindowDat }; pixFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:aAttributes]; } +#endif maSysData.mpNSView = [[NSOpenGLView alloc] initWithFrame: aInitFrame pixelFormat:pixFormat]; } diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index 432241f..4c0b0ca 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -59,7 +59,11 @@ OpenGLContext::OpenGLContext(): m_pChildWindow(NULL), mbInitialized(false), mnRefCount(0), +#if defined(MACOSX) && MACOSX_SDK_VERSION < 1070 + mbRequestLegacyContext(true), +#else mbRequestLegacyContext(false), +#endif mbUseDoubleBufferedRendering(true), mnFramebufferCount(0), mpCurrentFramebuffer(NULL), @@ -1023,8 +1027,14 @@ bool OpenGLContext::initWindow() { if( !m_pChildWindow ) { - SystemWindowData winData = generateWinData(mpWindow, false); +#if defined(MACOSX) && MACOSX_SDK_VERSION < 1070 + SystemWindowData winData = generateWinData(mpWindow, /* bLegacy */ true); +#else + SystemWindowData winData = generateWinData(mpWindow, /* bLegacy */ false); +#endif + //m_pChildWindow = new SystemChildWindow(mpWindow, 0, &winData, false); m_pChildWindow = VclPtr<SystemChildWindow>::Create(mpWindow, 0, &winData, false); + m_xChildWindowGC.reset(m_pChildWindow); } if( m_pChildWindow ) commit fb0e55d49db3ad93dce5faf50949d2a73096a551 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Wed Dec 24 03:42:47 2014 -0500 drop -fvisibility=hidden @ gb_VISIBILITY_FLAGS on OS X 10.5 Change-Id: I4353d36f4ab4941441e384aeac0ca7a3d2c9bdd8 diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 93b35a4..06ce425 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -90,7 +90,9 @@ endif ifeq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE) gb_VISIBILITY_FLAGS := -DHAVE_GCC_VISIBILITY_FEATURE -# If CC or CXX already include -fvisibility=hidden, don't duplicate it +# avoid -fvisibility=hidden when building for OS X 10.5 +ifneq ($(MACOSX_SDK_VERSION),1050) +# don't duplicate -fvisibility=hidden if CC or CXX already include it ifeq (,$(filter -fvisibility=hidden,$(CC))) gb__visibility_hidden := -fvisibility=hidden ifeq ($(COM_GCC_IS_CLANG),TRUE) @@ -100,6 +102,8 @@ endif endif gb_VISIBILITY_FLAGS += $(gb__visibility_hidden) endif +endif + ifneq ($(HAVE_GCC_VISIBILITY_BROKEN),TRUE) gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden endif commit 7685e932c5e81230518a2c9ccb4cbb83d9f60eef Author: Douglas Mencken <dougmenc...@gmail.com> Date: Wed Dec 24 07:19:21 2014 -0500 add NS_BUILD_32_LIKE_64 definition to build line flags (gb_OSDEFS) For example, it makes NSRect to be the same as CGRect. (see NSGeometry.h) Change-Id: I182703b3ab5e0791c0a092f51a0151d1dfa8fe6a diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 2ca243a..81b6fef 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -35,6 +35,7 @@ gb_OSDEFS := \ -D_REENTRANT \ -DNO_PTHREAD_PRIORITY \ -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) \ + -DNS_BUILD_32_LIKE_64 \ $(EXTRA_CDEFS) \ commit b3456ea9358d6eaaa4d0fa1fcbd754dbb54f6958 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Sat Oct 25 11:05:30 2014 -0400 Don't assume that /usr/bin/mktemp is always a BSD mktemp on OSX, add backup for GNU mktemp Change-Id: Ifb119dd13062593cba5aa3cb1dacc54194339544 diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index a2941cd..2ca243a 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -24,8 +24,8 @@ gb_SDKDIR := $(MACOSX_SDK_PATH) include $(GBUILDDIR)/platform/com_GCC_defs.mk -# Darwin mktemp -t expects a prefix, not a pattern -gb_MKTEMP ?= /usr/bin/mktemp -t gbuild. +# Note that BSD mktemp -t expects a prefix, not a pattern; if it fails, assume GNU syntax +gb_MKTEMP ?= /usr/bin/mktemp -t gbuild. 2>/dev/null || mktemp -t gbuild.XXXXXX gb_OSDEFS := \ -D$(OS) \ commit 203e1bf2c37a4a481827614778f6791acdf47e31 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Sat Dec 27 06:25:11 2014 -0500 macosx_x86_64 is not "the only architecture" for OS X use ::globals::os eq 'MACOSX' check in solenv/bin/modules/installer add PLATFORM_MACOSX_POWERPC to isValidPlatform @ dp_platform.cxx Change-Id: Iced611e001ce69860d001b10c84d12a568b40a59 diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index dd8648e..e56bf2e 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -59,6 +59,7 @@ #define PLATFORM_FREEBSD_X86_64 "freebsd_x86_64" #define PLATFORM_NETBSD_X86 "netbsd_x86" #define PLATFORM_NETBSD_X86_64 "netbsd_x86_64" +#define PLATFORM_MACOSX_POWERPC "macosx_powerpc" #define PLATFORM_MACOSX_X86 "macosx_x86" #define PLATFORM_MACOSX_X86_64 "macosx_x86_64" #define PLATFORM_OPENBSD_X86 "openbsd_x86" @@ -175,6 +176,8 @@ namespace ret = checkOSandCPU("NetBSD", "x86"); else if (token == PLATFORM_NETBSD_X86_64) ret = checkOSandCPU("NetBSD", "X86_64"); + else if (token == PLATFORM_MACOSX_POWERPC) + ret = checkOSandCPU("MacOSX", "PowerPC"); else if (token == PLATFORM_MACOSX_X86) ret = checkOSandCPU("MacOSX", "x86"); else if (token == PLATFORM_MACOSX_X86_64) diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index d62680d..b8a5b4e 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -576,7 +576,7 @@ sub resolve_variables_in_downloadname elsif ( $installer::globals::issolarissparcbuild ) { $os = "solsparc"; } elsif ( $installer::globals::issolarisx86build ) { $os = "solia"; } elsif ( $installer::globals::islinuxbuild ) { $os = "linux"; } - elsif ( $installer::globals::platformid eq 'macosx_x86_64' ) { $os = "macosxx"; } + elsif ( $installer::globals::os eq 'MACOSX' ) { $os = "macosx"; } else { $os = ""; } $downloadname =~ s/\{os\}/$os/; diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index bb98b7c..9029ed5 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -273,7 +273,7 @@ sub setglobalvariables } } - if ( $installer::globals::platformid eq 'macosx_x86_64') + if ( $installer::globals::os eq 'MACOSX') { $installer::globals::ismacbuild = 1; diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index ac33798..084c523 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -670,7 +670,7 @@ sub create_simple_package my $extensionfolder = get_extensions_dir($subfolderdir); installer::systemactions::remove_empty_dirs_in_folder($extensionfolder); - if ( $installer::globals::platformid eq 'macosx_x86_64' ) + if ( $installer::globals::os eq 'MACOSX' ) { installer::worker::put_scpactions_into_installset("$installdir/$packagename"); } commit 51eec391114c31cd0b52630584b47fd92f2b4115 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Sun Nov 2 12:39:47 2014 -0500 provide universal implementation for aligned memory allocation use posix_memalign only if it's available; if not, try memalign first don't blindly guess their availability by platform (with an exception for Android) introduce HAVE_MEMALIGN and HAVE_POSIX_MEMALIGN Note that posix_memalign is not available everywhere (as are its replacements like memalign). For example, Darwin/OSX < 10.6 has neither posix_memalign or memalign. Change-Id: I0cb3b14e1f2d94d4aa02b40c36d353c2b7a78dba diff --git a/config_host.mk.in b/config_host.mk.in index 59d7271..0e6018a 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -263,6 +263,8 @@ export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@ export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@ export HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=@HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION@ export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@ +export HAVE_POSIX_MEMALIGN=@HAVE_POSIX_MEMALIGN@ +export HAVE_MEMALIGN=@HAVE_MEMALIGN@ export HAVE_THREADSAFE_STATICS=@HAVE_THREADSAFE_STATICS@ export HELP_COMMON_ONLY=@HELP_COMMON_ONLY@ export HOST_PLATFORM=@host@ diff --git a/configure.ac b/configure.ac index 3a3f35b..1ede6d2 100644 --- a/configure.ac +++ b/configure.ac @@ -4605,6 +4605,14 @@ AC_SUBST(SDKDIRNAME_FOR_BUILD) AC_SUBST(WORKDIR_FOR_BUILD) dnl =================================================================== +dnl Check for availability of posix_memalign and memalign +dnl =================================================================== +AC_CHECK_FUNC([posix_memalign], [HAVE_POSIX_MEMALIGN=YES], [HAVE_POSIX_MEMALIGN=NO]) +AC_CHECK_FUNC([memalign], [HAVE_MEMALIGN=YES], [HAVE_MEMALIGN=NO]) +AC_SUBST(HAVE_POSIX_MEMALIGN) +AC_SUBST(HAVE_MEMALIGN) + +dnl =================================================================== dnl Check for syslog header dnl =================================================================== AC_CHECK_HEADER(syslog.h, AC_DEFINE(HAVE_SYSLOG_H)) diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 79a0e2a..14b72ae 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -19,6 +19,13 @@ $(eval $(call gb_Library_set_include,sal,\ -I$(SRCDIR)/sal/inc \ )) +ifeq ($(HAVE_POSIX_MEMALIGN),YES) +$(eval $(call gb_Library_add_defs,sal,-DHAVE_POSIX_MEMALIGN)) +endif +ifeq ($(HAVE_MEMALIGN),YES) +$(eval $(call gb_Library_add_defs,sal,-DHAVE_MEMALIGN)) +endif + $(eval $(call gb_Library_add_defs,sal,\ $(if $(filter $(ALLOC),SYS_ALLOC TCMALLOC JEMALLOC)$(filter-out X$(ENABLE_RUNTIME_OPTIMIZATIONS),XTRUE), \ -DFORCE_SYSALLOC \ diff --git a/sal/osl/unx/memory.cxx b/sal/osl/unx/memory.cxx index e9fb9a8..4d60581 100644 --- a/sal/osl/unx/memory.cxx +++ b/sal/osl/unx/memory.cxx @@ -10,8 +10,12 @@ #include <internal/oslmemory.h> #include <stdlib.h> + #ifdef __ANDROID__ #include <malloc.h> +#ifndef HAVE_MEMALIGN +#define HAVE_MEMALIGN 1 /* for Android, we are really sure about memalign */ +#endif #endif void* osl_aligned_alloc( sal_Size align, sal_Size size ) @@ -22,19 +26,30 @@ void* osl_aligned_alloc( sal_Size align, sal_Size size ) } else { -#if defined __ANDROID__ - return memalign(align, size); -#else +#if defined(HAVE_POSIX_MEMALIGN) void* ptr; int err = posix_memalign(&ptr, align, size); return err ? NULL : ptr; +#elif defined(HAVE_MEMALIGN) + return memalign(align, size); +#else + void* ptr = malloc(size + (align - 1) + sizeof(void*)); + if (!ptr) return NULL; + char* aptr = ((char*)ptr) + sizeof(void*); + aptr += (align - ((size_t)aptr & (align - 1))) & (align - 1); + ((void**)aptr)[-1] = ptr; + return aptr; #endif } } void osl_aligned_free( void* p ) { +#if defined(HAVE_POSIX_MEMALIGN) || defined(HAVE_MEMALIGN) free(p); +#else + free(((void**)p)[-1]); +#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 16ebfdcfb7c597e9ad75b8bf5a7cacc0881a135e Author: Douglas Mencken <dougmenc...@gmail.com> Date: Wed Aug 26 19:30:04 2015 -0400 vcl: restore other bits of pre-10.8 conditional code related commits: 4fa8282816cb39692678e9da6b6693e821a3039b ec147012340219c8bb5eaf8fe3d41be7836bc261 16996c6b91b53e3c7d316296833bdb8a9cb60c22 Change-Id: Ie8962f8d26f163eed91fdf6b137b0d9830183dd2 diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index 64424c2..d235a81 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -1248,7 +1248,12 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings ) getAppleScrollBarVariant(aStyleSettings); // set scrollbar size +#if MACOSX_SDK_VERSION >= 1070 aStyleSettings.SetScrollBarSize( static_cast<long int>([NSScroller scrollerWidthForControlSize:NSRegularControlSize scrollerStyle:NSScrollerStyleLegacy]) ); +#else + aStyleSettings.SetScrollBarSize( static_cast<long int>([NSScroller scrollerWidth]) ); +#endif + // images in menus false for MacOSX aStyleSettings.SetPreferredUseImagesInMenus( false ); aStyleSettings.SetHideDisabledMenuItems( true ); diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx index f2c3c9f..2bdc20c 100644 --- a/vcl/osx/salmenu.cxx +++ b/vcl/osx/salmenu.cxx @@ -884,7 +884,12 @@ Rectangle AquaSalMenu::GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame if( ! pNSWin ) return Rectangle(); +#if MACOSX_SDK_VERSION >= 1070 NSRect aRect = [pNSWin convertRectToScreen:[pNSWin frame]]; +#else + NSRect aRect = [pNSWin frame]; + aRect.origin = [pNSWin convertBaseToScreen: NSMakePoint( 0, 0 )]; +#endif // make coordinates relative to reference frame static_cast<AquaSalFrame*>(i_pReferenceFrame)->CocoaToVCL( aRect.origin ); diff --git a/vcl/quartz/CTRunData.hxx b/vcl/quartz/CTRunData.hxx index 3201acf..0bbd762 100644 --- a/vcl/quartz/CTRunData.hxx +++ b/vcl/quartz/CTRunData.hxx @@ -10,8 +10,20 @@ #define CTRunData_Included #include "premac.h" +#if defined(MACOSX) && MACOSX_SDK_VERSION < 1080 +#include <ApplicationServices/ApplicationServices.h> +#if MACOSX_SDK_VERSION < 1060 +// The following symbols are SPI (System Programming Interface) in 10.5 +extern "C" { + void CTRunGetAdvances(CTRunRef run, CFRange range, CGSize buffer[]); + const CGSize* CTRunGetAdvancesPtr(CTRunRef run); + extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel; +} +#endif +#else #include <CoreGraphics/CoreGraphics.h> #include <CoreText/CoreText.h> +#endif #include "postmac.h" class CTRunData diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index b3c7e12..1978c91 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -254,7 +254,11 @@ int CoreTextFontData::GetFontTable( const char pTagName[5], unsigned char* pResu // get the raw table length CTFontDescriptorRef pFontDesc = reinterpret_cast<CTFontDescriptorRef>( GetFontId()); CTFontRef rCTFont = CTFontCreateWithFontDescriptor( pFontDesc, 0.0, NULL); +#if defined(MACOSX) && MACOSX_SDK_VERSION < 1080 + const uint32_t opts( kCTFontTableOptionExcludeSynthetic ); +#else const uint32_t opts( kCTFontTableOptionNoOptions ); +#endif CFDataRef pDataRef = CTFontCopyTable( rCTFont, nTagCode, opts); CFRelease( rCTFont); if( !pDataRef) commit 7f3d86d088f44c93304566d175a081b7d3db0348 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Sat Oct 25 03:58:37 2014 -0400 resurrect conditional code for OSX SDKs < 10.8 from "mass purge" plus, use MACOSX_SDK_VERSION instead of "legacy" MAC_OS_X_VERSION_MAX_ALLOWED/MIN_REQUIRED commitsi reverted: b02e958fa0bf7d062a5b8aff03d22325e3068feb fe25090e992eefd0c43ca73b656632a650793b1a note: sal/osl/unx/memory.c posix_memalign issue will be addressed in another commit Modified: 23 files (19 from b02e958f + 6 from fe25090e - 1 common - 1 unx/memory.c) Change-Id: Ib6e63e664dc073a8d751306f613e8be4918c406a diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index e31f5d6..f5e1e4c 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -42,9 +42,10 @@ $(call gb_ExternalProject_get_state_target,curl,build): CPPFLAGS="$(curl_CPPFLAGS)" \ LDFLAGS=$(curl_LDFLAGS) \ ./configure \ - $(if $(filter IOS MACOSX,$(OS)),\ - --with-darwinssl,\ - --with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \ + $(if $(filter IOS MACOSX,$(OS)),,--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \ + $(if $(filter IOS,$(OS)),--with-darwinssl) \ + $(if $(filter MACOSX,$(OS)),\ + $(if $(filter 1050,$(MACOSX_SDK_VERSION)),,--with-darwinssl)) \ --without-ssl --without-gnutls --without-polarssl --without-cyassl --without-axtls \ --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \ --disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \ diff --git a/external/nss/ExternalPackage_nss.mk b/external/nss/ExternalPackage_nss.mk index c6d8953fd..986565e 100644 --- a/external/nss/ExternalPackage_nss.mk +++ b/external/nss/ExternalPackage_nss.mk @@ -26,6 +26,7 @@ $(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\ dist/out/lib/libsmime3.dylib \ dist/out/lib/libsoftokn3.dylib \ dist/out/lib/libssl3.dylib \ + $(if $(filter 1050,$(MACOSX_SDK_VERSION)),dist/out/lib/libsqlite3.dylib) \ )) else ifeq ($(OS),WNT) $(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\ diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 17ea6f1..0706a39 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -65,7 +65,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject $(if $(filter arm64,$(CC)),USE_64=1)) \ $(if $(filter MACOSX,$(OS)),\ $(if $(filter-out POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \ - NSS_USE_SYSTEM_SQLITE=1) \ + $(if $(filter-out 1050,$(MACOSX_SDK_VERSION)),NSS_USE_SYSTEM_SQLITE=1)) \ $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ $(if $(CROSS_COMPILING),\ $(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \ diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 29179d5..de6633e 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -69,8 +69,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) : $(if $(filter WNT-GCC,$(OS)-$(COM)),--with-threads ac_cv_printf_zd_format=no) \ $(if $(filter MACOSX,$(OS)), \ $(if $(filter INTEL,$(CPUNAME)),--enable-universalsdk=$(MACOSX_SDK_PATH) \ - --with-universal-archs=intel \ - ) \ + $(if $(filter 1050,$(MACOSX_SDK_VERSION)),--with-universal-archs=32-bit,--with-universal-archs=intel) \ + ) \ --enable-framework=/@__________________________________________________OOO --with-framework-name=LibreOfficePython, \ --enable-shared \ ) \ diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm index fecea53f..3e87834 100644 --- a/fpicker/source/aqua/FilterHelper.mm +++ b/fpicker/source/aqua/FilterHelper.mm @@ -392,7 +392,11 @@ bool FilterHelper::filenameMatchesFilter(NSString* sFilename) } NSFileManager *manager = [NSFileManager defaultManager]; +#if MACOSX_SDK_VERSION < 1060 + NSDictionary* pAttribs = [manager fileAttributesAtPath: sFilename traverseLink: NO]; +#else NSDictionary* pAttribs = [manager attributesOfItemAtPath: sFilename error: nil]; +#endif if( pAttribs ) { NSObject* pType = [pAttribs objectForKey: NSFileType]; diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm b/fpicker/source/aqua/NSURL_OOoAdditions.mm index 1fc59af..83dc0a3 100644 --- a/fpicker/source/aqua/NSURL_OOoAdditions.mm +++ b/fpicker/source/aqua/NSURL_OOoAdditions.mm @@ -83,6 +83,25 @@ NSString* resolveAlias( NSString* i_pSystemPath ) kCFURLPOSIXPathStyle, false); if( rUrl != NULL ) { +#if MACOSX_SDK_VERSION < 1060 + FSRef rFS; + if( CFURLGetFSRef( rUrl, &rFS ) ) + { + Boolean bIsFolder = false; + Boolean bAlias = false; + OSErr err = FSResolveAliasFile( &rFS, true, &bIsFolder, &bAlias); + if( (err == noErr) && bAlias ) + { + CFURLRef rResolvedUrl = CFURLCreateFromFSRef( kCFAllocatorDefault, &rFS ); + if( rResolvedUrl != NULL ) + { + pResolvedPath = (NSString*)CFURLCopyFileSystemPath( rResolvedUrl, kCFURLPOSIXPathStyle ); + CFRelease( rResolvedUrl ); + } + } + } + CFRelease( rUrl ); +#else CFErrorRef rError; CFDataRef rBookmark = CFURLCreateBookmarkDataFromFile( NULL, rUrl, &rError ); CFRelease( rUrl ); @@ -102,6 +121,7 @@ NSString* resolveAlias( NSString* i_pSystemPath ) CFRelease( rResolvedUrl ); } } +#endif } return pResolvedPath; diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index 4313818..209a943 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -307,7 +307,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() throw( uno:: SolarMutexGuard aGuard; -#if HAVE_FEATURE_MACOSX_SANDBOX +#if MACOSX_SDK_VERSION >= 1070 && HAVE_FEATURE_MACOSX_SANDBOX static NSUserDefaults *userDefaults; static bool triedUserDefaults = false; @@ -346,7 +346,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() throw( uno:: { NSURL *url = [files objectAtIndex:nIndex]; -#if HAVE_FEATURE_MACOSX_SANDBOX +#if MACOSX_SDK_VERSION >= 1070 && HAVE_FEATURE_MACOSX_SANDBOX if (userDefaults != NULL && [url respondsToSelector:@selector(bookmarkDataWithOptions:includingResourceValuesForKeys:relativeToURL:error:)]) { @@ -761,7 +761,11 @@ void SalAquaFilePicker::updateSaveFileNameExtension() { rtl::OUString suffix = (*(aStringList.begin())).copy(1); NSString *requiredFileType = [NSString stringWithOUString:suffix]; +#if MACOSX_SDK_VERSION < 1060 + [m_pDialog setRequiredFileType:requiredFileType]; +#else [m_pDialog setAllowedFileTypes:[NSArray arrayWithObjects:requiredFileType, nil]]; +#endif OSL_TRACE("disallowing other file types"); [m_pDialog setAllowsOtherFileTypes:NO]; diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm index e45a37e..3e4e288 100644 --- a/fpicker/source/aqua/SalAquaPicker.mm +++ b/fpicker/source/aqua/SalAquaPicker.mm @@ -164,6 +164,19 @@ int SalAquaPicker::run() int retVal = 0; +#if MACOSX_SDK_VERSION < 1060 + NSString *startDirectory; + if (m_sDisplayDirectory.getLength() > 0) { + NSString *temp = [NSString stringWithOUString:m_sDisplayDirectory]; + NSURL *url = [NSURL URLWithString:temp]; + startDirectory = [url path]; + + OSL_TRACE("start dir: %s", [startDirectory UTF8String]); + } + else { + startDirectory = NSHomeDirectory(); + } +#else NSURL *startDirectory; if (m_sDisplayDirectory.getLength() > 0) { NSString *temp = [NSString stringWithOUString:m_sDisplayDirectory]; @@ -174,17 +187,26 @@ int SalAquaPicker::run() else { startDirectory = [NSURL fileURLWithPath:NSHomeDirectory() isDirectory:YES]; } +#endif switch(m_nDialogType) { case NAVIGATIONSERVICES_DIRECTORY: case NAVIGATIONSERVICES_OPEN: +#if MACOSX_SDK_VERSION < 1060 + retVal = [(NSOpenPanel*)m_pDialog runModalForDirectory:startDirectory file:nil types:nil]; +#else [m_pDialog setDirectoryURL:startDirectory]; retVal = [(NSOpenPanel*)m_pDialog runModal]; +#endif break; case NAVIGATIONSERVICES_SAVE: +#if MACOSX_SDK_VERSION < 1060 + retVal = [m_pDialog runModalForDirectory:startDirectory file:[NSString stringWithOUString:((SalAquaFilePicker*)this)->getSaveFileName()]]; +#else [m_pDialog setDirectoryURL:startDirectory]; [m_pDialog setNameFieldStringValue:[NSString stringWithOUString:static_cast<SalAquaFilePicker*>(this)->getSaveFileName()]]; retVal = [m_pDialog runModal]; +#endif break; // [m_pDialog beginSheetForDirectory:startDirectory file:[m_pDialog saveFilename] modalForWindow:[NSApp keyWindow] modalDelegate:((SalAquaFilePicker*)this)->getDelegate() didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:nil]; default: @@ -192,10 +214,17 @@ int SalAquaPicker::run() } if (retVal == NSFileHandlingPanelOKButton) { +#if MACOSX_SDK_VERSION < 1060 + NSString* pDir = [m_pDialog directory]; + if (pDir) { + implsetDisplayDirectory([[NSURL fileURLWithPath:pDir] OUStringForInfo:FULLPATH]); + } +#else NSURL* pDir = [m_pDialog directoryURL]; if (pDir) { implsetDisplayDirectory([pDir OUStringForInfo:FULLPATH]); } +#endif } DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal); diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm index 20e9e52..6459b7e 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm @@ -350,7 +350,11 @@ Reference< XSpellAlternatives > aLang = [aLang stringByAppendingString:aTaggedCountry]; } [macSpell setLanguage:aLang]; +#if MACOSX_SDK_VERSION < 1060 + NSArray *guesses = [macSpell guessesForWord:aNSStr]; +#else NSArray *guesses = [macSpell guessesForWordRange:NSMakeRange(0, [aNSStr length]) inString:aNSStr language:aLang inSpellDocumentWithTag:0]; +#endif count = [guesses count]; if (count) { diff --git a/sal/osl/unx/system.cxx b/sal/osl/unx/system.cxx index 847a575..bb9bea0 100644 --- a/sal/osl/unx/system.cxx +++ b/sal/osl/unx/system.cxx @@ -157,10 +157,17 @@ int macxp_resolveAlias(char *path, int buflen) (void) buflen; return 0; #else +#if MACOSX_SDK_VERSION < 1060 + FSRef aFSRef; + OSStatus nErr; + Boolean bFolder; + Boolean bAliased; +#else CFStringRef cfpath; CFURLRef cfurl; CFErrorRef cferror; CFDataRef cfbookmark; +#endif char *unprocessedPath = path; @@ -174,6 +181,49 @@ int macxp_resolveAlias(char *path, int buflen) if ( unprocessedPath ) *unprocessedPath = '\0'; +#if MACOSX_SDK_VERSION < 1060 + nErr = noErr; + bFolder = FALSE; + bAliased = FALSE; + + if ( FSPathMakeRef( (const UInt8 *)path, &aFSRef, 0 ) == noErr ) + { + nErr = FSResolveAliasFileWithMountFlags( &aFSRef, TRUE, &bFolder, &bAliased, kResolveAliasFileNoUI ); + if ( nErr == nsvErr ) + { + errno = ENOENT; + nRet = -1; + } + else if ( nErr == noErr && bAliased ) + { + char tmpPath[ PATH_MAX ]; + if ( FSRefMakePath( &aFSRef, (UInt8 *)tmpPath, PATH_MAX ) == noErr ) + { + int nLen = strlen( tmpPath ) + ( unprocessedPath ? strlen( unprocessedPath + 1 ) + 1 : 0 ); + if ( nLen < buflen && nLen < PATH_MAX ) + { + if ( unprocessedPath ) + { + int nTmpPathLen = strlen( tmpPath ); + strcat( tmpPath, "/" ); + strcat( tmpPath, unprocessedPath + 1 ); + strcpy( path, tmpPath); + unprocessedPath = path + nTmpPathLen; + } + else if ( !unprocessedPath ) + { + strcpy( path, tmpPath); + } + } + else + { + errno = ENAMETOOLONG; + nRet = -1; + } + } + } + } +#else cfpath = CFStringCreateWithCString( NULL, path, kCFStringEncodingUTF8 ); cfurl = CFURLCreateWithFileSystemPath( NULL, cfpath, kCFURLPOSIXPathStyle, false ); CFRelease( cfpath ); @@ -233,6 +283,7 @@ int macxp_resolveAlias(char *path, int buflen) } } } +#endif if ( unprocessedPath ) *unprocessedPath++ = '/'; diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx index 5a2a326..b5b9165 100644 --- a/sal/osl/unx/uunxapi.cxx +++ b/sal/osl/unx/uunxapi.cxx @@ -35,7 +35,7 @@ inline rtl::OString OUStringToOString(const rtl_uString* s) osl_getThreadTextEncoding()); } -#if HAVE_FEATURE_MACOSX_SANDBOX +#if defined(MACOSX) && MACOSX_SDK_VERSION >= 1070 && HAVE_FEATURE_MACOSX_SANDBOX #include <Foundation/Foundation.h> #include <Security/Security.h> @@ -289,7 +289,7 @@ int open_c(const char *cpPath, int oflag, int mode) int result = open(cpPath, oflag, mode); -#if HAVE_FEATURE_MACOSX_SANDBOX +#if defined(MACOSX) && MACOSX_SDK_VERSION >= 1070 && HAVE_FEATURE_MACOSX_SANDBOX if (isSandboxed && result != -1 && (oflag & O_CREAT) && (oflag & O_EXCL)) { // A new file was created. Check if it is outside the sandbox. diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index 69ff3a1..a1116d2 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -93,7 +93,11 @@ public: InputContextFlags mnICOptions; // To prevent display sleep during presentation +#if MACOSX_SDK_VERSION < 1060 + boost::shared_ptr< Timer > mpActivityTimer; +#else IOPMAssertionID mnAssertionID; +#endif public: /** Constructor diff --git a/vcl/inc/osx/salframeview.h b/vcl/inc/osx/salframeview.h index 93f8b8f..d125743 100644 --- a/vcl/inc/osx/salframeview.h +++ b/vcl/inc/osx/salframeview.h @@ -22,7 +22,11 @@ #include "osx/a11ywrapper.h" +#if MACOSX_SDK_VERSION < 1060 +@interface SalFrameWindow : NSWindow +#else @interface SalFrameWindow : NSWindow<NSWindowDelegate> +#endif { AquaSalFrame* mpFrame; id mDraggingDestinationHandler; @@ -59,7 +63,11 @@ -(void)unregisterDraggingDestinationHandler:(id)theHandler; @end +#if MACOSX_SDK_VERSION < 1060 +@interface SalFrameView : AquaA11yWrapper <NSTextInput> +#else @interface SalFrameView : AquaA11yWrapper <NSTextInputClient> +#endif { AquaSalFrame* mpFrame; @@ -113,7 +121,11 @@ /* text action methods */ +#if MACOSX_SDK_VERSION < 1060 +-(void)insertText:(id)aString; +#else -(void)insertText:(id)aString replacementRange:(NSRange)replacementRange; +#endif -(void)insertTab: (id)aSender; -(void)insertBacktab: (id)aSender; -(void)moveLeft: (id)aSender; diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 72cd424..aaeef64 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -29,6 +29,15 @@ #include <ApplicationServices/ApplicationServices.h> #include "osx/osxvcltypes.h" #include "osx/salframe.h" + +#if MACOSX_SDK_VERSION < 1060 +// The following symbols are SPI (System Programming Interface) in 10.5. +extern "C" { + void CTRunGetAdvances(CTRunRef run, CFRange range, CGSize buffer[]); + const CGSize* CTRunGetAdvancesPtr(CTRunRef run); + extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel; +} +#endif #else #include <CoreGraphics/CoreGraphics.h> #include <CoreText/CoreText.h> diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx index 79b1fc4..0de6a65 100644 --- a/vcl/osx/DropTarget.cxx +++ b/vcl/osx/DropTarget.cxx @@ -271,9 +271,17 @@ NSDragOperation DropTarget::draggingUpdated(id sender) } if (dragOp == NSDragOperationNone) +#if MACOSX_SDK_VERSION < 1060 + SetThemeCursor(kThemeNotAllowedCursor); +#else [[NSCursor operationNotAllowedCursor] set]; +#endif else if (dragOp == NSDragOperationCopy) +#if MACOSX_SDK_VERSION < 1060 + SetThemeCursor(kThemeCopyArrowCursor); +#else [[NSCursor dragCopyCursor] set]; +#endif else [[NSCursor arrowCursor] set]; diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index 3882c40..64424c2 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -38,6 +38,11 @@ #include "osx/a11yfactory.h" #include "quartz/utils.h" +#if MACOSX_SDK_VERSION < 1060 +#include "vcl/timer.hxx" +#include "osx/saltimer.h" +#endif + #include "salwtype.hxx" #include "premac.h" @@ -194,7 +199,11 @@ void AquaSalFrame::initWindowAndView() [mpNSWindow setAcceptsMouseMovedEvents: YES]; [mpNSWindow setHasShadow: YES]; +#if MACOSX_SDK_VERSION < 1060 + objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow); +#else [mpNSWindow setDelegate: static_cast<id<NSWindowDelegate> >(mpNSWindow)]; +#endif if( [mpNSWindow respondsToSelector: @selector(setRestorable:)]) { @@ -751,6 +760,27 @@ void AquaSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) SendPaintEvent(); } +#if MACOSX_SDK_VERSION < 1060 +class PreventSleepTimer : public AutoTimer +{ +public: + PreventSleepTimer() + { + SetTimeout( 30000 ); + Start(); + } + + virtual ~PreventSleepTimer() + { + } + + virtual void Timeout() SAL_OVERRIDE + { + UpdateSystemActivity(OverallAct); + } +}; +#endif + void AquaSalFrame::StartPresentation( bool bStart ) { if ( !mpNSWindow ) @@ -762,10 +792,14 @@ void AquaSalFrame::StartPresentation( bool bStart ) if( bStart ) { GetSalData()->maPresentationFrames.push_back( this ); +#if MACOSX_SDK_VERSION < 1060 + mpActivityTimer.reset( new PreventSleepTimer() ); +#else IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, CFSTR("LibreOffice presentation running"), &mnAssertionID); +#endif [mpNSWindow setLevel: NSPopUpMenuWindowLevel]; if( mbShown ) [mpNSWindow makeMainWindow]; @@ -773,7 +807,11 @@ void AquaSalFrame::StartPresentation( bool bStart ) else { GetSalData()->maPresentationFrames.remove( this ); +#if MACOSX_SDK_VERSION < 1060 + mpActivityTimer.reset(); +#else IOPMAssertionRelease(mnAssertionID); +#endif [mpNSWindow setLevel: NSNormalWindowLevel]; } } diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index 062acec..35ea1e2 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -36,6 +36,14 @@ #define WHEEL_EVENT_FACTOR 1.5 +// for fullscreen support on OS X < 10.7 +#if MACOSX_SDK_VERSION < 1070 + #define NSWindowCollectionBehaviorFullScreenPrimary (1 << 7) + #define NSWindowCollectionBehaviorFullScreenAuxiliary (1 << 8) +// #define NSFullScreenWindowMask (1 << 14) +#endif + + static sal_uInt16 ImplGetModifierMask( unsigned int nMask ) { sal_uInt16 nRet = 0; @@ -160,6 +168,18 @@ static const struct ExceptionalKey static AquaSalFrame* getMouseContainerFrame() { AquaSalFrame* pDispatchFrame = NULL; +#if MACOSX_SDK_VERSION < 1060 + NSInteger nWindows = 0; + NSCountWindows( &nWindows ); + NSInteger* pWindows = (NSInteger*)alloca( nWindows * sizeof(NSInteger) ); + NSWindowList( nWindows, pWindows ); // NSWindowList is supposed to be in z-order front to back + for(int i = 0; i < nWindows && ! pDispatchFrame; i++ ) + { + NSWindow* pWin = [NSApp windowWithWindowNumber: pWindows[i]]; + if( pWin && [pWin isMemberOfClass: [SalFrameWindow class]] && [(SalFrameWindow*)pWin containsMouse] ) + pDispatchFrame = [(SalFrameWindow*)pWin getSalFrame]; + } +#else NSArray* aWindows = [NSWindow windowNumbersWithOptions:0]; for(NSUInteger i = 0; i < [aWindows count] && ! pDispatchFrame; i++ ) { @@ -167,6 +187,7 @@ static AquaSalFrame* getMouseContainerFrame() if( pWin && [pWin isMemberOfClass: [SalFrameWindow class]] && [(SalFrameWindow*)pWin containsMouse] ) pDispatchFrame = [(SalFrameWindow*)pWin getSalFrame]; } +#endif return pDispatchFrame; } @@ -757,11 +778,19 @@ private: if( bNewSeries ) mfMagnifyDeltaSum = 0.0; +#if MACOSX_SDK_VERSION < 1060 + mfMagnifyDeltaSum += [pEvent deltaZ]; +#else mfMagnifyDeltaSum += [pEvent magnification]; +#endif mfLastMagnifyTime = [pEvent timestamp]; // TODO: change to 0.1 when CommandWheelMode::ZOOM handlers allow finer zooming control +#if MACOSX_SDK_VERSION < 1060 + static const float fMagnifyFactor = 0.25; +#else static const float fMagnifyFactor = 0.25*500; // steps are 500 times smaller for -magnification +#endif static const float fMinMagnifyStep = 15.0 / fMagnifyFactor; if( fabs(mfMagnifyDeltaSum) <= fMinMagnifyStep ) return; @@ -1014,9 +1043,15 @@ private: } } +#if MACOSX_SDK_VERSION < 1060 +-(void)insertText:(id)aString +#else -(void)insertText:(id)aString replacementRange:(NSRange)replacementRange +#endif { +#if MACOSX_SDK_VERSION >= 1060 (void) replacementRange; // FIXME: surely it must be used +#endif SolarMutexGuard aGuard; @@ -1586,9 +1621,15 @@ private: return mSelectedRange; } +#if MACOSX_SDK_VERSION < 1060 +- (void)setMarkedText:(id)aString selectedRange:(NSRange)selRange +#else - (void)setMarkedText:(id)aString selectedRange:(NSRange)selRange replacementRange:(NSRange)replacementRange +#endif { +#if MACOSX_SDK_VERSION >= 1060 (void) replacementRange; // FIXME - use it! +#endif SolarMutexGuard aGuard; @@ -1658,10 +1699,16 @@ private: mSelectedRange = mMarkedRange = NSMakeRange(NSNotFound, 0); } +#if MACOSX_SDK_VERSION < 1060 +- (NSAttributedString *)attributedSubstringFromRange:(NSRange)aRange +#else - (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange +#endif { (void) aRange; +#if MACOSX_SDK_VERSION >= 1060 (void) actualRange; +#endif // FIXME - Implement return nil; @@ -1705,11 +1752,17 @@ private: mpLastEvent = nil; } +#if MACOSX_SDK_VERSION < 1060 +- (NSRect)firstRectForCharacterRange:(NSRange)aRange +#else - (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange +#endif { // FIXME - These should probably be used? (void) aRange; +#if MACOSX_SDK_VERSION >= 1060 (void) actualRange; +#endif SolarMutexGuard aGuard; diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index b92c6ba..6d8c460 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -1062,7 +1062,12 @@ NSImage* CreateNSImage( const Image& rImage ) NSImage* pImage = [[NSImage alloc] initWithSize: NSMakeSize( aSize.Width(), aSize.Height() )]; if( pImage ) { +#if MACOSX_SDK_VERSION < 1060 + [pImage setFlipped:YES]; + [pImage lockFocus]; +#else [pImage lockFocusFlipped:YES]; +#endif NSGraphicsContext* pContext = [NSGraphicsContext currentContext]; CGContextRef rCGContext = static_cast<CGContextRef>([pContext graphicsPort]); diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx index b0144a8..f2c3c9f 100644 --- a/vcl/osx/salmenu.cxx +++ b/vcl/osx/salmenu.cxx @@ -264,7 +264,11 @@ AquaSalMenu::AquaSalMenu( bool bMenuBar ) : if( ! mbMenuBar ) { mpMenu = [[SalNSMenu alloc] initWithMenu: this]; +#if MACOSX_SDK_VERSION < 1060 + objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu); +#else [mpMenu setDelegate: reinterpret_cast< id<NSMenuDelegate> >(mpMenu)]; +#endif } else { diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx index 7007868..8ef58ad 100644 --- a/vcl/osx/salprn.cxx +++ b/vcl/osx/salprn.cxx @@ -462,7 +462,11 @@ bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName, { [mpPrintInfo setJobDisposition: NSPrintSaveJob]; NSString* pPath = CreateNSString( *i_pFileName ); +#if MACOSX_SDK_VERSION < 1060 + [pPrintDict setObject:[NSURL fileURLWithPath:pPath] forKey:NSPrintSavePath]; +#else [pPrintDict setObject:[NSURL fileURLWithPath:pPath] forKey:NSPrintJobSavingURL]; +#endif [pPath release]; } diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 321f371..b3c7e12 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -80,9 +80,13 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD ) ((mpFontData->GetWeight() < WEIGHT_SEMIBOLD) && (mpFontData->GetWeight() != WEIGHT_DONTKNOW)) ) { +#if MACOSX_SDK_VERSION >= 1060 int nStroke = -lrint((3.5F * pReqFont->GetWeight()) / mpFontData->GetWeight()); CFNumberRef rStroke = CFNumberCreate(NULL, kCFNumberSInt32Type, &nStroke); CFDictionarySetValue(mpStyleDict, kCTStrokeWidthAttributeName, rStroke); +#else /* kCTStrokeWidthAttributeName is not available */ + /* do we really need "fake" bold? */ +#endif } // fake italic @@ -324,8 +328,10 @@ ImplDevFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool if( bFontEnabled ) { int bEnabled = TRUE; // by default (and when we're on OS X < 10.6) it's "enabled" +#if MACOSX_SDK_VERSION >= 1060 CFNumberRef pEnabled = static_cast<CFNumberRef>(CTFontDescriptorCopyAttribute( pFD, kCTFontEnabledAttribute )); CFNumberGetValue( pEnabled, kCFNumberIntType, &bEnabled ); +#endif *bFontEnabled = bEnabled; } diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx index f1acd17..11607e5 100644 --- a/vcl/quartz/ctlayout.cxx +++ b/vcl/quartz/ctlayout.cxx @@ -202,6 +202,11 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) nPixelWidth -= rint(mfTrailingSpaceWidth); } } + +#if MACOSX_SDK_VERSION < 1070 + // don't recreate line layout here, because this can lead to problems + // (looks like internal issues inside early CoreText versions) +#else if(nPixelWidth <= 0) { return; @@ -220,7 +225,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) SAL_INFO( "vcl.ct", "CTLineCreateWithAttributedString(\"" << GetOUString(aCFText) << "\") = " << mpCTLine ); CFRelease( pAttrStr ); CFRelease( aCFText ); - +#endif // in RTL-layouts trailing spaces are leftmost // TODO: use BiDi-algorithm to thoroughly check this assumption @@ -230,8 +235,13 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) } } +#if MACOSX_SDK_VERSION < 1070 + CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, nPixelWidth - mfTrailingSpaceWidth ); + SAL_INFO( "vcl.ct", "CTLineCreateJustifiedLine(" << mpCTLine << ",1.0," << nPixelWidth - mfTrailingSpaceWidth << ") = " << pNewCTLine ); +#else CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, nPixelWidth); SAL_INFO( "vcl.ct", "CTLineCreateJustifiedLine(" << mpCTLine << ",1.0," << nPixelWidth << ") = " << pNewCTLine ); +#endif if( !pNewCTLine ) { @@ -246,7 +256,11 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) SAL_INFO( "vcl.ct", "CFRelease(" << mpCTLine << ")" ); CFRelease( mpCTLine ); mpCTLine = pNewCTLine; +#if MACOSX_SDK_VERSION < 1070 + mfCachedWidth = nPixelWidth; +#else mfCachedWidth = nPixelWidth + mfTrailingSpaceWidth; +#endif } // When drawing right aligned text, rounding errors in the position returned by @@ -300,9 +314,13 @@ bool CTLayout::DrawTextSpecial( SalGraphics& rGraphics, sal_uInt32 flags ) const CFDictionaryGetCount(mpTextStyle->GetStyleDict()), mpTextStyle->GetStyleDict()); +#if MACOSX_SDK_VERSION < 1060 + /* just don't do 'kCTStrokeWidthAttributeName' */ +#else int nStroke = 2; CFNumberRef rStroke = CFNumberCreate(NULL, kCFNumberSInt32Type, &nStroke); CFDictionarySetValue(styledict, kCTStrokeWidthAttributeName, rStroke); +#endif CFAttributedStringRef pAttrStr = CFAttributedStringCreate( NULL, diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index ec7b0e0..a0f166e 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -319,12 +319,30 @@ static bool AddTempDevFont(const OUString& rFontFileURL) CFStringRef rFontPath = CFStringCreateWithCString(NULL, aCFileName.getStr(), kCFStringEncodingUTF8); CFURLRef rFontURL = CFURLCreateWithFileSystemPath(NULL, rFontPath, kCFURLPOSIXPathStyle, true); + bool success = false; + +#if MACOSX_SDK_VERSION >= 1060 CFErrorRef error; - bool success = CTFontManagerRegisterFontsForURL(rFontURL, kCTFontManagerScopeProcess, &error); + success = CTFontManagerRegisterFontsForURL(rFontURL, kCTFontManagerScopeProcess, &error); if (!success) { CFRelease(error); } +#else /* CTFontManagerRegisterFontsForURL is not available on OS X <10.6 */ + CGDataProviderRef dataProvider = CGDataProviderCreateWithURL(rFontURL); + CGFontRef graphicsFont = CGFontCreateWithDataProvider(dataProvider); + if (graphicsFont) + { + CTFontRef coreTextFont = CTFontCreateWithGraphicsFont(graphicsFont, /*fontSize*/ 0, /*matrix*/ NULL, /*attributes*/ NULL); + if (coreTextFont) + { + success = true; + CFRelease(coreTextFont); + } + CGFontRelease(graphicsFont); + } + CGDataProviderRelease(dataProvider); +#endif return success; } commit bdeb5ba4375fd5115384b8697eb40253f35ff2ea Author: Douglas Mencken <dougmenc...@gmail.com> Date: Sun Oct 5 08:11:22 2014 -0400 avmediaMacAVF is not available on OS X 10.5/10.6 related commits: 4fa8282816cb39692678e9da6b6693e821a3039b d4759066933e87f6b56dde40e9e4c224bc1f723f Change-Id: Ice433ac738096c4142cc78ce793f2b2f1e2a1708 diff --git a/Repository.mk b/Repository.mk index 9a7c31d..79400ed 100644 --- a/Repository.mk +++ b/Repository.mk @@ -270,7 +270,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ acc \ $(call gb_Helper_optional,AVMEDIA,avmedia) \ $(if $(filter MACOSX,$(OS)),\ - avmediaMacAVF \ + $(if $(filter-out 1050 1060,$(MACOSX_SDK_VERSION)),avmediaMacAVF) \ $(if $(ENABLE_MACOSX_SANDBOX),,avmediaQuickTime) \ ) \ $(call gb_Helper_optional,SCRIPTING, \ diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index 06af36f..27b588d 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -44,10 +44,14 @@ endif endif ifeq ($(OS),MACOSX) +ifneq (1050,$(MACOSX_SDK_VERSION)) +ifneq (1060,$(MACOSX_SDK_VERSION)) $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmediaMacAVF \ )) endif +endif +endif ifneq ($(ENABLE_DIRECTX),) $(eval $(call gb_Module_add_targets,avmedia,\ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index c9d6e0e..b9bea85 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -124,7 +124,9 @@ $(eval $(call gb_Rdb_add_components,services,\ writerperfect/source/writer/wpftwriter \ writerperfect/source/calc/wpftcalc \ $(if $(filter MACOSX,$(OS)), \ - $(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \ + $(if $(filter 1050 1060,$(MACOSX_SDK_VERSION)),, \ + $(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \ + ) \ $(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \ $(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \ ) \ commit 67e54951b06eeca95494701581723201b3de2682 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Thu Dec 25 00:39:19 2014 -0500 ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits