update to 2.32.0

This switches to the gnome-2.32 release branch.

5 files changed, 18 insertions, 90 deletions

diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 349a81a6511..46f9ffc6b88 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2010/11/15 22:58:09 abs Exp $
+# $NetBSD: Makefile,v 1.46 2010/11/24 20:55:28 drochner Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
-PKGREVISION=	4
 
 DEPENDS+=	gst-plugins0.10-soup-[0-9]*:../../net/gst-plugins0.10-soup
 
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index 2601bbc2e3d..51738eafbee 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.58 2010/07/06 15:32:17 drochner Exp $
+# $NetBSD: Makefile.common,v 1.59 2010/11/24 20:55:28 drochner Exp $
 #
 # used by multimedia/totem-browser-plugin/Makefile
 # used by multimedia/totem-nautilus/Makefile
 
-DISTNAME=	totem-2.30.2
+DISTNAME=	totem-2.32.0
 CATEGORIES=	multimedia gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/2.30/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/2.32/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/projects/totem/
diff --git a/multimedia/totem/PLIST b/multimedia/totem/PLIST
index 287a00d994e..6ff91cdb9cb 100644
--- a/multimedia/totem/PLIST
+++ b/multimedia/totem/PLIST
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.25 2010/07/06 15:32:17 drochner Exp $
+@comment $NetBSD: PLIST,v 1.26 2010/11/24 20:55:28 drochner Exp $
 bin/totem
 bin/totem-audio-preview
 bin/totem-video-indexer
 bin/totem-video-thumbnailer
 lib/totem/plugins/brasero-disc-recorder/brasero-disc-recorder.totem-plugin
 lib/totem/plugins/brasero-disc-recorder/libbrasero-disc-recorder.la
+lib/totem/plugins/chapters/chapters-edit.ui
+lib/totem/plugins/chapters/chapters-list.ui
+lib/totem/plugins/chapters/chapters.totem-plugin
+lib/totem/plugins/chapters/libchapters.la
 lib/totem/plugins/coherence_upnp/coherence_upnp.py
 lib/totem/plugins/coherence_upnp/coherence_upnp.pyc
 lib/totem/plugins/coherence_upnp/coherence_upnp.pyo
@@ -52,6 +56,7 @@ lib/totem/plugins/pythonconsole/pythonconsole.py
 lib/totem/plugins/pythonconsole/pythonconsole.pyc
 lib/totem/plugins/pythonconsole/pythonconsole.pyo
 lib/totem/plugins/pythonconsole/pythonconsole.totem-plugin
+lib/totem/plugins/sample-vala/sample-vala.totem-plugin
 lib/totem/plugins/screensaver/libscreensaver.la
 lib/totem/plugins/screensaver/screensaver.totem-plugin
 lib/totem/plugins/screenshot/gallery.ui
@@ -297,12 +302,15 @@ share/gtk-doc/html/totem/TotemCellRendererVideo.html
 share/gtk-doc/html/totem/TotemObject.html
 share/gtk-doc/html/totem/TotemPlugin.html
 share/gtk-doc/html/totem/TotemVideoList.html
+share/gtk-doc/html/totem/annotation-glossary.html
 share/gtk-doc/html/totem/api-index-deprecated.html
 share/gtk-doc/html/totem/api-index-full.html
 share/gtk-doc/html/totem/core-api.html
 share/gtk-doc/html/totem/home.png
 share/gtk-doc/html/totem/index.html
 share/gtk-doc/html/totem/index.sgml
+share/gtk-doc/html/totem/ix02.html
+share/gtk-doc/html/totem/ix03.html
 share/gtk-doc/html/totem/left.png
 share/gtk-doc/html/totem/right.png
 share/gtk-doc/html/totem/style.css
@@ -366,6 +374,7 @@ share/locale/is/LC_MESSAGES/totem.mo
 share/locale/it/LC_MESSAGES/totem.mo
 share/locale/ja/LC_MESSAGES/totem.mo
 share/locale/ka/LC_MESSAGES/totem.mo
+share/locale/kk/LC_MESSAGES/totem.mo
 share/locale/kn/LC_MESSAGES/totem.mo
 share/locale/ko/LC_MESSAGES/totem.mo
 share/locale/ku/LC_MESSAGES/totem.mo
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 4942d201dd9..611b85dd63f 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.42 2010/08/04 17:46:52 drochner Exp $
+$NetBSD: distinfo,v 1.43 2010/11/24 20:55:28 drochner Exp $
 
-SHA1 (totem-2.30.2.tar.gz) = 3f09d21994b3caa9aa4eca9f1fa9021a263bdc92
-RMD160 (totem-2.30.2.tar.gz) = 302963f368d7dcdb782d9350c03133413ff4dc33
-Size (totem-2.30.2.tar.gz) = 4839425 bytes
+SHA1 (totem-2.32.0.tar.gz) = 5c220271a92bd123aedbfa4343181b6df9a38244
+RMD160 (totem-2.32.0.tar.gz) = ae2dfaa956114201c2816e757eb7e98afb3886b0
+Size (totem-2.32.0.tar.gz) = 4914567 bytes
 SHA1 (patch-ad) = ec8cd092d202255981049ace4ac643c41a0044be
 SHA1 (patch-af) = 8e4ffb97aedbf56a052d5ffacea73f8b2f071183
 SHA1 (patch-ai) = 6f95138b8260dc925493845e34a7b7e9f6f93a53
-SHA1 (patch-aj) = e052ec5431e776c6754d50d98e70d3d88259404a
diff --git a/multimedia/totem/patches/patch-aj b/multimedia/totem/patches/patch-aj
deleted file mode 100644
index fce03bf6b38..00000000000
--- a/multimedia/totem/patches/patch-aj
+++ /dev/null
@@ -1,79 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2010/08/04 17:46:52 drochner Exp $
-
---- src/plugins/youtube/totem-youtube.c.orig	2010-05-12 15:41:25.000000000 +0000
-+++ src/plugins/youtube/totem-youtube.c
-@@ -394,14 +394,6 @@ impl_deactivate	(TotemPlugin *plugin, To
- 		g_regex_unref (self->regex);
- }
- 
--static const gchar *
--get_fmt_param (TotemYouTubePlugin *self)
--{
--	if (bacon_video_widget_get_connection_speed (self->bvw) >= 10)
--		return "&fmt=18";
--	return "";
--}
--
- typedef struct {
- 	TotemYouTubePlugin *plugin;
- 	guint tree_view;
-@@ -510,29 +502,32 @@ resolve_t_param_cb (GObject *source_obje
- 
- 	video_id = gdata_youtube_video_get_video_id (GDATA_YOUTUBE_VIDEO (data->entry));
- 
--	/* Check for the t parameter, which is now in a JavaScript array on the video page */
-+	/* Check for the fmt_url_map parameter */
- 	g_regex_match (self->regex, contents, 0, &match_info);
- 	if (g_match_info_matches (match_info) == TRUE) {
--		gchar *t_param, *s;
--		const gchar *fmt_param;
--		GString *video_uri_string;
-+		gchar *fmt_url_map_escaped, *fmt_url_map;
-+		gchar **mappings, **i;
- 
- 		/* We have a match */
--		s = g_match_info_fetch (match_info, 1);
--		t_param = g_uri_unescape_string (s, NULL);
--		if (t_param == NULL)
--			t_param = s;
--		else
--			g_free (s);
--		fmt_param = get_fmt_param (self);
--
--		video_uri_string = g_string_new ("http://www.youtube.com/get_video?video_id=");
--		g_string_append_uri_escaped (video_uri_string, video_id, NULL, TRUE);
--		g_string_append (video_uri_string, "&t=");
--		g_string_append_uri_escaped (video_uri_string, t_param, NULL, TRUE);
--		g_string_append (video_uri_string, fmt_param);
-+		fmt_url_map_escaped = g_match_info_fetch (match_info, 1);
-+		fmt_url_map = g_uri_unescape_string (fmt_url_map_escaped, NULL);
-+		g_free (fmt_url_map_escaped);
-+
-+		/* The fmt_url_map parameter is in the following format:
-+		 *   fmt1|uri1,fmt2|uri2,fmt3|uri3,...
-+		 * where fmtN is an identifier for the audio and video encoding and resolution as described here:
-+		 * (http://en.wikipedia.org/wiki/YouTube#Quality_and_codecs) and uriN is the playback URI for that format. */
-+		mappings = g_strsplit (fmt_url_map, ",", 0);
-+
-+		for (i = mappings; *i != NULL; i++) {
-+			/* For the moment we just take the first format we get */
-+			gchar **mapping = g_strsplit (*i, "|", 2);
-+			video_uri = g_strdup (mapping[1]);
-+			g_strfreev (mapping);
-+			break;
-+		}
- 
--		video_uri = g_string_free (video_uri_string, FALSE);
-+		g_strfreev (mappings);
- 	} else {
- 		GDataMediaContent *content;
- 
-@@ -854,7 +849,7 @@ search_button_clicked_cb (GtkButton *but
- 		 * cycles repeatedly creating new regexes for each video whose t param we resolve. */
- 		/* We're looking for a line of the form:
- 		 * var swfHTML = (isIE) ? "<object...econds=194&t=vjVQa1PpcFP36LLlIaDqZIG1w6e30b-7WVBgsQLLA3s%3D&rv.6.id=OzLjC6Pm... */
--		self->regex = g_regex_new ("swfHTML = .*&t=([^&]+)&", G_REGEX_OPTIMIZE, 0, NULL);
-+		self->regex = g_regex_new ("swfHTML = .*&fmt_url_map=([^&]+)&", G_REGEX_OPTIMIZE, 0, NULL);
- 		g_assert (self->regex != NULL);
- 
- 		/* Set up the GData service (needed for the tree views' queries) */