Update clutter-gtk to 1.4.4, switch to gtk3.

Clutter-GTK 1.4.4                                                    19/03/2013
===============================================================================

Changes since 1.4.2:
        • Bump the dependency on GTK, to remove a workaround for broken state
          propagation in the style code.
        • Bump the dependency on Clutter, to enable using the accessibility
          support in GTK without conflicting with the one in Clutter.
        • Improve the multi-backend support, to prepare ourselves for the
          shiny Wayland future.

List of bugs fixed:
        #691468, #695685, #692399

Many thanks to:
  Bastien Nocera, Cosimo Cecchi, Alejandro Piñeiro

Clutter-GTK 1.4.2                                                    17/12/2012
===============================================================================

Changes since 1.4.0:
        • Remove annotation from constructor function. [Guillaume Desmottes]
        • Ensure the event filter installed by GtkClutterEmbed works correctly
          when multiple embeds are realized/unrealized. [Cosimo Cecchi]
        • Fix links in the DOAP file.

List of bugs fixed:
        #686697, #689879

Many thanks to:
  Guillaume Desmottes, Cosimo Cecchi

Clutter-GTK 1.4.0                                                    17/10/2012
===============================================================================

Changes since 1.3.2:
        • Drop deprecated Clutter API usage from classes and examples.
        • Ensure that GtkClutterEmbed works with GTK+ < 3.4.
        • Documentation fixes.
        • Track the size requests from the embedded ClutterStage. [Tristan Van
          Berkom]
        • Translation updates.

List of bugs fixed:
        #681462, #669877, #684171

Many thanks to:
  Piotr Drąg, Takeshi AIHANA, Tristan Van Berkom

Clutter-GTK 1.3.2                                                    05/06/2012
===============================================================================

Changes since 1.2:
        • Ensure that redraws follow resizing, to avoid the contents of the
          Stage "lagging" behind. [Alexander Larsson]
        • Allow GtkClutterEmbed to use the embedded stage layout manager to
          request its size. [Alexander Larsson]
        • Avoid warnings when hiding or removing GtkWidgets embedded inside
          a GtkClutterActor. [Bastien Nocera, Alexander Larsson]
        • Make GtkClutterActor reactive by default. [Alexander Larsson]

List of bugs fixed:
        #675867, #677282, #677493

Many thanks to:
  Alexander Larsson, Bastien Nocera, Colin Walters

Clutter-GTK 1.2.0                                                    23/03/2012
===============================================================================

Changes since 1.1.2:
        • Ensure that style changes are propagated to embedded widgets
        • Avoid segfaults when unrealizing.
        • Introspection fixes.

List of bugs fixed:
        #670662 - Gtk-CRITICAL **: gtk_widget_unrealize: assertion
                  `GTK_IS_WIDGET (widget)' failed
        #667742 - entries argument of gtk_clutter_init_with_args not
                  annotated as array

Many thanks to:
  Cosimo Cecchi, Evan Nemerson, Guillaume Desmottes, Ryan Lortie

Clutter-GTK 1.1.2                                                    23/11/2011
===============================================================================

Changes since 1.0:

        • Drop all flavours
        Since Clutter 1.9 and GTK+ 3.0 support multiple backends with
        selection at run-time, Clutter-GTK can drop the multiple flavours,
        and support the current Clutter and GDK backend. This is still a
        work in progress, so not every Clutter or GDK backend provide the
        same set of features. Basic Clutter embedding works with the X11,
        GDK, and Windows backends. GTK+ widgets embedding inside Clutter
        works only on the X11 backend.

        • Do not disable multi-device
        Clutter was fixed to support XI2 events coming from GDK without
        destroying the event cookie; this means that Clutter-GTK can
        stop disabling multi-device support in GDK. If your code was
        calling gdk_disable_multi_device() (something that shouldn't have
        been done in the first place) this means that event handling
        will be broken.

        • Make GtkClutterEmbed expand by default
        The GtkClutterEmbed widget should expand by default on both#
        orientations; this allows using the default size negotiation
        mechanisms in GTK, and drop the hack of setting a minimum size
        on the widget.

Many thanks to:

  Marc-André Lureau, Matthias Clasen

Clutter-GTK 1.0.4                                                    27/09/2011
===============================================================================

Changes since 1.0.2:

        • Build fixes
          - Link against libm [Andre Klapper, Frédéric Péters]
          - Fix build on non-X11 systems [Chun-wei Fan]
          - Fix out of tree builds [Colin Walters]

Clutter-GTK 1.0.2                                                    26/07/2011
===============================================================================

Changes since 1.0.0:

        • Build fixes

        • Make sure that GtkClutterActor works with GTK+ ≥ 3.1 [Cosimo Cecchi]

        • Check before unmapping the stage [Raluca Elena Podiuc]

        • Fix for introspection annotations [Simon Wenner]

Clutter-GTK 1.0.0                                                    05/04/2011
===============================================================================

Changes since 0.91.8:

        • Depend on gtk+ ≥ 3.0.0.

        • Depend on clutter ≥ 1.4.0.

        • Fix build for GLES environments. [Andreas Mueller]

        • Use a global filter for GDK events.

        • Fix various compiler warnings.

        • Allow calling gtk_clutter_init* multiple times.

        • Fix build on Windows.

        • Append the API version to the API reference. [Marvin Schmidt]

        • Do not export private symbols from the shared
          library. [Emilio Pozuelo Monfort]

Clutter-GTK 0.91.8                                                   14/01/2011
===============================================================================

Changes since 0.91.6:

        • Depend on gtk+ ≥ 2.91.7.

        • Disable multi-device support in GDK to unbreak the event
          filter function we use to dispatch events from GDK to
          Clutter.

        • Update to the new StyleContext API.

        • Remove the GdkColor/GtkStyle/ClutterColor utility API: the
          old GtkStyle colors have been deprecated in GTK+.

        • Use gettext to localize messages.

Clutter-GTK 0.91.6                                                   22/12/2010
===============================================================================

Changes since 0.91.4:

        • General clean up of the code.

        • Introspection fixes.

        • Moved the texture integration with gtk+ types into a separate
          class, GtkClutterTexture.

        • Fixes to work with gtk+ ≥ 2.91.7.

        • Added translation domain.

Clutter-GTK 0.91.4                                                   11/11/2010
===============================================================================

Changes since 0.91.2:

        • Update after the removal of gtk_widget_hide_all()
          http://bugzilla.clutter-project.org/show_bug.cgi?id=2377

Many thanks to:

  Flo Gravo

Clutter-GTK 0.91.2                                                   05/10/2010
===============================================================================

Changes since 0.90.2:

        • Depend on gtk+ ≥ 2.91.1

        • Use cairo surfaces to replace the deprecated GdkPixmap.

        • Remove GdkColormap.

        • Use GtkWidget instead of GtkSizeRequest.

        • Introspection and build fixes.

Many thanks to:

  Lucas Rocha

Clutter-GTK 0.90.2                                                   09/08/2010
===============================================================================

Changes since 0.10:

        • Depend on Clutter 1.3 and GTK+ 2.90, in preparation for the
          1.4 and 3.0 cycles, respectively.

        • Allow embedding GTK+ widgets inside the ClutterStage provided
          by GtkClutterEmbed.

        • Whenever possible, use a GDK filter function to let Clutter
          update its internal state.

        • Allow retrieving the GOptionGroup for Clutter-GTK, to defer
          the initialization.

        • Remove GtkClutterScrollable and GtkClutterViewport.

Many thanks to:

  Danielle Madeley
  Alexander Larsson
  Christian Persch
  Gord Allott
  Gustavo Noronha Silva
  Javier Jardón

7 files changed, 66 insertions, 71 deletions

diff --git a/graphics/clutter-gtk/DESCR b/graphics/clutter-gtk/DESCR
index 448be1084a5..41f451dfccc 100644
--- a/graphics/clutter-gtk/DESCR
+++ b/graphics/clutter-gtk/DESCR
@@ -1,3 +1,6 @@
 Clutter-GTK is a library providing facilities to integrate Clutter into GTK+
-applications. It provides a GTK+ widget, GtkClutterEmbed, for embedding the
-default ClutterStage into any GtkContainer.
+applications and vice versa.
+
+Clutter-GTK provides a GTK+ widget, GtkClutterEmbed, for embedding the
+a Clutter stage into any GtkContainer; and GtkClutterActor, a Clutter
+actor for embedding any GtkWidget inside a Clutter stage.
diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile
index 3d8560355ff..b624dbb9346 100644
--- a/graphics/clutter-gtk/Makefile
+++ b/graphics/clutter-gtk/Makefile
@@ -1,31 +1,32 @@
-# $NetBSD: Makefile,v 1.31 2014/01/03 12:36:30 obache Exp $
+# $NetBSD: Makefile,v 1.32 2014/01/04 13:47:38 obache Exp $
 #
 
-DISTNAME=	clutter-gtk-0.10.8
-PKGREVISION=	17
+DISTNAME=	clutter-gtk-1.4.4
 CATEGORIES=	graphics
-MASTER_SITES=	http://source.clutter-project.org/sources/clutter-gtk/0.10/
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/clutter-gtk/${PKGVERSION:R}/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.clutter-project.org/
+HOMEPAGE=	https://wiki.gnome.org/Projects/Clutter
 COMMENT=	GTK+ Integration library for Clutter
 LICENSE=	gnu-lgpl-v2.1
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
+USE_PKGLOCALEDIR=	yes
 
 PKGCONFIG_OVERRIDE+=	clutter-gtk.pc.in
 
 .include "options.mk"
 
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.19.5
-.include "../../x11/gtk2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.clutter+=	clutter>=1.2.0
+BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.6.0
+.include "../../x11/gtk3/buildlink3.mk"
+BUILDLINK_API_DEPENDS.clutter+=	clutter>=1.13.7
 .include "../../graphics/clutter/buildlink3.mk"
 .if !empty(PKG_BUILD_OPTIONS.clutter:Mx11)
-CONFIGURE_ARGS+=	--with-flavour=x11
 .else
 PKG_FAIL_REASON+=	Require Clutter with X11 backend
 .endif
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/clutter-gtk/PLIST b/graphics/clutter-gtk/PLIST
index e31551c5072..b788ed3be96 100644
--- a/graphics/clutter-gtk/PLIST
+++ b/graphics/clutter-gtk/PLIST
@@ -1,36 +1,40 @@
-@comment $NetBSD: PLIST,v 1.4 2013/07/15 01:33:09 obache Exp $
-include/clutter-1.0/clutter-gtk/clutter-gtk.h
-include/clutter-1.0/clutter-gtk/gtk-clutter-embed.h
-include/clutter-1.0/clutter-gtk/gtk-clutter-scrollable.h
-include/clutter-1.0/clutter-gtk/gtk-clutter-util.h
-include/clutter-1.0/clutter-gtk/gtk-clutter-viewport.h
-include/clutter-1.0/clutter-gtk/gtk-clutter-zoomable.h
-${PLIST.introspection}lib/girepository-1.0/GtkClutter-0.10.typelib
-lib/libclutter-gtk-0.10.la
-lib/pkgconfig/clutter-gtk-0.10.pc
-${PLIST.introspection}share/gir-1.0/GtkClutter-0.10.gir
-share/gtk-doc/html/clutter-gtk/GtkClutterEmbed.html
-share/gtk-doc/html/clutter-gtk/GtkClutterScrollable.html
-share/gtk-doc/html/clutter-gtk/GtkClutterViewport.html
-share/gtk-doc/html/clutter-gtk/GtkClutterZoomable.html
-share/gtk-doc/html/clutter-gtk/ch01.html
-share/gtk-doc/html/clutter-gtk/ch02.html
-share/gtk-doc/html/clutter-gtk/ch03.html
-share/gtk-doc/html/clutter-gtk/ch04.html
-share/gtk-doc/html/clutter-gtk/clutter-gtk-Utility-Functions.html
-share/gtk-doc/html/clutter-gtk/clutter-gtk.devhelp
-share/gtk-doc/html/clutter-gtk/clutter-gtk.devhelp2
-share/gtk-doc/html/clutter-gtk/home.png
-share/gtk-doc/html/clutter-gtk/index.html
-share/gtk-doc/html/clutter-gtk/index.sgml
-share/gtk-doc/html/clutter-gtk/ix01.html
-share/gtk-doc/html/clutter-gtk/ix02.html
-share/gtk-doc/html/clutter-gtk/ix03.html
-share/gtk-doc/html/clutter-gtk/ix04.html
-share/gtk-doc/html/clutter-gtk/ix05.html
-share/gtk-doc/html/clutter-gtk/ix06.html
-share/gtk-doc/html/clutter-gtk/left.png
-share/gtk-doc/html/clutter-gtk/license.html
-share/gtk-doc/html/clutter-gtk/right.png
-share/gtk-doc/html/clutter-gtk/style.css
-share/gtk-doc/html/clutter-gtk/up.png
+@comment $NetBSD: PLIST,v 1.5 2014/01/04 13:47:38 obache Exp $
+include/clutter-gtk-1.0/clutter-gtk/clutter-gtk.h
+include/clutter-gtk-1.0/clutter-gtk/gtk-clutter-actor.h
+include/clutter-gtk-1.0/clutter-gtk/gtk-clutter-embed.h
+include/clutter-gtk-1.0/clutter-gtk/gtk-clutter-texture.h
+include/clutter-gtk-1.0/clutter-gtk/gtk-clutter-util.h
+include/clutter-gtk-1.0/clutter-gtk/gtk-clutter-version.h
+include/clutter-gtk-1.0/clutter-gtk/gtk-clutter-window.h
+${PLIST.introspection}lib/girepository-1.0/GtkClutter-1.0.typelib
+lib/libclutter-gtk-1.0.la
+lib/pkgconfig/clutter-gtk-1.0.pc
+${PLIST.introspection}share/gir-1.0/GtkClutter-1.0.gir
+share/gtk-doc/html/clutter-gtk-1.0/GtkClutterActor.html
+share/gtk-doc/html/clutter-gtk-1.0/GtkClutterEmbed.html
+share/gtk-doc/html/clutter-gtk-1.0/GtkClutterWindow.html
+share/gtk-doc/html/clutter-gtk-1.0/annotation-glossary.html
+share/gtk-doc/html/clutter-gtk-1.0/ch01.html
+share/gtk-doc/html/clutter-gtk-1.0/ch02.html
+share/gtk-doc/html/clutter-gtk-1.0/ch03.html
+share/gtk-doc/html/clutter-gtk-1.0/clutter-gtk-1.0-Utility-Functions.html
+share/gtk-doc/html/clutter-gtk-1.0/clutter-gtk-1.0.devhelp2
+share/gtk-doc/html/clutter-gtk-1.0/cluttergtk-glossary.html
+share/gtk-doc/html/clutter-gtk-1.0/cluttergtk-object-hierarchy.html
+share/gtk-doc/html/clutter-gtk-1.0/cluttergtk-object-index.html
+share/gtk-doc/html/clutter-gtk-1.0/cluttergtk-objects.html
+share/gtk-doc/html/clutter-gtk-1.0/home.png
+share/gtk-doc/html/clutter-gtk-1.0/index.html
+share/gtk-doc/html/clutter-gtk-1.0/index.sgml
+share/gtk-doc/html/clutter-gtk-1.0/ix01.html
+share/gtk-doc/html/clutter-gtk-1.0/ix02.html
+share/gtk-doc/html/clutter-gtk-1.0/ix03.html
+share/gtk-doc/html/clutter-gtk-1.0/ix04.html
+share/gtk-doc/html/clutter-gtk-1.0/left.png
+share/gtk-doc/html/clutter-gtk-1.0/license.html
+share/gtk-doc/html/clutter-gtk-1.0/right.png
+share/gtk-doc/html/clutter-gtk-1.0/style.css
+share/gtk-doc/html/clutter-gtk-1.0/up.png
+share/locale/ja/LC_MESSAGES/cluttergtk-1.0.mo
+share/locale/pl/LC_MESSAGES/cluttergtk-1.0.mo
+share/locale/zh_CN/LC_MESSAGES/cluttergtk-1.0.mo
diff --git a/graphics/clutter-gtk/buildlink3.mk b/graphics/clutter-gtk/buildlink3.mk
index 47ef9346e0c..bd37ecb656e 100644
--- a/graphics/clutter-gtk/buildlink3.mk
+++ b/graphics/clutter-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2014/01/03 12:36:30 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2014/01/04 13:47:38 obache Exp $
 #
 
 BUILDLINK_TREE+=	clutter-gtk
@@ -6,11 +6,11 @@ BUILDLINK_TREE+=	clutter-gtk
 .if !defined(CLUTTER_GTK_BUILDLINK3_MK)
 CLUTTER_GTK_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.clutter-gtk+=	clutter-gtk>=0.10.0
-BUILDLINK_ABI_DEPENDS.clutter-gtk+=	clutter-gtk>=0.10.8nb17
+BUILDLINK_API_DEPENDS.clutter-gtk+=	clutter-gtk>=1.0
+BUILDLINK_ABI_DEPENDS.clutter-gtk+=	clutter-gtk>=1.4.4
 BUILDLINK_PKGSRCDIR.clutter-gtk?=	../../graphics/clutter-gtk
 
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../graphics/clutter/buildlink3.mk"
 .endif # CLUTTER_GTK_BUILDLINK3_MK
 
diff --git a/graphics/clutter-gtk/distinfo b/graphics/clutter-gtk/distinfo
index e1abb99fd3b..e596d13ece4 100644
--- a/graphics/clutter-gtk/distinfo
+++ b/graphics/clutter-gtk/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2012/02/02 17:27:19 drochner Exp $
+$NetBSD: distinfo,v 1.8 2014/01/04 13:47:38 obache Exp $
 
-SHA1 (clutter-gtk-0.10.8.tar.gz) = 91dc92c06ab6feff4d99d3bf5cce374c48a2f14b
-RMD160 (clutter-gtk-0.10.8.tar.gz) = 6c24adcd11029d8d5172af28a9429238d009b9b4
-Size (clutter-gtk-0.10.8.tar.gz) = 391461 bytes
-SHA1 (patch-aa) = c7caf95a3a361370193f3810904a62de2d1d7048
+SHA1 (clutter-gtk-1.4.4.tar.xz) = 15fa002070671eca0f14e2b7c9c0580b6393f14d
+RMD160 (clutter-gtk-1.4.4.tar.xz) = 153055783b91dd9487e264cc4198c8b2fc7e438c
+Size (clutter-gtk-1.4.4.tar.xz) = 311192 bytes
diff --git a/graphics/clutter-gtk/options.mk b/graphics/clutter-gtk/options.mk
index 50f1339e54d..50d7b384276 100644
--- a/graphics/clutter-gtk/options.mk
+++ b/graphics/clutter-gtk/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.1 2013/07/15 01:33:09 obache Exp $
+# $NetBSD: options.mk,v 1.2 2014/01/04 13:47:38 obache Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.clutter-gtk
 PKG_SUPPORTED_OPTIONS=	introspection
-PKG_SUGGESTED_OPTIONS=	
+PKG_SUGGESTED_OPTIONS=	introspection
 
 .include "../../mk/bsd.options.mk"
 
@@ -12,7 +12,7 @@ PLIST_VARS+=	introspection
 .if !empty(PKG_OPTIONS:Mintrospection)
 USE_TOOLS+=		gmake
 PLIST.introspection=	yes
-BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.9.3
+BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.9.12
 BUILDLINK_DEPMETHOD.gobject-introspection+=	build
 .include "../../devel/gobject-introspection/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-introspection=yes
diff --git a/graphics/clutter-gtk/patches/patch-aa b/graphics/clutter-gtk/patches/patch-aa
deleted file mode 100644
index d58a364dbb5..00000000000
--- a/graphics/clutter-gtk/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2012/02/02 17:27:19 drochner Exp $
-
---- clutter-gtk/Makefile.in.orig	2010-09-16 13:50:05.000000000 +0000
-+++ clutter-gtk/Makefile.in
-@@ -281,7 +281,6 @@ AM_CPPFLAGS = \
- 	-DPREFIX=\""$(prefix)"\" 		\
- 	-DLIBDIR=\""$(libdir)"\" 		\
-         -DCLUTTER_GTK_COMPILATION               \
--        -DG_DISABLE_DEPRECATED                  \
-         -DGDK_PIXBUF_DISABLE_DEPRECATED         \
-         -DGDK_DISABLE_DEPRECATED                \
-         -DGTK_DISABLE_DEPRECATED                \