Update to 2.12.0:

This is gnome-media 2.12.0

Changes since 2.11.92:
	* install icon for desktop entry.
	* distfix.

This is gnome-media 2.11.92

Changes since 2.11.91:
	* Fix typo in schema
	* s/lrint/rint/ for BSD portability

Bugs fixed:

	* #309634: build failure -- some platforms do not have lrint()

This is gnome-media 2.11.91

Changes since 2.11.5:

	* loop/track mode fixes to gnome-cd
	* fix crash in gnome-cd when empty CD is inserted
	* make dialog in profiles library call gtk_dialog_run()

Bugs fixed:

	* 309883: Library version of gnome-audio-profiles-properties crash ...
	* 310309: Fix Right Alignment of Video Tab
	* 310626: CD player crashes when an empty cd is in the drive
	* 311458: HEAD build failure
	* 312636: In Loop Mode and Single Track mode, after completing one ...
	* 312654: Single track mode fails to play Last track
	* 312658: Stop while in Loop mode, restarts playing the song.

This is gnome-media 2.11.5

Changes since 2.11.4:

	* memleak fix
	* small buglet in gnome-cd where a menu item was not updated when
	  we started playing

This is gnome-media 2.11.4

Changes since 2.11.3:

	* more standardization changes to gnome-cd and gnome-sound-recorder

Bugs fixed:

	* 300408: put list edit button after the list not before it
	* 302156: Cd Player doesn't remember last volume chosen
	* 303630: A few typos in the .po file
	* 304063: Incorrect item capitalization in panel menus
	* 305228: Gnome-CD deadlocks at end of cd
	* 306052: Fehler
	* 306323: gnome-cd should use GTK_STOCK_MEDIA buttons
	* 306755: gnome-sound-recorder does not ask to save the files

This is gnome-media 2.11.3

Changes since 2.10.0:

	* ported gnome-sound-recorder to GtkUIManager
	* some UI enhancements to gnome-cd and cddb-slave
	* many usability and bugfixes

Bugs fixed:

	* 90792: cddb-slave2-properties capplet should listen for gconf ch...
	* 98195: disclosure widget not properly showing indicator in RTL t...
	* 105703: Track editor is not refreshing
	* 110686: CDDB preferencces dialogue far too big
	* 139808: "Iconify to tray" option
	* 144163: gnome-cd status tray icon should show current CD information
	* 148689: should remember window geometry
	* 152878: wrong cddbp port
	* 156671: Gnome Sound Recorder: elapsed time incorrect for FLAC & W...
	* 161973: adding cacasink to videosink list OR removing aasink from it
	* 164120: Gnome-CD asserts when GStreamer elements not found
	* 167472: Please don't use ngettext() just to distinguish 1 and oth...
	* 168648: gstreamer-properties closes on aasink preview when launch...
	* 170685: Title Bar doesnt work properly when a Record button is Cl...
	* 171370: use GnomeAbout which is deprecated
	* 171952: Gnome-cd Uses GnomeAbout which is deprecated
	* 171973: Gconf not updated with "Other FreeDB server" selection f...
	* 171986: Gnome-Sound-Recorder Uses GnomeAbout which is deprecated
	* 171990: Add Quit menu item to the popup menu of the tray icon
	* 172034: Correct spelling error
	* 172036: Correct grammar error
	* 172538: fix a few leaks and do not set a null title
	* 300117: Gnome-media won't compile when Gnome is installed in a no...
	* 300658: Fix gcc4 warnings and stuff

5 files changed, 64 insertions, 61 deletions

diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index 7782295c18b..0418fb46cf8 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2005/09/15 19:00:32 reed Exp $
+# $NetBSD: Makefile,v 1.21 2005/10/16 12:12:50 jmmv Exp $
 
-DISTNAME=		gnome-media-2.10.2
-PKGREVISION=		1
+DISTNAME=		gnome-media-2.12.0
 CATEGORIES=		multimedia gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.10/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.12/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
diff --git a/multimedia/gnome2-media/PLIST b/multimedia/gnome2-media/PLIST
index af4757f7902..51da5ec8fbc 100644
--- a/multimedia/gnome2-media/PLIST
+++ b/multimedia/gnome2-media/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/05/02 11:56:53 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/10/16 12:12:50 jmmv Exp $
 bin/cddb-slave2-properties
 bin/gnome-audio-profiles-properties
 bin/gnome-cd
@@ -30,6 +30,7 @@ share/gconf/schemas/CDDB-Slave2.schemas
 share/gconf/schemas/gnome-audio-profiles.schemas
 share/gconf/schemas/gnome-cd.schemas
 share/gconf/schemas/gnome-sound-recorder.schemas
+share/gconf/schemas/gnome-volume-control.schemas
 share/gnome-media/glade/gnome-audio-profiles.glade2
 share/gnome-media/pixmaps/3dsound.png
 share/gnome-media/pixmaps/chain-broken.png
@@ -43,7 +44,7 @@ share/gnome-media/pixmaps/play.png
 share/gnome-media/pixmaps/record.png
 share/gnome-media/pixmaps/tone.png
 share/gnome-media/pixmaps/video.png
-share/gnome-sound-recorder/ui/gsr.xml
+share/gnome-sound-recorder/ui/ui.xml
 share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/C/figures/cdplayer_window.png
@@ -160,6 +161,20 @@ share/gnome/help/gnome-cd/ko/figures/rewind_button.png
 share/gnome/help/gnome-cd/ko/figures/stop_button.png
 share/gnome/help/gnome-cd/ko/gnome-cd.xml
 share/gnome/help/gnome-cd/ko/legal.xml
+share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/nl/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/nl/figures/eject_button.png
+share/gnome/help/gnome-cd/nl/figures/forward_button.png
+share/gnome/help/gnome-cd/nl/figures/next_button.png
+share/gnome/help/gnome-cd/nl/figures/pause_button.png
+share/gnome/help/gnome-cd/nl/figures/play_button.png
+share/gnome/help/gnome-cd/nl/figures/preferences_button.png
+share/gnome/help/gnome-cd/nl/figures/previous_button.png
+share/gnome/help/gnome-cd/nl/figures/rewind_button.png
+share/gnome/help/gnome-cd/nl/figures/stop_button.png
+share/gnome/help/gnome-cd/nl/gnome-cd.xml
+share/gnome/help/gnome-cd/nl/legal.xml
 share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png
@@ -177,6 +192,20 @@ share/gnome/help/gnome-cd/sv/figures/rewind_button.png
 share/gnome/help/gnome-cd/sv/figures/stop_button.png
 share/gnome/help/gnome-cd/sv/gnome-cd.xml
 share/gnome/help/gnome-cd/sv/legal.xml
+share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/uk/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/uk/figures/eject_button.png
+share/gnome/help/gnome-cd/uk/figures/forward_button.png
+share/gnome/help/gnome-cd/uk/figures/next_button.png
+share/gnome/help/gnome-cd/uk/figures/pause_button.png
+share/gnome/help/gnome-cd/uk/figures/play_button.png
+share/gnome/help/gnome-cd/uk/figures/preferences_button.png
+share/gnome/help/gnome-cd/uk/figures/previous_button.png
+share/gnome/help/gnome-cd/uk/figures/rewind_button.png
+share/gnome/help/gnome-cd/uk/figures/stop_button.png
+share/gnome/help/gnome-cd/uk/gnome-cd.xml
+share/gnome/help/gnome-cd/uk/legal.xml
 share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_window.png
@@ -214,11 +243,19 @@ share/gnome/help/gnome-cd/zh_TW/legal.xml
 share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/C/legal.xml
+share/gnome/help/gnome-sound-recorder/uk/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/uk/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/uk/legal.xml
 share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png
 share/gnome/help/gnome-volume-control/C/figures/gmix.png
 share/gnome/help/gnome-volume-control/C/figures/gnome-volume-control_window.png
 share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
 share/gnome/help/gnome-volume-control/C/legal.xml
+share/gnome/help/gnome-volume-control/uk/figures/gmix-prefs.png
+share/gnome/help/gnome-volume-control/uk/figures/gmix.png
+share/gnome/help/gnome-volume-control/uk/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/uk/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/uk/legal.xml
 share/gnome/help/grecord/de/figures/grecord-prefs-path.png
 share/gnome/help/grecord/de/figures/grecord-prefs-play.png
 share/gnome/help/grecord/de/figures/grecord-prefs-rec.png
@@ -303,6 +340,9 @@ share/gnome/help/grecord/zh_TW/legal.xml
 share/gnome/help/gstreamer-properties/C/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/C/legal.xml
+share/gnome/help/gstreamer-properties/uk/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/uk/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/uk/legal.xml
 share/gstreamer-properties/glade/gstreamer-properties.glade
 share/gstreamer-properties/icons/gstreamer-properties.png
 share/idl/GNOME_Media_CDDBSlave2.idl
@@ -379,10 +419,13 @@ share/omf/gnome-media/gnome-cd-fr.omf
 share/omf/gnome-media/gnome-cd-it.omf
 share/omf/gnome-media/gnome-cd-ja.omf
 share/omf/gnome-media/gnome-cd-ko.omf
+share/omf/gnome-media/gnome-cd-nl.omf
 share/omf/gnome-media/gnome-cd-sv.omf
+share/omf/gnome-media/gnome-cd-uk.omf
 share/omf/gnome-media/gnome-cd-zh_CN.omf
 share/omf/gnome-media/gnome-cd-zh_TW.omf
 share/omf/gnome-media/gnome-volume-control-C.omf
+share/omf/gnome-media/gnome-volume-control-uk.omf
 share/omf/gnome-media/grecord-C.omf
 share/omf/gnome-media/grecord-de.omf
 share/omf/gnome-media/grecord-es.omf
@@ -391,21 +434,15 @@ share/omf/gnome-media/grecord-it.omf
 share/omf/gnome-media/grecord-ja.omf
 share/omf/gnome-media/grecord-ko.omf
 share/omf/gnome-media/grecord-sv.omf
+share/omf/gnome-media/grecord-uk.omf
 share/omf/gnome-media/grecord-zh_CN.omf
 share/omf/gnome-media/grecord-zh_TW.omf
 share/omf/gnome-media/gstreamer-properties-C.omf
+share/omf/gnome-media/gstreamer-properties-uk.omf
 share/pixmaps/gnome-cd.png
 share/pixmaps/gnome-cd/cd.png
 share/pixmaps/gnome-cd/disc.png
 share/pixmaps/gnome-cd/media-eject.png
-share/pixmaps/gnome-cd/media-ffwd.png
-share/pixmaps/gnome-cd/media-next.png
-share/pixmaps/gnome-cd/media-pause.png
-share/pixmaps/gnome-cd/media-play.png
-share/pixmaps/gnome-cd/media-prev.png
-share/pixmaps/gnome-cd/media-record.png
-share/pixmaps/gnome-cd/media-rewind.png
-share/pixmaps/gnome-cd/media-stop.png
 share/pixmaps/gnome-cd/once.png
 share/pixmaps/gnome-cd/repeat.png
 share/pixmaps/gnome-cd/themes/None/None.theme
@@ -463,15 +500,10 @@ share/pixmaps/gnome-cd/themes/red-lcd/top-right.png
 share/pixmaps/gnome-cd/themes/red-lcd/top.png
 share/pixmaps/gnome-cd/track.png
 share/pixmaps/gnome-grecord.png
-share/pixmaps/gnome-media/gnome-sound-recorder/media-play.png
-share/pixmaps/gnome-media/gnome-sound-recorder/media-record.png
-share/pixmaps/gnome-media/gnome-sound-recorder/media-stop.png
 share/pixmaps/gnome-mixer.png
 share/pixmaps/gnome-reclevel.png
 share/pixmaps/gnome-vumeter.png
 share/pixmaps/gstreamer-properties.png
-@dirrm share/pixmaps/gnome-media/gnome-sound-recorder
-@dirrm share/pixmaps/gnome-media
 @dirrm share/pixmaps/gnome-cd/themes/red-lcd
 @dirrm share/pixmaps/gnome-cd/themes/media
 @dirrm share/pixmaps/gnome-cd/themes/lcd
@@ -485,6 +517,8 @@ share/pixmaps/gstreamer-properties.png
 @dirrm share/gstreamer-properties/icons
 @dirrm share/gstreamer-properties/glade
 @dirrm share/gstreamer-properties
+@dirrm share/gnome/help/gstreamer-properties/uk/figures
+@dirrm share/gnome/help/gstreamer-properties/uk
 @dirrm share/gnome/help/gstreamer-properties/C/figures
 @dirrm share/gnome/help/gstreamer-properties/C
 @dirrm share/gnome/help/gstreamer-properties
@@ -507,9 +541,13 @@ share/pixmaps/gstreamer-properties.png
 @dirrm share/gnome/help/grecord/de/figures
 @dirrm share/gnome/help/grecord/de
 @dirrm share/gnome/help/grecord
+@dirrm share/gnome/help/gnome-volume-control/uk/figures
+@dirrm share/gnome/help/gnome-volume-control/uk
 @dirrm share/gnome/help/gnome-volume-control/C/figures
 @dirrm share/gnome/help/gnome-volume-control/C
 @dirrm share/gnome/help/gnome-volume-control
+@dirrm share/gnome/help/gnome-sound-recorder/uk/figures
+@dirrm share/gnome/help/gnome-sound-recorder/uk
 @dirrm share/gnome/help/gnome-sound-recorder/C/figures
 @dirrm share/gnome/help/gnome-sound-recorder/C
 @dirrm share/gnome/help/gnome-sound-recorder
@@ -517,8 +555,12 @@ share/pixmaps/gstreamer-properties.png
 @dirrm share/gnome/help/gnome-cd/zh_TW
 @dirrm share/gnome/help/gnome-cd/zh_CN/figures
 @dirrm share/gnome/help/gnome-cd/zh_CN
+@dirrm share/gnome/help/gnome-cd/uk/figures
+@dirrm share/gnome/help/gnome-cd/uk
 @dirrm share/gnome/help/gnome-cd/sv/figures
 @dirrm share/gnome/help/gnome-cd/sv
+@dirrm share/gnome/help/gnome-cd/nl/figures
+@dirrm share/gnome/help/gnome-cd/nl
 @dirrm share/gnome/help/gnome-cd/ko/figures
 @dirrm share/gnome/help/gnome-cd/ko
 @dirrm share/gnome/help/gnome-cd/ja/figures
diff --git a/multimedia/gnome2-media/distinfo b/multimedia/gnome2-media/distinfo
index 290390a1fba..6c64538204c 100644
--- a/multimedia/gnome2-media/distinfo
+++ b/multimedia/gnome2-media/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2005/09/15 19:00:32 reed Exp $
+$NetBSD: distinfo,v 1.11 2005/10/16 12:12:50 jmmv Exp $
 
-SHA1 (gnome-media-2.10.2.tar.bz2) = 7e668effbfd35f731f57709b834023540cc8894e
-RMD160 (gnome-media-2.10.2.tar.bz2) = 2019031e5f8cbb9d3c3556c6ecb5f0922997dddf
-Size (gnome-media-2.10.2.tar.bz2) = 3328141 bytes
+SHA1 (gnome-media-2.12.0.tar.bz2) = 6861338957af344457da25e032e0ee78f5f96921
+RMD160 (gnome-media-2.12.0.tar.bz2) = 2f43c4ad210268d67b6311f9e5bb16988459c20b
+Size (gnome-media-2.12.0.tar.bz2) = 3444233 bytes
 SHA1 (patch-aa) = 6d72e7ef6fb4c7bacfed8afd4654ab670c415c6f
 SHA1 (patch-ab) = 0b03cc24429983e6e91f4d697905852820ebc679
diff --git a/multimedia/gnome2-media/patches/patch-aa b/multimedia/gnome2-media/patches/patch-aa
deleted file mode 100644
index 66b646dcf74..00000000000
--- a/multimedia/gnome2-media/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/09/15 19:00:32 reed Exp $
-
---- gnome-cd/gst-cdparanoia-cdrom.c.orig	2005-03-20 06:32:33.000000000 -0800
-+++ gnome-cd/gst-cdparanoia-cdrom.c	2005-09-14 22:30:01.000000000 -0700
-@@ -1242,7 +1242,7 @@
- 
- 	build_pipeline (lcd);
- 	g_object_get (G_OBJECT (priv->vol_element), "volume", &vol, NULL);
--	realstatus->volume = lrint (vol * 255.0);
-+	realstatus->volume = rint (vol * 255.0);
- 	cur_gst_status =
- 	    gst_element_get_state (GST_ELEMENT (priv->play_thread));
- 
diff --git a/multimedia/gnome2-media/patches/patch-ab b/multimedia/gnome2-media/patches/patch-ab
deleted file mode 100644
index 5502e8b5a5b..00000000000
--- a/multimedia/gnome2-media/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/09/15 19:00:32 reed Exp $
-
---- volume.c	2005/04/15 12:59:37	1.5
-+++ gst-mixer/src/volume.c	2005/08/08 21:05:37	1.6
-@@ -480,9 +480,9 @@
-     if (gnome_volume_control_button_get_active (
-             GNOME_VOLUME_CONTROL_BUTTON (vol->button))) {
-       gtk_adjustment_set_value (adj, gtk_adjustment_get_value (_adj));
--      volumes[i++] = lrint (gtk_adjustment_get_value (_adj));
-+      volumes[i++] = rint (gtk_adjustment_get_value (_adj));
-     } else {
--      volumes[i++] = lrint (gtk_adjustment_get_value (adj));
-+      volumes[i++] = rint (gtk_adjustment_get_value (adj));
-     }
-   }
- 
-@@ -554,7 +554,7 @@
-        scales != NULL; scales = scales->next, n++) {
-     GtkAdjustment *adj = gtk_range_get_adjustment (scales->data);
-                                                                                 
--    if (lrint (gtk_adjustment_get_value (adj)) != 0) {
-+    if (rint (gtk_adjustment_get_value (adj)) != 0) {
-       *slider_zero = FALSE;
-       break;
-     }