From 7618d8d44914bf635b71ce50f9ba9485c305844f Mon Sep 17 00:00:00 2001
From: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Fri, 19 Oct 2012 16:59:25 +0000
Subject: Update to 1.34.1.1.

This fixes build issues with glib 2.34 series.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17129 df743ca5-7f9a-e211-a948-0013205c9059
---
 devel/gobject-introspection/Makefile                | 12 ++++--------
 devel/gobject-introspection/distinfo                |  4 ++--
 devel/gobject-introspection/files/patch-Makefile.in | 18 ++++++++----------
 devel/gobject-introspection/pkg-plist               |  3 +++
 4 files changed, 17 insertions(+), 20 deletions(-)

(limited to 'devel')

diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 9d62c1ff7..0681626e9 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -1,14 +1,9 @@
-# New ports collection makefile for:	gobject-introspection
-# Date created:				19 July 2009
-# Whom:					Alexander Logvinov <avl@FreeBSD.org>
-#
+# Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/gobject-introspection/Makefile,v 1.47 2012/08/04 09:41:25 kwm Exp $
-#
+#   $MCom: ports/devel/gobject-introspection/Makefile,v 1.48 2012/09/18 22:23:15 kwm Exp $
 
 PORTNAME=	gobject-introspection
-PORTVERSION=	1.32.1
-PORTREVISION=	1
+PORTVERSION=	1.34.1.1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,6 +11,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Generate interface introspection data for GObject libraries
 
+# we need cairo otherwise the generated Cairo gir is broken
 BUILD_DEPENDS=	cairo-trace:${PORTSDIR}/graphics/cairo
 LIB_DEPENDS=	ffi.5:${PORTSDIR}/devel/libffi
 
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index db248e602..4423a97d8 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gobject-introspection-1.32.1.tar.xz) = 44f3fb933f76e4728818cc360cb5f9e2edcbdf9bc8a8f9aded99b3e3ef5cb858
-SIZE (gnome3/gobject-introspection-1.32.1.tar.xz) = 1120996
+SHA256 (gnome3/gobject-introspection-1.34.1.1.tar.xz) = 85b9ac268d34311138f3c6bf646c07975eebfae6ae67d9239e1066a42c5d525b
+SIZE (gnome3/gobject-introspection-1.34.1.1.tar.xz) = 1088672
diff --git a/devel/gobject-introspection/files/patch-Makefile.in b/devel/gobject-introspection/files/patch-Makefile.in
index e22a5a63c..d35bf348b 100644
--- a/devel/gobject-introspection/files/patch-Makefile.in
+++ b/devel/gobject-introspection/files/patch-Makefile.in
@@ -1,18 +1,16 @@
---- Makefile.in.orig	2011-09-15 18:46:37.000000000 +0200
-+++ Makefile.in	2011-09-15 18:48:02.000000000 +0200
-@@ -881,13 +881,13 @@
+--- Makefile.in.orig	2012-10-02 11:01:03.000000000 +0000
++++ Makefile.in	2012-10-02 11:02:59.000000000 +0000
+@@ -973,12 +973,11 @@
  GLib_2_0_gir_PACKAGES = glib-2.0
  GLib_2_0_gir_CFLAGS = \
              -I$(GLIB_INCLUDEDIR) \
 -            -I$(GLIB_LIBDIR)/glib-2.0/include \
-+            -I$(GLIB_INCLUDEDIR)/.. \
              -DGETTEXT_PACKAGE=Dummy \
              -DGLIB_COMPILATION \
              -D__G_I18N_LIB_H__
  
- GLib_2_0_gir_FILES = \
--                $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
-+                $(GLIB_INCLUDEDIR)/glibconfig.h \
- 		$(GLIB_INCLUDEDIR)/glib/*.h \
- 		$(GLIB_INCLUDEDIR)/gobject/glib-types.h \
-                 gir/glib-2.0.c
+-GLib_2_0_gir_FILES = $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
++GLib_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/glibconfig.h \
+ 	$(GLIB_INCLUDEDIR)/glib/*.h \
+ 	$(GLIB_INCLUDEDIR)/gobject/glib-types.h gir/glib-2.0.c \
+ 	$(am__append_4)
diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist
index 1d554079a..2d400ec2e 100644
--- a/devel/gobject-introspection/pkg-plist
+++ b/devel/gobject-introspection/pkg-plist
@@ -50,6 +50,9 @@ lib/gobject-introspection/giscanner/annotationmain.pyo
 lib/gobject-introspection/giscanner/annotationparser.py
 lib/gobject-introspection/giscanner/annotationparser.pyc
 lib/gobject-introspection/giscanner/annotationparser.pyo
+lib/gobject-introspection/giscanner/annotationpatterns.py
+lib/gobject-introspection/giscanner/annotationpatterns.pyc
+lib/gobject-introspection/giscanner/annotationpatterns.pyo
 lib/gobject-introspection/giscanner/ast.py
 lib/gobject-introspection/giscanner/ast.pyc
 lib/gobject-introspection/giscanner/ast.pyo
-- 
cgit v1.2.3