Fix build with newest gtk3 and libpeas 0.7.2.

Obtained from: Totem git


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15230 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 122 insertions, 2 deletions

diff --git a/multimedia/totem3/Makefile b/multimedia/totem3/Makefile
index 447fb0572..d8b8c20df 100644
--- a/multimedia/totem3/Makefile
+++ b/multimedia/totem3/Makefile
@@ -3,12 +3,12 @@
 # Whom:                 Hendrik Scholz <hendrik@scholz.net>
 #
 # $FreeBSD$
-#   $MCom: ports/multimedia/totem3/Makefile,v 1.3 2011/01/30 12:52:58 kwm Exp $
+#   $MCom: ports/multimedia/totem3/Makefile,v 1.4 2011/02/02 19:55:45 kwm Exp $
 #
 
 PORTNAME=	totem
 PORTVERSION=	2.91.6
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/multimedia/totem3/files/patch-gtk b/multimedia/totem3/files/patch-gtk
new file mode 100644
index 000000000..941b8d84c
--- /dev/null
+++ b/multimedia/totem3/files/patch-gtk
@@ -0,0 +1,92 @@
+diff --git a/browser-plugin/totem-plugin-viewer.c b/browser-plugin/totem-plugin-viewer.c
+index 3b6e2da..8f63842 100644
+--- browser-plugin/totem-plugin-viewer.c
++++ browser-plugin/totem-plugin-viewer.c
+@@ -33,7 +33,7 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+-#include <gdk/gdkx.h>
++#include <gtk/gtkx.h>
+ #include <gtk/gtk.h>
+ 
+ #include <gdk/gdk.h>
+@@ -1797,7 +1797,7 @@ totem_embedded_key_press_event (GtkWidget *widget, GdkEventKey *event,
+ 
+ static gboolean
+ totem_embedded_construct (TotemEmbedded *emb,
+-			  GdkNativeWindow xid,
++			  Window xid,
+ 			  int width,
+ 			  int height)
+ {
+@@ -2086,7 +2086,7 @@ totem_embedded_set_window (TotemEmbedded *embedded,
+ 	embedded->width = width;
+ 	embedded->height = height;
+ 
+-	totem_embedded_construct (embedded, (GdkNativeWindow) window,
++	totem_embedded_construct (embedded, (Window) window,
+ 				  width, height);
+ 
+ 	return TRUE;
+diff --git a/src/backend/bacon-video-widget-gst-missing-plugins.c b/src/backend/bacon-video-widget-gst-missing-plugins.c
+index bb874ca..f91c58f 100644
+--- src/backend/bacon-video-widget-gst-missing-plugins.c
++++ src/backend/bacon-video-widget-gst-missing-plugins.c
+@@ -35,7 +35,7 @@
+ #include <gtk/gtk.h>
+ 
+ #ifdef GDK_WINDOWING_X11
+-#include <gdk/gdkx.h>
++#include <gtk/gtkx.h>
+ #endif
+ 
+ #include <string.h>
+@@ -57,12 +57,12 @@ TotemCodecInstallContext;
+ 
+ #ifdef GDK_WINDOWING_X11
+ /* Adapted from totem-interface.c */
+-static GdkNativeWindow
++static Window
+ bacon_video_widget_gtk_plug_get_toplevel (GtkPlug *plug)
+ {
+ 	Window root, parent, *children;
+ 	guint nchildren;
+-	GdkNativeWindow xid;
++	Window xid;
+ 
+ 	g_return_val_if_fail (GTK_IS_PLUG (plug), 0);
+ 
+@@ -86,7 +86,7 @@ bacon_video_widget_gtk_plug_get_toplevel (GtkPlug *plug)
+ 	while (TRUE);
+ }
+ 
+-static GdkNativeWindow
++static Window
+ bacon_video_widget_gst_get_toplevel (GtkWidget *widget)
+ {
+ 	GtkWidget *parent;
+diff --git a/src/totem-interface.c b/src/totem-interface.c
+index 5d2b42d..a17fef5 100644
+--- src/totem-interface.c
++++ src/totem-interface.c
+@@ -43,7 +43,7 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+-#include <gdk/gdkx.h>
++#include <gtk/gtkx.h>
+ 
+ #include "totem-interface.h"
+ 
+@@ -293,7 +293,7 @@ totem_gtk_plug_get_toplevel (GtkPlug *plug)
+ {
+ 	Window root, parent, *children;
+ 	guint nchildren;
+-	GdkNativeWindow xid;
++	Window xid;
+ 
+ 	g_return_val_if_fail (GTK_IS_PLUG (plug), NULL);
+ 
+--
+cgit v0.8.3.1
diff --git a/multimedia/totem3/files/patch-libpeas b/multimedia/totem3/files/patch-libpeas
new file mode 100644
index 000000000..e6948b436
--- /dev/null
+++ b/multimedia/totem3/files/patch-libpeas
@@ -0,0 +1,28 @@
+diff --git a/src/plugins/totem-plugins-engine.c b/src/plugins/totem-plugins-engine.c
+index cdff0bf..4518fe2 100644
+--- src/plugins/totem-plugins-engine.c
++++ src/plugins/totem-plugins-engine.c
+@@ -120,6 +120,8 @@ totem_plugins_engine_get_default (TotemObject *totem)
+ 	}
+ 	g_strfreev (paths);
+ 
++	peas_engine_enable_loader (PEAS_ENGINE (engine), "python");
++
+ 	g_object_add_weak_pointer (G_OBJECT (engine),
+ 				   (gpointer) &engine);
+ 
+diff --git a/src/totem-menu.c b/src/totem-menu.c
+index 6e76184..1a2e54e 100644
+--- src/totem-menu.c
++++ src/totem-menu.c
+@@ -1234,7 +1234,7 @@ plugins_action_callback (GtkAction *action, Totem *totem)
+ 					 G_CALLBACK (totem_plugins_response_cb),
+ 					 NULL, 0);
+ 
+-		manager = peas_gtk_plugin_manager_new ();
++		manager = peas_gtk_plugin_manager_new (NULL);
+ 		gtk_widget_show_all (GTK_WIDGET (manager));
+ 		gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (totem->plugins))),
+ 				    manager, TRUE, TRUE, 0);
+--
+cgit v0.8.3.1