cairo/cairo-1.8.0.ios.patch | 30 ------------------------------ cairo/cairo-1.8.0.no-atsui.patch | 32 ++++++++++++++++++++++++++++++++ cairo/cairo/makefile.mk | 4 ++++ 3 files changed, 36 insertions(+), 30 deletions(-)
New commits: commit 98ab45513c8ba98fc20c3584985b88adbc134db0 Author: Tor Lillqvist <t...@iki.fi> Date: Tue Sep 27 12:40:32 2011 +0300 Make cairo build against MacOSX SDK 10.5 Factor out the part of the iOS patch that comments out ATSUI-using API into a new patch file, and use that when building against the MacOSX SDK 10.5. Whether the callers of cairo will build then, no idea... Will see. diff --git a/cairo/cairo-1.8.0.ios.patch b/cairo/cairo-1.8.0.ios.patch index e26d03d..3a679c5 100644 --- a/cairo/cairo-1.8.0.ios.patch +++ b/cairo/cairo-1.8.0.ios.patch @@ -9,19 +9,6 @@ CAIRO_BEGIN_DECLS -@@ -66,8 +66,12 @@ - cairo_public cairo_font_face_t * - cairo_quartz_font_face_create_for_cgfont (CGFontRef font); - -+#if 0 -+ - cairo_public cairo_font_face_t * - cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id); -+ -+#endif /* 0 */ - - #endif /* CAIRO_HAS_QUARTZ_FONT */ - --- misc/build/cairo-1.8.0.org/src/cairo-quartz-surface.c +++ misc/build/cairo-1.8.0/src/cairo-quartz-surface.c @@ -152,10 +152,6 @@ @@ -47,23 +34,6 @@ /* If we're clipping, OSX 10.5 (at least as of 10.5.2) has a * bug (apple bug ID #5834794) where the glyph * advances/positions are not transformed by the text matrix ---- misc/build/cairo-1.8.0.org/src/cairo-quartz-font.c -+++ misc/build/cairo-1.8.0/src/cairo-quartz-font.c -@@ -766,6 +766,8 @@ - } - - -+#if 0 -+ - /* - * compat with old ATSUI backend - */ -@@ -808,3 +808,5 @@ - { - return cairo_quartz_font_face_create_for_atsu_font_id (font_id); - } -+ -+#endif /* 0 */ --- misc/build/cairo-1.8.0.org/configure +++ misc/build/cairo-1.8.0/configure @@ -29309,6 +29309,7 @@ diff --git a/cairo/cairo-1.8.0.no-atsui.patch b/cairo/cairo-1.8.0.no-atsui.patch new file mode 100644 index 0000000..c4fd961 --- /dev/null +++ b/cairo/cairo-1.8.0.no-atsui.patch @@ -0,0 +1,32 @@ +--- misc/build/cairo-1.8.0.org/src/cairo-quartz.h ++++ misc/build/cairo-1.8.0/src/cairo-quartz.h +@@ -66,8 +66,12 @@ + cairo_public cairo_font_face_t * + cairo_quartz_font_face_create_for_cgfont (CGFontRef font); + ++#if 0 ++ + cairo_public cairo_font_face_t * + cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id); ++ ++#endif /* 0 */ + + #endif /* CAIRO_HAS_QUARTZ_FONT */ + +--- misc/build/cairo-1.8.0.org/src/cairo-quartz-font.c ++++ misc/build/cairo-1.8.0/src/cairo-quartz-font.c +@@ -766,6 +766,8 @@ + } + + ++#if 0 ++ + /* + * compat with old ATSUI backend + */ +@@ -808,3 +808,5 @@ + { + return cairo_quartz_font_face_create_for_atsu_font_id (font_id); + } ++ ++#endif /* 0 */ diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 3f411aa..c13b5a8 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -50,6 +50,7 @@ TARFILE_MD5=4ea70ea87b47e92d318d4e7f5b940f47 PATCH_FILES=..$/$(TARFILE_NAME).patch .IF "$(OS)" == "IOS" +PATCH_FILES+=..$/$(TARFILE_NAME).no-atsui.patch PATCH_FILES+=..$/$(TARFILE_NAME).ios.patch .ENDIF @@ -107,6 +108,9 @@ cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS) .ENDIF # "$(SYSBASE)"!="" CONFIGURE_DIR= CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure +.IF $(MAC_OS_X_VERSION_MIN_REQUIRED) > 1040 +PATCH_FILES+=..$/$(TARFILE_NAME).no-atsui.patch +.ENDIF CONFIGURE_FLAGS=--enable-static=no --disable-xlib --disable-ft --disable-svg --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) .IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits