From ba47f961f8b5ef6ce5a281fa573904e04f5f9dcc Mon Sep 17 00:00:00 2001 From: kwm Date: Tue, 29 Jun 2010 20:12:54 +0000 Subject: Update to 0.9.0. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14281 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/gobject-introspection/Makefile | 5 +-- devel/gobject-introspection/distinfo | 6 +-- .../files/patch-girepository_giconstantinfo.c | 46 ++++++++++++++++++++++ .../files/patch-girepository_ginfo.c | 46 ---------------------- devel/gobject-introspection/pkg-plist | 15 +++++++ 5 files changed, 66 insertions(+), 52 deletions(-) create mode 100644 devel/gobject-introspection/files/patch-girepository_giconstantinfo.c delete mode 100644 devel/gobject-introspection/files/patch-girepository_ginfo.c (limited to 'devel') diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index a4a1a9784..780921553 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -3,12 +3,11 @@ # Whom: Alexander Logvinov # # $FreeBSD: ports/devel/gobject-introspection/Makefile,v 1.10 2010/06/06 20:09:32 marcus Exp $ -# $MCom: ports/devel/gobject-introspection/Makefile,v 1.8 2010/04/22 15:11:23 kwm Exp $ +# $MCom: ports/devel/gobject-introspection/Makefile,v 1.12 2010/06/24 09:53:19 kwm Exp $ # PORTNAME= gobject-introspection -PORTVERSION= 0.6.14 -PORTREVISION= 1 +PORTVERSION= 0.9.0 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo index cce161879..30b940fbf 100644 --- a/devel/gobject-introspection/distinfo +++ b/devel/gobject-introspection/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gobject-introspection-0.6.14.tar.bz2) = 7ea9be9a347b5c408fd3c3907803de9b -SHA256 (gnome2/gobject-introspection-0.6.14.tar.bz2) = c4713bcbcebb06861738a8f630ab05289666e631f42f7abbf2e836978db7eba6 -SIZE (gnome2/gobject-introspection-0.6.14.tar.bz2) = 763182 +MD5 (gnome2/gobject-introspection-0.9.0.tar.bz2) = 11aac73dc37348bf3dd11a4f400500ad +SHA256 (gnome2/gobject-introspection-0.9.0.tar.bz2) = d86c6f6612c47f0ea25178eda88f91629992f6c191a8949c797dee9bfc9ef9d3 +SIZE (gnome2/gobject-introspection-0.9.0.tar.bz2) = 582141 diff --git a/devel/gobject-introspection/files/patch-girepository_giconstantinfo.c b/devel/gobject-introspection/files/patch-girepository_giconstantinfo.c new file mode 100644 index 000000000..45f687ba8 --- /dev/null +++ b/devel/gobject-introspection/files/patch-girepository_giconstantinfo.c @@ -0,0 +1,46 @@ +--- girepository/giconstantinfo.c.orig 2010-06-29 22:02:31.000000000 +0200 ++++ girepository/giconstantinfo.c 2010-06-29 22:08:27.000000000 +0200 +@@ -64,6 +64,9 @@ g_constant_info_get_type (GIConstantInfo + return _g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + 8); + } + ++#define DO_ALIGNED_COPY(dest_addr, src_addr, type) \ ++ memcpy((dest_addr), (src_addr), sizeof(type)) ++ + /** + * g_constant_info_get_value: + * @info: a #GIConstantInfo +@@ -118,16 +121,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]; +@@ -145,10 +148,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; + } + } diff --git a/devel/gobject-introspection/files/patch-girepository_ginfo.c b/devel/gobject-introspection/files/patch-girepository_ginfo.c deleted file mode 100644 index 794bf443c..000000000 --- a/devel/gobject-introspection/files/patch-girepository_ginfo.c +++ /dev/null @@ -1,46 +0,0 @@ ---- girepository/ginfo.c.orig 2010-06-01 15:48:36.000000000 -0400 -+++ girepository/ginfo.c 2010-06-06 16:02:36.000000000 -0400 -@@ -2110,6 +2110,9 @@ g_constant_info_get_type (GIConstantInfo - return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + 8); - } - -+#define DO_ALIGNED_COPY(dest_addr, src_addr, type) \ -+ memcpy((dest_addr), (src_addr), sizeof(type)) -+ - gint - g_constant_info_get_value (GIConstantInfo *info, - GArgument *value) -@@ -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; - } - } diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist index 7588b6839..5dd0d24e6 100644 --- a/devel/gobject-introspection/pkg-plist +++ b/devel/gobject-introspection/pkg-plist @@ -1,12 +1,27 @@ bin/g-ir-compiler bin/g-ir-generate bin/g-ir-scanner +include/gobject-introspection-1.0/giarginfo.h include/gobject-introspection-1.0/gibaseinfo.h +include/gobject-introspection-1.0/gicallableinfo.h +include/gobject-introspection-1.0/giconstantinfo.h +include/gobject-introspection-1.0/gienuminfo.h +include/gobject-introspection-1.0/gierrordomaininfo.h +include/gobject-introspection-1.0/gifieldinfo.h include/gobject-introspection-1.0/gifunctioninfo.h +include/gobject-introspection-1.0/giinterfaceinfo.h +include/gobject-introspection-1.0/giobjectinfo.h +include/gobject-introspection-1.0/gipropertyinfo.h +include/gobject-introspection-1.0/giregisteredtypeinfo.h include/gobject-introspection-1.0/girepository.h include/gobject-introspection-1.0/girffi.h +include/gobject-introspection-1.0/gisignalinfo.h +include/gobject-introspection-1.0/gistructinfo.h +include/gobject-introspection-1.0/gitypeinfo.h include/gobject-introspection-1.0/gitypelib.h include/gobject-introspection-1.0/gitypes.h +include/gobject-introspection-1.0/giunioninfo.h +include/gobject-introspection-1.0/givfuncinfo.h lib/girepository-1.0/Everything-1.0.typelib lib/girepository-1.0/GIMarshallingTests-1.0.typelib lib/girepository-1.0/GIRepository-2.0.typelib -- cgit v1.2.3