From: ellson Date: Wed, 12 Jan 2011 18:15:29 +0000 (+0000) Subject: update glib to latest stable - and fix resulting bugs with Universal build - what... X-Git-Tag: LAST_LIBGRAPH~32^2~1105 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33686fc9dc23a90b8cdd8bbb5136ba12e49fd1bd;p=graphviz update glib to latest stable - and fix resulting bugs with Universal build - what a pain! --- diff --git a/macosx/prebuild/Makefile-packages.incl b/macosx/prebuild/Makefile-packages.incl index f7280b18c..5555c3657 100644 --- a/macosx/prebuild/Makefile-packages.incl +++ b/macosx/prebuild/Makefile-packages.incl @@ -8,7 +8,7 @@ PIXMAN_URL=http://cairographics.org/releases/pixman-0.21.2.tar.gz CAIRO_URL=http://cairographics.org/releases/cairo-1.10.2.tar.gz GETTEXT_URL=ftp://mirrors.kernel.org/gnu/gettext/gettext-0.18.1.tar.gz PANGO_URL=http://ftp.gnome.org/pub/GNOME/sources/pango/1.28/pango-1.28.3.tar.gz -GLIB_URL=http://ftp.gnome.org/pub/gnome/sources/glib/2.27/glib-2.27.5.tar.gz +GLIB_URL=http://ftp.gnome.org/pub/gnome/sources/glib/2.26/glib-2.26.1.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.23/gtk+-2.23.90.tar.gz ATK_URL=http://ftp.acc.umu.se/pub/gnome/sources/atk/1.32/atk-1.32.0.tar.gz diff --git a/macosx/prebuild/Makefile.snowleopard b/macosx/prebuild/Makefile.snowleopard index 85cf5c0f4..d2413977e 100644 --- a/macosx/prebuild/Makefile.snowleopard +++ b/macosx/prebuild/Makefile.snowleopard @@ -12,10 +12,6 @@ ARCHS=-arch ppc -arch i386 -arch x86_64 include Makefile-packages.incl -# GLIB 2.27 doesn't build -# GLIB 2.20 was OK -GLIB_URL=http://ftp.gnome.org/pub/gnome/sources/glib/2.20/glib-2.20.1.tar.gz - # libraries PKGCONFIG=pkg-config @@ -342,8 +338,8 @@ $(PANGO_DIR).tar.gz: # # patch to fix libiconv_open absent in 64-bit # run configure + make once to create glib-genmarshal for cross-building support -# run configure once for each architecture, capturing config.h and glibconfig.h -# run configure again for Universal Binary, recomposing config.h and glibconfig.h from captured versions +# run configure once for each architecture, capturing config.h and glib/glibconfig.h +# run configure again for Universal Binary, recomposing config.h and glib/glibconfig.h from captured versions $(PREFIX)/lib/$(GLIB): $(GLIB_DIR)/glib/$(GLIB) @echo @@ -373,26 +369,30 @@ $(GLIB_DIR)/Makefile: $(PREFIX)/lib/$(INTL) | $(PREFIX)/bin/$(PKGCONFIG) $(GLIB_ echo "ac_cv_func_posix_getgrgid_r=yes" >>darwin.cache && \ echo "ac_cv_func_vsnprintf_c99=yes" >>darwin.cache && \ echo "ac_cv_func_printf_unix98=yes" >>darwin.cache && \ - PATH=$(PREFIX)/bin:gobject:$$PATH && \ + PATH=$(PREFIX)/bin:gobject:gio:$$PATH && \ echo --- GLIB-GENMARSHAL PASS --- && \ ./configure $(BASE_CONFIG) CFLAGS="-I$(PREFIX)/include" LDFLAGS="-L$(PREFIX)/lib" && \ $(MAKE) -C glib && \ + $(MAKE) -C gthread && \ + $(MAKE) -C gobject && \ + $(MAKE) -C gmodule && \ + $(MAKE) -C gio && \ $(MAKE) -C gobject glib-genmarshal && \ cp darwin.cache darwinian.cache && \ echo --- PPC PASS --- && \ ./configure --cache-file=darwinian.cache --build=$$BUILD --host=powerpc-apple-darwin$$OSREL $(BASE_CONFIG) CFLAGS="-O2 -arch ppc -I$(PREFIX)/include" LDFLAGS="-arch ppc -L$(PREFIX)/lib" && \ cp config.h config.ppc.h && \ - cp glibconfig.h glibconfig.ppc.h && \ + cp glib/glibconfig.h glib/glibconfig.ppc.h && \ cp darwin.cache darwinian.cache && \ echo --- I386 PASS --- && \ ./configure --cache-file=darwinian.cache --build=$$BUILD --host=i686-apple-darwin$$OSREL $(BASE_CONFIG) CFLAGS="-O2 -arch i386 -I$(PREFIX)/include" LDFLAGS="-arch i386 -L$(PREFIX)/lib" && \ cp config.h config.i386.h && \ - cp glibconfig.h glibconfig.i386.h && \ + cp glib/glibconfig.h glib/glibconfig.i386.h && \ cp darwin.cache darwinian.cache && \ echo --- X86_64 PASS --- && \ ./configure --cache-file=darwinian.cache --build=$$BUILD --host=x86_64-apple-darwin$$OSREL $(BASE_CONFIG) CFLAGS="-O2 -arch x86_64 -I$(PREFIX)/include" LDFLAGS="-arch x86_64 -L$(PREFIX)/lib" && \ cp config.h config.x86_64.h && \ - cp glibconfig.h glibconfig.x86_64.h && \ + cp glib/glibconfig.h glib/glibconfig.x86_64.h && \ cp darwin.cache darwinian.cache && \ echo --- UNIVERSAL BINARY PASS --- && \ ./configure $(BASE_CONFIG) CFLAGS="-O2 $(ARCHS) -I$(PREFIX)/include" LDFLAGS="$(ARCHS) -L$(PREFIX)/lib" && \ @@ -404,14 +404,14 @@ $(GLIB_DIR)/Makefile: $(PREFIX)/lib/$(INTL) | $(PREFIX)/bin/$(PKGCONFIG) $(GLIB_ echo "#elif defined(__x86_64__)" >>config.h && \ cat config.x86_64.h >>config.h && \ echo "#endif" >>config.h && \ - rm glibconfig.h && \ - echo "#if defined(__ppc__)" >>glibconfig.h && \ - cat glibconfig.ppc.h >>glibconfig.h && \ - echo "#elif defined(__i386__)" >>glibconfig.h && \ - cat glibconfig.i386.h >>glibconfig.h && \ - echo "#elif defined(__x86_64__)" >>glibconfig.h && \ - cat glibconfig.x86_64.h >>glibconfig.h && \ - echo "#endif" >>glibconfig.h && \ + rm glib/glibconfig.h && \ + echo "#if defined(__ppc__)" >>glib/glibconfig.h && \ + cat glib/glibconfig.ppc.h >>glib/glibconfig.h && \ + echo "#elif defined(__i386__)" >>glib/glibconfig.h && \ + cat glib/glibconfig.i386.h >>glib/glibconfig.h && \ + echo "#elif defined(__x86_64__)" >>glib/glibconfig.h && \ + cat glib/glibconfig.x86_64.h >>glib/glibconfig.h && \ + echo "#endif" >>glib/glibconfig.h && \ touch stamp-gc-h && \ $(MAKE) clean diff --git a/macosx/prebuild/glib.patch b/macosx/prebuild/glib.patch index c9d43ed67..33559d028 100644 --- a/macosx/prebuild/glib.patch +++ b/macosx/prebuild/glib.patch @@ -16,3 +16,36 @@ diff -ru glib-2.16.3/glib/gconvert.c glib-2.16.3.patched/glib/gconvert.c #include "galias.h" +--- glib-2.27.3/glib/gvariant.c.old 2011-01-12 12:36:42.000000000 -0500 ++++ glib-2.27.3/glib/gvariant.c 2011-01-12 12:37:15.000000000 -0500 +@@ -3875,8 +3875,8 @@ + } + + /* The code below assumes this */ +-G_STATIC_ASSERT (sizeof (gboolean) == sizeof (guint32)); +-G_STATIC_ASSERT (sizeof (gdouble) == sizeof (guint64)); ++//G_STATIC_ASSERT (sizeof (gboolean) == sizeof (guint32)); ++//G_STATIC_ASSERT (sizeof (gdouble) == sizeof (guint64)); + + static void + g_variant_valist_get_leaf (const gchar **str, +--- glib-2.27.3/gio/gdbusmessage.c.old 2011-01-12 12:54:28.000000000 -0500 ++++ glib-2.27.3/gio/gdbusmessage.c 2011-01-12 12:54:52.000000000 -0500 +@@ -1186,7 +1186,7 @@ + v = g_data_input_stream_read_uint64 (dis, NULL, &local_error); + if (local_error != NULL) + goto fail; +- G_STATIC_ASSERT (sizeof (gdouble) == sizeof (guint64)); ++// G_STATIC_ASSERT (sizeof (gdouble) == sizeof (guint64)); + encoded = (gdouble *) &v; + ret = g_variant_new_double (*encoded); + } +@@ -1938,7 +1938,7 @@ + { + guint64 *encoded; + gdouble v = g_variant_get_double (value); +- G_STATIC_ASSERT (sizeof (gdouble) == sizeof (guint64)); ++// G_STATIC_ASSERT (sizeof (gdouble) == sizeof (guint64)); + encoded = (guint64 *) &v; + g_data_output_stream_put_uint64 (dos, *encoded, NULL, NULL); + }