diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-06-06 18:17:25 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-06-06 18:17:25 +0800 |
| commit | 890b986b068b2563ba75ad43b81cb122ad7d0ec3 (patch) | |
| tree | fc64343221855c458f63821abf5be7834458c0c2 /devel/gobject-introspection/files | |
| parent | 7b4c86f2b5a7f3e637aa96dee6441077d56818aa (diff) | |
| download | marcuscom-ports-890b986b068b2563ba75ad43b81cb122ad7d0ec3.tar marcuscom-ports-890b986b068b2563ba75ad43b81cb122ad7d0ec3.tar.gz marcuscom-ports-890b986b068b2563ba75ad43b81cb122ad7d0ec3.tar.bz2 marcuscom-ports-890b986b068b2563ba75ad43b81cb122ad7d0ec3.tar.lz marcuscom-ports-890b986b068b2563ba75ad43b81cb122ad7d0ec3.tar.xz marcuscom-ports-890b986b068b2563ba75ad43b81cb122ad7d0ec3.tar.zst marcuscom-ports-890b986b068b2563ba75ad43b81cb122ad7d0ec3.zip | |
Update to 0.6.14.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14188 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gobject-introspection/files')
| -rw-r--r-- | devel/gobject-introspection/files/patch-gir_Makefile.in | 18 | ||||
| -rw-r--r-- | devel/gobject-introspection/files/patch-girepository_ginfo.c | 46 |
2 files changed, 64 insertions, 0 deletions
diff --git a/devel/gobject-introspection/files/patch-gir_Makefile.in b/devel/gobject-introspection/files/patch-gir_Makefile.in new file mode 100644 index 000000000..8edf18a7d --- /dev/null +++ b/devel/gobject-introspection/files/patch-gir_Makefile.in @@ -0,0 +1,18 @@ +--- gir/Makefile.in.orig 2010-06-06 12:05:49.000000000 +0200 ++++ gir/Makefile.in 2010-06-06 12:07:36.000000000 +0200 +@@ -436,14 +436,13 @@ + GLib_2_0_gir_PACKAGES = glib-2.0 + GLib_2_0_gir_CFLAGS = $(CPPFLAGS) \ + -I$(GLIB_INCLUDEDIR) \ +- -I$(GLIB_LIBDIR)/glib-2.0/include \ + -DGETTEXT_PACKAGE=Dummy \ + -DGLIB_COMPILATION \ + -D__G_I18N_LIB_H__ + + GLib_2_0_gir_ASSERTIONS = GLib-2.0.xpath + GLib_2_0_gir_FILES = \ +- $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \ ++ $(GLIB_INCLUDEDIR)/glibconfig.h \ + $(GLIB_INCLUDEDIR)/glib/*.h \ + glib-2.0.c + diff --git a/devel/gobject-introspection/files/patch-girepository_ginfo.c b/devel/gobject-introspection/files/patch-girepository_ginfo.c new file mode 100644 index 000000000..eaea566d1 --- /dev/null +++ b/devel/gobject-introspection/files/patch-girepository_ginfo.c @@ -0,0 +1,46 @@ +--- girepository/ginfo.c.orig 2010-06-01 21:48:36.000000000 +0200 ++++ girepository/ginfo.c 2010-06-06 12:13:50.000000000 +0200 +@@ -29,6 +29,9 @@ + #include "ginfo.h" + #include "girepository-private.h" + ++#define DO_ALIGNED_COPY(dest_addr, src_addr, type) \ ++ memcpy((dest_addr), (src_addr), sizeof(type)) ++ + /* GICallableInfo functions */ + + /** +@@ -2148,16 +2151,16 @@ g_constant_info_get_value (GIConstantInf + value->v_uint32 = *(guint32*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_INT64: +- value->v_int64 = *(gint64*)&rinfo->typelib->data[blob->offset]; ++ DO_ALIGNED_COPY(&value->v_int64, &rinfo->typelib->data[blob->offset], gint64); + break; + case GI_TYPE_TAG_UINT64: +- value->v_uint64 = *(guint64*)&rinfo->typelib->data[blob->offset]; ++ DO_ALIGNED_COPY(&value->v_uint64, &rinfo->typelib->data[blob->offset], guint64); + break; + case GI_TYPE_TAG_FLOAT: +- value->v_float = *(gfloat*)&rinfo->typelib->data[blob->offset]; ++ DO_ALIGNED_COPY(&value->v_float, &rinfo->typelib->data[blob->offset], gfloat); + break; + case GI_TYPE_TAG_DOUBLE: +- value->v_double = *(gdouble*)&rinfo->typelib->data[blob->offset]; ++ DO_ALIGNED_COPY(&value->v_double, &rinfo->typelib->data[blob->offset], gdouble); + break; + case GI_TYPE_TAG_TIME_T: + value->v_long = *(long*)&rinfo->typelib->data[blob->offset]; +@@ -2175,10 +2178,10 @@ g_constant_info_get_value (GIConstantInf + value->v_uint = *(guint*)&rinfo->typelib->data[blob->offset]; + break; + case GI_TYPE_TAG_LONG: +- value->v_long = *(glong*)&rinfo->typelib->data[blob->offset]; ++ DO_ALIGNED_COPY(&value->v_long, &rinfo->typelib->data[blob->offset], glong); + break; + case GI_TYPE_TAG_ULONG: +- value->v_ulong = *(gulong*)&rinfo->typelib->data[blob->offset]; ++ DO_ALIGNED_COPY(&value->v_ulong, &rinfo->typelib->data[blob->offset], gulong); + break; + } + } |