Update to 0.6.14.

5 files changed, 25 insertions, 22 deletions

diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index a791364dcf1e..5d88f02a9c98 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gobject-introspection
-PORTVERSION=	0.6.11
-PORTREVISION=	1
+PORTVERSION=	0.6.14
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index c50397389890..cce161879a1b 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gobject-introspection-0.6.11.tar.bz2) = 85d120f7e8692e50441f0f25629d0ea4
-SHA256 (gnome2/gobject-introspection-0.6.11.tar.bz2) = 6cbf4b8f5536bb22dd15f89f08673836ce76e3858fb262efd1616899a3d5ca88
-SIZE (gnome2/gobject-introspection-0.6.11.tar.bz2) = 587218
+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
diff --git a/devel/gobject-introspection/files/patch-gir_Makefile.in b/devel/gobject-introspection/files/patch-gir_Makefile.in
index 9e9ef5b8c9bd..f56e9f69b115 100644
--- a/devel/gobject-introspection/files/patch-gir_Makefile.in
+++ b/devel/gobject-introspection/files/patch-gir_Makefile.in
@@ -1,6 +1,6 @@
---- gir/Makefile.in.orig	2010-03-10 17:14:45.000000000 +0000
-+++ gir/Makefile.in	2010-03-10 17:17:53.000000000 +0000
-@@ -400,14 +400,13 @@ GLib_2_0_gir_SCANNERFLAGS = --noclosure 
+--- gir/Makefile.in.orig	2010-06-06 15:58:29.000000000 -0400
++++ gir/Makefile.in	2010-06-06 15:59:15.000000000 -0400
+@@ -436,14 +436,13 @@ GLib_2_0_gir_SCANNERFLAGS = --noclosure 
  GLib_2_0_gir_PACKAGES = glib-2.0
  GLib_2_0_gir_CFLAGS = $(CPPFLAGS) \
              -I$(GLIB_INCLUDEDIR) \
@@ -9,10 +9,10 @@
              -DGLIB_COMPILATION \
              -D__G_I18N_LIB_H__
  
- GLib_2_0_gir_ASSERTIONS = $(srcdir)/GLib-2.0.xpath
+ 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 \
-                 $(srcdir)/glib-2.0.c
+ 	$(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
index f013ff9aa1f8..794bf443c8aa 100644
--- a/devel/gobject-introspection/files/patch-girepository_ginfo.c
+++ b/devel/gobject-introspection/files/patch-girepository_ginfo.c
@@ -1,16 +1,16 @@
---- girepository/ginfo.c.orig	2010-05-19 02:39:46.000000000 +0000
-+++ girepository/ginfo.c	2010-05-30 21:11:54.000000000 +0000
-@@ -69,6 +69,9 @@
-   const gchar *namespace;
- };
+--- 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))
++       memcpy((dest_addr), (src_addr), sizeof(type))
 +
- #define INVALID_REFCOUNT 0x7FFFFFFF
- 
- static void
-@@ -2349,16 +2352,16 @@
+ 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:
@@ -31,7 +31,7 @@
  	      break;
  	    case GI_TYPE_TAG_TIME_T:
  	      value->v_long = *(long*)&rinfo->typelib->data[blob->offset];
-@@ -2376,10 +2379,10 @@
+@@ -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:
diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist
index c2d0439e246f..7588b683930d 100644
--- a/devel/gobject-introspection/pkg-plist
+++ b/devel/gobject-introspection/pkg-plist
@@ -1,8 +1,12 @@
 bin/g-ir-compiler
 bin/g-ir-generate
 bin/g-ir-scanner
+include/gobject-introspection-1.0/gibaseinfo.h
+include/gobject-introspection-1.0/gifunctioninfo.h
 include/gobject-introspection-1.0/girepository.h
 include/gobject-introspection-1.0/girffi.h
+include/gobject-introspection-1.0/gitypelib.h
+include/gobject-introspection-1.0/gitypes.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