Update to 2.9.92.

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

5 files changed, 3 insertions, 177 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index c14d60db9..7a5588520 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.9.90
-PORTREVISION=	1
+PORTVERSION=	2.9.92
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/2.9
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index 5c3bbc446..0abd734a7 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-media-2.9.90.tar.bz2) = 11b412b3dfa72c120cf0ed7f729151e8
-SIZE (gnome2/gnome-media-2.9.90.tar.bz2) = 3254074
+MD5 (gnome2/gnome-media-2.9.92.tar.bz2) = 7578a6b234f7b9e8ef6c811a6832a7b8
+SIZE (gnome2/gnome-media-2.9.92.tar.bz2) = 3292458
diff --git a/audio/gnome-media/files/patch-grecord_src_gsr-window.c b/audio/gnome-media/files/patch-grecord_src_gsr-window.c
deleted file mode 100644
index 852108cd5..000000000
--- a/audio/gnome-media/files/patch-grecord_src_gsr-window.c
+++ /dev/null
@@ -1,87 +0,0 @@
---- grecord/src/gsr-window.c.orig	Sat Dec 25 20:01:19 2004
-+++ grecord/src/gsr-window.c	Sat Dec 25 20:12:13 2004
-@@ -29,7 +29,7 @@
- #include <unistd.h>
- 
- #include <gnome.h>
--#include <libgnomevfs/gnome-vfs-utils.h>
-+#include <libgnomevfs/gnome-vfs.h>
- #include <gconf/gconf-client.h>
- #include <gst/gst.h>
- #include <gst/gconf/gconf.h>
-@@ -476,39 +476,53 @@
- {
- 	GSRWindowPrivate *priv;
-         GMAudioProfile *profile;
--	char *tmp, *command;
--	GError *error;
--	int status;
--	
--	status = 0;
-+	char *tmp, *src;
-+	GnomeVFSURI *src_uri, *dst_uri;
- 
- 	priv = window->priv;
--	
-+
-         profile = gm_audio_profile_choose_get_active (priv->profile);
- 
--	tmp = g_strdup_printf ("%s.%s", name,
-+	tmp = g_strdup_printf ("file://%s.%s", name,
- 			       gm_audio_profile_get_extension (profile));
--	
--	command = g_strdup_printf ("/bin/cp %s %s", priv->record_filename, tmp);
--
--	if (!g_spawn_command_line_sync (command,  NULL, NULL, &status, &error)) {
--		gchar *error_message;
-+	src = g_strdup_printf ("file://%s", priv->record_filename);
-+	src_uri = gnome_vfs_uri_new (src);
-+	dst_uri = gnome_vfs_uri_new (tmp);
-+	g_free (src);
-+	g_free (tmp);
-+	if (src_uri && dst_uri) {
-+		GnomeVFSResult result;
-+		result = gnome_vfs_xfer_uri (src_uri, dst_uri,
-+			GNOME_VFS_XFER_DEFAULT,
-+			GNOME_VFS_XFER_ERROR_MODE_ABORT,
-+			GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
-+			NULL, NULL);
-+		if (result == GNOME_VFS_OK) {
-+			char *title, *short_name;
-+			priv->filename = g_strdup_printf ("%s.%s",
-+				name, gm_audio_profile_get_extension (profile));
-+			short_name = g_path_get_basename (priv->filename);
-+			title = g_strdup_printf ("%s - Sound Recorder",
-+				short_name);
-+			gtk_window_set_title (GTK_WINDOW (window), title);
-+			priv->dirty = FALSE;
-+			g_free (title);
-+		} else {
-+			gchar *error_message;
- 
--		error_message = g_strdup_printf (_("Could not save the file \"%s\""), error->message);
--		show_error_dialog (GTK_WINDOW (window), error_message);
--		g_free (error_message);
--	}
--	
--	if (status) {
-+			error_message = g_strdup_printf (_("Could not save the file \"%s\""), gnome_vfs_result_to_string (result));
-+			show_error_dialog (GTK_WINDOW (window), error_message);
-+			g_free (error_message);
-+		}
-+		gnome_vfs_uri_unref (src_uri);
-+		gnome_vfs_uri_unref (dst_uri);
-+	} else {
- 		gchar *error_message;
- 
--		error_message = g_strdup_printf (_("Could not save the file \"%s\""), tmp);
-+		error_message = g_strdup_printf (_("Could not save the file \"%s.%s\""), name, gm_audio_profile_get_extension (profile));
- 		show_error_dialog (GTK_WINDOW (window), error_message);
- 		g_free (error_message);
- 	}
--
--	g_free (tmp);		
--	g_free (command);		
- }
- 
- static void
diff --git a/audio/gnome-media/files/patch-profiles_audio-profile.c b/audio/gnome-media/files/patch-profiles_audio-profile.c
deleted file mode 100644
index 1b12ce758..000000000
--- a/audio/gnome-media/files/patch-profiles_audio-profile.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- profiles/audio-profile.c.orig	Tue Feb 15 00:23:13 2005
-+++ profiles/audio-profile.c	Tue Feb 15 00:23:31 2005
-@@ -978,7 +978,6 @@
-   }
-   g_free (profile_id);
-   profile_id = s;
--  g_free (s);
- 
-   profile_dir = gconf_concat_dir_and_key (CONF_PROFILES_PREFIX,
-                                           profile_id);
diff --git a/audio/gnome-media/files/patch-profiles_gnome-audio-profiles-properties.c b/audio/gnome-media/files/patch-profiles_gnome-audio-profiles-properties.c
deleted file mode 100644
index c0903ed5e..000000000
--- a/audio/gnome-media/files/patch-profiles_gnome-audio-profiles-properties.c
+++ /dev/null
@@ -1,76 +0,0 @@
---- profiles/gnome-audio-profiles-properties.c.orig	Mon Sep 20 20:51:20 2004
-+++ profiles/gnome-audio-profiles-properties.c	Fri Feb 11 23:40:04 2005
-@@ -21,6 +21,9 @@
- 
- #include <gtk/gtkmain.h>
- #include "gnome-media-profiles.h"
-+#include <glade/glade.h>
-+#include <glade/glade-build.h>
-+#include <string.h>
- 
- static void
- on_dialog_destroy (GtkWidget *dialog, gpointer *user_data)
-@@ -29,6 +32,52 @@
-   gtk_main_quit ();
- }
- 
-+static void
-+gtk_dialog_build_children(GladeXML *self, GtkWidget *w,
-+			  GladeWidgetInfo *info)
-+
-+{
-+    GtkDialog *dialog = GTK_DIALOG (w);
-+    GList *children, *list;
-+
-+    glade_standard_build_children (self, w, info);
-+
-+    if (dialog->action_area == NULL)
-+	return;
-+
-+    /* repack children of action_area */
-+    children = gtk_container_get_children(GTK_CONTAINER(dialog->action_area));
-+    for (list = children; list; list = list->next) {
-+	GtkWidget *child = GTK_WIDGET(list->data);
-+
-+	g_object_ref(child);
-+	gtk_container_remove (GTK_CONTAINER (dialog->action_area), child);
-+    }
-+    for (list = children; list; list = list->next) {
-+	GtkWidget *child = GTK_WIDGET(list->data);
-+	gint response_id;
-+
-+	response_id = GPOINTER_TO_INT(g_object_steal_data(G_OBJECT(child),
-+							  "response_id"));
-+	gtk_dialog_add_action_widget(dialog, child, response_id);
-+	g_object_unref(child);
-+
-+    }
-+    g_list_free (children);
-+}
-+
-+static GtkWidget *
-+dialog_find_internal_child(GladeXML *xml, GtkWidget *parent,
-+			   const gchar *childname)
-+{
-+    if (!strcmp(childname, "vbox"))
-+	return GTK_DIALOG(parent)->vbox;
-+    if (!strcmp(childname, "action_area"))
-+	return GTK_DIALOG(parent)->action_area;
-+
-+    return NULL;
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -39,6 +88,10 @@
-   /* FIXME: add a comment why we need this at all, until then
-      we comment it out
-   gm_audio_profile_edit_get_type (); */
-+  glade_register_widget (gm_audio_profile_edit_get_type (),
-+			 NULL,
-+			 gtk_dialog_build_children,
-+			 dialog_find_internal_child);
-   conf = gconf_client_get_default ();
-   gnome_media_profiles_init (conf);
-