Update to 2.16.2. All patches were from upstream (or perhaps

accepted).

Add one new patch to avoid including glib sub-headers, just sent
upstream.


guile-gnome-platform 2.16.2 -- 2012-09-05
=========================================

[bug fixes omitted -gdt]

packaging changes
-----------------
* If Guile is new enough, tab completion at the REPL will cause all
  "latent" bindings to become present.  This makes it easier to explore
  the API.

gtk
---
* Add overrides with parameter annotations for methods of
  GtkPrintOperation (bug #603211).  Thanks to Patrick Bernaud.

* Add wrapper for gtk_tree_view_get_path_at_pos().  Thanks to Patrick
  Bernaud.

* The GtkTextBuffer API now uses UTF-8 for Guile 2.0.  Thanks to Mark
  Weaver.  There is more work to do regarding UTF-8 and Guile 2.0,
  though.

10 files changed, 23 insertions, 122 deletions

diff --git a/devel/guile-gnome/Makefile b/devel/guile-gnome/Makefile
index d2d39b22d4f..b2bcb7cdab8 100644
--- a/devel/guile-gnome/Makefile
+++ b/devel/guile-gnome/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2015/04/25 14:20:34 tnn Exp $
+# $NetBSD: Makefile,v 1.49 2015/06/07 12:02:22 gdt Exp $
 
-DISTNAME=	guile-gnome-platform-2.16.1
-PKGREVISION=	34
+DISTNAME=	guile-gnome-platform-2.16.2
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.gnu.org/gnu/guile-gnome/guile-gnome-platform/
 
diff --git a/devel/guile-gnome/distinfo b/devel/guile-gnome/distinfo
index 83d8dc66c8d..52c6ccb91fe 100644
--- a/devel/guile-gnome/distinfo
+++ b/devel/guile-gnome/distinfo
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.7 2012/05/05 15:00:49 dholland Exp $
+$NetBSD: distinfo,v 1.8 2015/06/07 12:02:22 gdt Exp $
 
-SHA1 (guile-gnome-platform-2.16.1.tar.gz) = 3cf7cc8de6f261e6cf48d34e691706fe4b7f1061
-RMD160 (guile-gnome-platform-2.16.1.tar.gz) = 4723f091e015c4fca6986c48fa143e7fd3070631
-Size (guile-gnome-platform-2.16.1.tar.gz) = 3494333 bytes
-SHA1 (patch-aa) = 6343a2d81e9f2747250f231beee376c21ba3bfb5
-SHA1 (patch-ab) = bcfc2cf7eccbef8c17db683a7fbbdef7b05c9d42
-SHA1 (patch-ac) = 7409fd75f94ec0a59b94939853b41b85e1a69768
-SHA1 (patch-corba_gnome_corba_Makefile.in) = 52e00564e2d246e78e82787809706aa7c7e44523
-SHA1 (patch-corba_gnome_corba_guile-gnome-corba-generic_c) = bb45658f0edb43c0b34c43fb66ebb881904db4cb
-SHA1 (patch-glib_gnome_gobject_Makefile.in) = 83a5533d70e36bb55476661af066e0ceaf13c1f0
-SHA1 (patch-glib_gnome_gobject_guile-support_h) = be6e66f594e1f0518853a9cf688259507025bf46
+SHA1 (guile-gnome-platform-2.16.2.tar.gz) = a53d9a2a82ae83b07d6b47bfbfb7f7005cdfc4b3
+RMD160 (guile-gnome-platform-2.16.2.tar.gz) = ef953cd928aa9b4dc410b7fce2dcac1790897c06
+Size (guile-gnome-platform-2.16.2.tar.gz) = 2538191 bytes
+SHA1 (patch-glib_gnome_gobject_guile-support.h) = a2ee021c9d89c2c3d8b2b7e0d5ab363e9d7ee565
diff --git a/devel/guile-gnome/patches/patch-aa b/devel/guile-gnome/patches/patch-aa
deleted file mode 100644
index 0942cfe453c..00000000000
--- a/devel/guile-gnome/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2011/05/13 02:50:06 dmcmahill Exp $
-
-Upstream patch from http://bugzilla-attachments.gnome.org/attachment.cgi?id=148640
-
---- gtk/gnome/gw/gtk-support.c.orig	2008-07-03 14:52:27.000000000 +0000
-+++ gtk/gnome/gw/gtk-support.c
-@@ -1012,10 +1012,14 @@ gtk_widget_get_window (GtkWidget *widget
- }
- 
- GdkRectangle*
--gtk_widget_get_allocation (GtkWidget *widget)
-+_wrap_gtk_widget_get_allocation (GtkWidget *widget)
- {
-     GdkRectangle *ret = g_new (GdkRectangle, 1);
-+#if GTK_CHECK_VERSION(2,18,0)
-+    gtk_widget_get_allocation (widget, (GtkAllocation*)ret);
-+#else
-     *ret = widget->allocation;
-+#endif
-     return ret;
- }
- 
diff --git a/devel/guile-gnome/patches/patch-ab b/devel/guile-gnome/patches/patch-ab
deleted file mode 100644
index 2296040cf94..00000000000
--- a/devel/guile-gnome/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2011/05/13 02:50:06 dmcmahill Exp $
-
-Upstream patch from http://bugzilla-attachments.gnome.org/attachment.cgi?id=148640
-
---- gtk/gnome/gw/gtk-support.h.orig	2008-04-09 22:10:40.000000000 +0000
-+++ gtk/gnome/gw/gtk-support.h
-@@ -117,6 +117,6 @@ void _wrap_gtk_tree_view_column_set_cell
- guint _wrap_gtk_ui_manager_add_ui_from_string (GtkUIManager *ui, const gchar *string, GError **error);
- 
- GdkWindow* gtk_widget_get_window (GtkWidget *widget);
--GdkRectangle* gtk_widget_get_allocation (GtkWidget *widget);
-+GdkRectangle* _wrap_gtk_widget_get_allocation (GtkWidget *widget);
- void _wrap_gtk_drag_dest_set (GtkWidget *widget, GtkDestDefaults flags, const GList *types, GdkDragAction actions);
- GtkStateType gtk_widget_get_state (GtkWidget *widget);
diff --git a/devel/guile-gnome/patches/patch-ac b/devel/guile-gnome/patches/patch-ac
deleted file mode 100644
index 3bd5fac4ee6..00000000000
--- a/devel/guile-gnome/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2011/05/13 02:50:06 dmcmahill Exp $
-
-Upstream patch from http://bugzilla-attachments.gnome.org/attachment.cgi?id=148640
-
---- gtk/gnome/overrides/gtk.defs.orig	2008-04-09 22:12:44.000000000 +0000
-+++ gtk/gnome/overrides/gtk.defs
-@@ -848,7 +848,8 @@
- 
- (define-method get-allocation
-   (of-object "GtkWidget")
--  (c-name "gtk_widget_get_allocation")
-+  (c-name "_wrap_gtk_widget_get_allocation")
-+  (overrides "gtk_widget_get_allocation")
-   (return-type "GdkRectangle*")) ;; same as GtkAllocation
- 
- (define-method get_state
diff --git a/devel/guile-gnome/patches/patch-corba_gnome_corba_Makefile.in b/devel/guile-gnome/patches/patch-corba_gnome_corba_Makefile.in
deleted file mode 100644
index faef9371dcc..00000000000
--- a/devel/guile-gnome/patches/patch-corba_gnome_corba_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-corba_gnome_corba_Makefile.in,v 1.1 2012/05/04 13:15:18 hans Exp $
-
---- corba/gnome/corba/Makefile.in.orig	2008-07-03 17:18:02.000000000 +0200
-+++ corba/gnome/corba/Makefile.in	2012-05-03 17:10:49.783244723 +0200
-@@ -693,7 +693,7 @@ export GUILE_LOAD_PATH
- 	|| { rm $@; false; }
- .c.doc:
- 	$(CPP) -DSCM_MAGIC_SNARF_DOCS $(GUILE_SNARF_CFLAGS) $< \
--	  | grep -E '^\^\^ {.*\^\^ }' > $@ || { rm $@; false; }
-+	  | grep -E '(\^\^ {|\^\^ })' > $@ || { rm $@; false; }
- 
- %.scm guile-gnome-gw-%.c: %-spec.scm
- 	guile $(GUILE_FLAGS) -c \
diff --git a/devel/guile-gnome/patches/patch-corba_gnome_corba_guile-gnome-corba-generic_c b/devel/guile-gnome/patches/patch-corba_gnome_corba_guile-gnome-corba-generic_c
deleted file mode 100644
index fd2012992e0..00000000000
--- a/devel/guile-gnome/patches/patch-corba_gnome_corba_guile-gnome-corba-generic_c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-corba_gnome_corba_guile-gnome-corba-generic_c,v 1.1 2012/05/05 15:00:49 dholland Exp $
-
-Fix build with latest glib2.
-
---- corba/gnome/corba/guile-gnome-corba-generic.c~	2007-05-20 16:39:16.000000000 +0000
-+++ corba/gnome/corba/guile-gnome-corba-generic.c
-@@ -24,7 +24,7 @@
- 
- #include <guile-gnome-corba-generic.h>
- #include <guile-gnome-gobject.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <string.h>
- 
- static GQuark quark_corba_typecode = 0;
diff --git a/devel/guile-gnome/patches/patch-glib_gnome_gobject_Makefile.in b/devel/guile-gnome/patches/patch-glib_gnome_gobject_Makefile.in
deleted file mode 100644
index ef0284ced21..00000000000
--- a/devel/guile-gnome/patches/patch-glib_gnome_gobject_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-glib_gnome_gobject_Makefile.in,v 1.1 2012/05/04 13:15:18 hans Exp $
-
---- glib/gnome/gobject/Makefile.in.orig	2008-07-03 17:18:05.000000000 +0200
-+++ glib/gnome/gobject/Makefile.in	2012-05-03 16:48:27.192315854 +0200
-@@ -770,7 +770,7 @@ export GUILE_LOAD_PATH
- 	|| { rm $@; false; }
- .c.doc:
- 	$(CPP) -DSCM_MAGIC_SNARF_DOCS $(GUILE_SNARF_CFLAGS) $< \
--	  | grep -E '^\^\^ {.*\^\^ }' > $@ || { rm $@; false; }
-+	  | grep -E '(\^\^ {|\^\^ })' > $@ || { rm $@; false; }
- 
- %.scm guile-gnome-gw-%.c: %-spec.scm
- 	guile $(GUILE_FLAGS) -c \
diff --git a/devel/guile-gnome/patches/patch-glib_gnome_gobject_guile-support.h b/devel/guile-gnome/patches/patch-glib_gnome_gobject_guile-support.h
new file mode 100644
index 00000000000..1d121cc2dc8
--- /dev/null
+++ b/devel/guile-gnome/patches/patch-glib_gnome_gobject_guile-support.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-glib_gnome_gobject_guile-support.h,v 1.1 2015/06/07 12:02:22 gdt Exp $
+
+Modern glib objects to direct inclusion of any sub-headers.
+This patch was sent upstream on 20150607.
+
+--- glib/gnome/gobject/guile-support.h.orig	2012-05-07 15:29:35.000000000 +0000
++++ glib/gnome/gobject/guile-support.h
+@@ -24,7 +24,7 @@
+ #ifndef __GUILE_SUPPORT_H__
+ #define __GUILE_SUPPORT_H__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ #include <libguile.h>
+ 
diff --git a/devel/guile-gnome/patches/patch-glib_gnome_gobject_guile-support_h b/devel/guile-gnome/patches/patch-glib_gnome_gobject_guile-support_h
deleted file mode 100644
index 38cb07ab645..00000000000
--- a/devel/guile-gnome/patches/patch-glib_gnome_gobject_guile-support_h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-glib_gnome_gobject_guile-support_h,v 1.1 2012/05/05 15:00:49 dholland Exp $
-
-Fix build with latest glib2.
-
---- glib/gnome/gobject/guile-support.h~	2008-04-24 10:10:14.000000000 +0000
-+++ glib/gnome/gobject/guile-support.h
-@@ -24,7 +24,7 @@
- #ifndef __GUILE_SUPPORT_H__
- #define __GUILE_SUPPORT_H__
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- #include <libguile.h>
-