[pkgsrc/trunk]: pkgsrc/x11/gtksourceview Fix build with glib-2.32. Set LICENS...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b42426305069
branches:  trunk
changeset: 603278:b42426305069
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu May 03 06:06:12 2012 +0000

description:
Fix build with glib-2.32. Set LICENSE while here.

diffstat:

 x11/gtksourceview/Makefile                                        |   4 +-
 x11/gtksourceview/distinfo                                        |   4 +-
 x11/gtksourceview/patches/patch-gtksourceview_gtksourcelanguage.c |  16 ++++++++++
 x11/gtksourceview/patches/patch-gtksourceview_gtksourceregex.h    |  15 +++++++++
 4 files changed, 36 insertions(+), 3 deletions(-)

diffs (72 lines):

diff -r 69b404c8a3e4 -r b42426305069 x11/gtksourceview/Makefile
--- a/x11/gtksourceview/Makefile        Thu May 03 06:03:30 2012 +0000
+++ b/x11/gtksourceview/Makefile        Thu May 03 06:06:12 2012 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2012/03/03 00:11:54 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2012/05/03 06:06:12 wiz Exp $
 #
 
 DISTNAME=      gtksourceview-1.8.5
-#PKGREVISION=  1
 PKGREVISION=   11
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtksourceview/1.8/}
@@ -11,6 +10,7 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://gtksourceview.sourceforge.net/
 COMMENT=       Text widget that extends GTK2's GtkTextView widget
+LICENSE=       gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
diff -r 69b404c8a3e4 -r b42426305069 x11/gtksourceview/distinfo
--- a/x11/gtksourceview/distinfo        Thu May 03 06:03:30 2012 +0000
+++ b/x11/gtksourceview/distinfo        Thu May 03 06:06:12 2012 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.22 2008/02/20 11:28:19 xtraeme Exp $
+$NetBSD: distinfo,v 1.23 2012/05/03 06:06:12 wiz Exp $
 
 SHA1 (gtksourceview-1.8.5.tar.bz2) = 4e61b6cda043c44dc918edecd2bd9ccfc5438d2c
 RMD160 (gtksourceview-1.8.5.tar.bz2) = 978c59d5f99baeb5d8b9c3c14246ffc48ce150f8
 Size (gtksourceview-1.8.5.tar.bz2) = 785000 bytes
+SHA1 (patch-gtksourceview_gtksourcelanguage.c) = 02fb5c56c86b67a40994c73c6138394ae4377ec5
+SHA1 (patch-gtksourceview_gtksourceregex.h) = e85e0a9d6f65dc9343c772f91dfd6fdb024a824c
diff -r 69b404c8a3e4 -r b42426305069 x11/gtksourceview/patches/patch-gtksourceview_gtksourcelanguage.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gtksourceview/patches/patch-gtksourceview_gtksourcelanguage.c Thu May 03 06:06:12 2012 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-gtksourceview_gtksourcelanguage.c,v 1.1 2012/05/03 06:06:13 wiz Exp $
+
+Adapt for glib-2.32.
+
+--- gtksourceview/gtksourcelanguage.c.orig     2007-01-03 15:40:28.000000000 +0000
++++ gtksourceview/gtksourcelanguage.c
+@@ -30,8 +30,7 @@
+ 
+ #include <libxml/xmlreader.h>
+ 
+-#include <glib/gstdio.h>
+-#include <glib/gmappedfile.h>
++#include <glib.h>
+ 
+ #include "gtksourceview-i18n.h"
+ 
diff -r 69b404c8a3e4 -r b42426305069 x11/gtksourceview/patches/patch-gtksourceview_gtksourceregex.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gtksourceview/patches/patch-gtksourceview_gtksourceregex.h    Thu May 03 06:06:12 2012 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-gtksourceview_gtksourceregex.h,v 1.1 2012/05/03 06:06:13 wiz Exp $
+
+Adapt for glib-2.32.
+
+--- gtksourceview/gtksourceregex.h.orig        2007-01-03 15:40:28.000000000 +0000
++++ gtksourceview/gtksourceregex.h
+@@ -20,7 +20,7 @@
+ #ifndef __GTK_SOURCE_REGEX_H__
+ #define __GTK_SOURCE_REGEX_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+