fixes for prebuild to build - mostly reverted previous change, but rebased patches

diff --git a/macosx/prebuild/Makefile.leopard b/macosx/prebuild/Makefile.leopard
index cfdcb7f3e7de40257f13027e1081dd4b4eb9b53b..6226e83ccb16f15174c7e88b5da427612064b2d0 100644 (file)
--- a/macosx/prebuild/Makefile.leopard
+++ b/macosx/prebuild/Makefile.leopard
@@ -19,7 +19,11 @@ GD_URL=http://www.libgd.org/releases/gd-2.0.36RC1.tar.gz
 PIXMAN_URL=http://cairographics.org/releases/pixman-0.15.4.tar.gz
 CAIRO_URL=http://cairographics.org/releases/cairo-1.8.8.tar.gz
 GETTEXT_URL=ftp://mirrors.kernel.org/gnu/gettext/gettext-0.17.tar.gz
-GLIB_URL=http://ftp.gnome.org/pub/gnome/sources/glib/2.21/glib-2.21.2.tar.gz
+
+# latest GLIB doesn't build
+#GLIB_URL=http://ftp.gnome.org/pub/gnome/sources/glib/2.21/glib-2.21.2.tar.gz
+GLIB_URL=http://ftp.gnome.org/pub/gnome/sources/glib/2.20/glib-2.20.1.tar.gz
+
 PANGO_URL=http://ftp.gnome.org/pub/GNOME/sources/pango/1.24/pango-1.24.4.tar.gz
 GTS_URL=http://downloads.sourceforge.net/gts/gts-0.7.6.tar.gz
 GTK_URL=http://ftp.gnome.org/pub/gnome/sources/gtk+/2.17/gtk+-2.17.2.tar.gz
@@ -505,7 +509,7 @@ $(CAIRO_DIR)/Makefile: $(PREFIX)/lib/$(PIXMAN) $(PREFIX)/lib/$(FONTCONFIG) $(PRE
        @echo
        @echo CONFIGURING CAIRO...
        @echo
-       cd $(CAIRO_DIR) && ./configure $(BASE_CONFIG) $(FLAG_CONFIG) --disable-quartz
+       cd $(CAIRO_DIR) && ./configure $(BASE_CONFIG) $(FLAG_CONFIG)
        
 $(CAIRO_DIR)/configure: | $(CAIRO_DIR).tar.gz
        @echo

diff --git a/macosx/prebuild/cairo.patch b/macosx/prebuild/cairo.patch
index de9b6892a483d3b3f94a648417d8214ce58d4254..d7bc9c898d8bb3a68a4757a62f1eaa68397c4d10 100644 (file)
--- a/macosx/prebuild/cairo.patch
+++ b/macosx/prebuild/cairo.patch
@@ -1,36 +1,6 @@
-diff -ru cairo-1.6.4/src/cairo-quartz-font.c cairo-1.6.4.patched/src/cairo-quartz-font.c
---- cairo-1.6.4/src/cairo-quartz-font.c        2008-04-08 06:30:31.000000000 +0800
-+++ cairo-1.6.4.patched/src/cairo-quartz-font.c        2008-04-23 22:36:35.000000000 +0800
-@@ -775,6 +775,8 @@
-  *
-  * Since: 1.6
-  **/
-+
-+#if !__LP64__
- cairo_font_face_t *
- cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id)
- {
-@@ -792,3 +794,4 @@
- {
-     return cairo_quartz_font_face_create_for_atsu_font_id (font_id);
- }
-+#endif
-diff -ru cairo-1.6.4/src/cairo-quartz.h cairo-1.6.4.patched/src/cairo-quartz.h
---- cairo-1.6.4/src/cairo-quartz.h     2008-04-08 06:30:31.000000000 +0800
-+++ cairo-1.6.4.patched/src/cairo-quartz.h     2008-04-23 22:37:18.000000000 +0800
-@@ -66,8 +66,10 @@
- cairo_public cairo_font_face_t *
- cairo_quartz_font_face_create_for_cgfont (CGFontRef font);
- 
-+#if !__LP64__
- cairo_public cairo_font_face_t *
- cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id);
-+#endif
- 
- #endif /* CAIRO_HAS_QUARTZ_FONT */
- 
---- cairo-1.6.4/src/cairo.pc.in        2007-04-28 01:02:34.000000000 +0800
-+++ cairo-1.6.4.patched/src/cairo.pc.in        2008-05-05 17:21:57.000000000 +0800
+diff -rub cairo-1.8.8.orig/src/cairo.pc.in cairo-1.8.8/src/cairo.pc.in
+--- cairo-1.8.8.orig/src/cairo.pc.in   2008-08-31 18:32:22.000000000 -0400
++++ cairo-1.8.8/src/cairo.pc.in        2009-07-02 13:39:41.000000000 -0400
 @@ -7,7 +7,7 @@
  Description: Multi-platform 2D graphics library
  Version: @VERSION@