From 9eb8824e6f8e105e6af03ef4f0196b40642c69d9 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Tue, 28 Jun 2011 10:41:48 +0000 Subject: [PATCH] Remove now useless patch. --- devel/gobject-introspection/Makefile | 6 +- .../patches/patch-girepository_giroffsets_c | 56 ------------------- 2 files changed, 3 insertions(+), 59 deletions(-) delete mode 100644 devel/gobject-introspection/patches/patch-girepository_giroffsets_c diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index 2a495f4151e..bede584d088 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.42 2011/06/14 13:53:30 sebastia Exp $ +# $OpenBSD: Makefile,v 1.43 2011/06/28 10:41:48 ajacoutot Exp $ COMMENT= GObject Introspection @@ -6,7 +6,7 @@ GNOME_VERSION= 0.10.8 GNOME_PROJECT= gobject-introspection CATEGORIES= devel -REVISION= 6 +REVISION= 7 SHARED_LIBS += girepository-1.0 1.0 # 1.0 @@ -31,7 +31,7 @@ MODGCC3_ARCHES = sparc WANTLIB += c ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 WANTLIB += m pcre pthread z -LIB_DEPENDS= devel/glib2 \ +LIB_DEPENDS= devel/glib2>=2.28.8p0 \ devel/libffi BUILD_DEPENDS= devel/bison \ graphics/cairo diff --git a/devel/gobject-introspection/patches/patch-girepository_giroffsets_c b/devel/gobject-introspection/patches/patch-girepository_giroffsets_c deleted file mode 100644 index aa543996923..00000000000 --- a/devel/gobject-introspection/patches/patch-girepository_giroffsets_c +++ /dev/null @@ -1,56 +0,0 @@ -$OpenBSD: patch-girepository_giroffsets_c,v 1.7 2011/06/21 13:12:05 jasper Exp $ - -commit 023a7ed00e33a6a9e5f3fee742d4c210ce108ecd -Author: Jasper Lievisse Adriaanse -Date: Tue Jun 21 13:44:56 2011 +0200 - - Rename ALIGN to GI_ALIGN to prevent redefining this macro on some platforms - - https://bugzilla.gnome.org/show_bug.cgi?id=652625 - ---- girepository/giroffsets.c.orig Wed Nov 17 15:02:51 2010 -+++ girepository/giroffsets.c Thu Dec 23 15:21:17 2010 -@@ -350,7 +350,7 @@ get_field_size_alignment (GIrTypelibBuild *build, - return success; - } - --#define ALIGN(n, align) (((n) + (align) - 1) & ~((align) - 1)) -+#define GI_ALIGN(n, align) (((n) + (align) - 1) & ~((align) - 1)) - - static gboolean - compute_struct_field_offsets (GIrTypelibBuild *build, -@@ -382,7 +382,7 @@ compute_struct_field_offsets (GIrTypelibBuild *build - if (get_field_size_alignment (build, field, node, - &member_size, &member_alignment)) - { -- size = ALIGN (size, member_alignment); -+ size = GI_ALIGN (size, member_alignment); - alignment = MAX (alignment, member_alignment); - field->offset = size; - size += member_size; -@@ -396,14 +396,14 @@ compute_struct_field_offsets (GIrTypelibBuild *build - } - else if (member->type == G_IR_NODE_CALLBACK) - { -- size = ALIGN (size, ffi_type_pointer.alignment); -+ size = GI_ALIGN (size, ffi_type_pointer.alignment); - alignment = MAX (alignment, ffi_type_pointer.alignment); - size += ffi_type_pointer.size; - } - } - - /* Structs are tail-padded out to a multiple of their alignment */ -- size = ALIGN (size, alignment); -+ size = GI_ALIGN (size, alignment); - - if (!have_error) - { -@@ -459,7 +459,7 @@ compute_union_field_offsets (GIrTypelibBuild *build, - } - - /* Unions are tail-padded out to a multiple of their alignment */ -- size = ALIGN (size, alignment); -+ size = GI_ALIGN (size, alignment); - - if (!have_error) - {