update xfce to 4.6.1

bump PORTREVISION where necessary

4 files changed, 7 insertions, 146 deletions

diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index ba3c5f4169fa..be9da5311305 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xfce4-mixer
-PORTVERSION=	4.6.0
-PORTREVISION=	1
+PORTVERSION=	4.6.1
 CATEGORIES=	audio xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DIST_SUBDIR=	xfce4
diff --git a/audio/xfce4-mixer/distinfo b/audio/xfce4-mixer/distinfo
index 04675fa7cc3c..0a0d0342966b 100644
--- a/audio/xfce4-mixer/distinfo
+++ b/audio/xfce4-mixer/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-mixer-4.6.0.tar.bz2) = ee7956a73efe43da4b27ad9cd1f4d20b
-SHA256 (xfce4/xfce4-mixer-4.6.0.tar.bz2) = ce5c4103ee092c8d17bcd7ab6de215244ffe33e4634ae94e901c2f6c86bf5d0d
-SIZE (xfce4/xfce4-mixer-4.6.0.tar.bz2) = 410876
+MD5 (xfce4/xfce4-mixer-4.6.1.tar.bz2) = a99e2455445480ef5081fe69454a46fc
+SHA256 (xfce4/xfce4-mixer-4.6.1.tar.bz2) = cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd
+SIZE (xfce4/xfce4-mixer-4.6.1.tar.bz2) = 412483
diff --git a/audio/xfce4-mixer/files/patch-r29703 b/audio/xfce4-mixer/files/patch-r29703
deleted file mode 100644
index 2494ba8c4f08..000000000000
--- a/audio/xfce4-mixer/files/patch-r29703
+++ /dev/null
@@ -1,139 +0,0 @@
-Modified: panel-plugin/xfce-mixer-plugin.c
-===================================================================
---- panel-plugin/xfce-mixer-plugin.c	2009-04-04 10:12:48 UTC (rev 29702)
-+++ panel-plugin/xfce-mixer-plugin.c	2009-04-05 09:08:37 UTC (rev 29703)
-@@ -86,8 +86,8 @@
- /* Function prototypes */
- static void             xfce_mixer_plugin_construct         (XfcePanelPlugin  *plugin);
- static XfceMixerPlugin *xfce_mixer_plugin_new               (XfcePanelPlugin  *plugin);
--static void             xfce_mixer_plugin_free              (XfcePanelPlugin  *plugin,
--                                                             XfceMixerPlugin  *mixer_plugin);
-+static void             xfce_mixer_plugin_free              (XfceMixerPlugin  *mixer_plugin,
-+                                                             XfcePanelPlugin  *plugin);
- static gboolean         xfce_mixer_plugin_size_changed      (XfceMixerPlugin  *mixer_plugin,
-                                                              gint              size);
- static void             xfce_mixer_plugin_volume_changed    (XfceMixerPlugin  *mixer_plugin,
-@@ -167,8 +167,8 @@
- 
- 
- static void
--xfce_mixer_plugin_free (XfcePanelPlugin *plugin,
--                        XfceMixerPlugin *mixer_plugin)
-+xfce_mixer_plugin_free (XfceMixerPlugin *mixer_plugin,
-+                        XfcePanelPlugin *plugin)
- {
-   /* Free card and track names */
-   g_free (mixer_plugin->command);
-@@ -529,9 +529,11 @@
- static void
- xfce_mixer_plugin_update_track (XfceMixerPlugin *mixer_plugin)
- {
--  gint   *volumes;
--  gdouble volume;
--  gchar  *tip_text;
-+  XfceMixerTrackType track_type;
-+  gboolean           muted = FALSE;
-+  gdouble            volume;
-+  gint              *volumes;
-+  gchar             *tip_text;
- 
-   g_return_if_fail (mixer_plugin != NULL);
-   g_return_if_fail (GST_IS_MIXER (mixer_plugin->card));
-@@ -549,8 +551,17 @@
-   gtk_tooltips_set_tip (mixer_plugin->tooltips, mixer_plugin->button, tip_text, "test");
-   g_free (tip_text);
- 
-+  /* Determine track type */
-+  track_type = xfce_mixer_track_type_new (mixer_plugin->track);
-+
-+  if (G_LIKELY (track_type == XFCE_MIXER_TRACK_TYPE_PLAYBACK))
-+    muted = GST_MIXER_TRACK_HAS_FLAG (mixer_plugin->track, GST_MIXER_TRACK_MUTE);
-+  else if (track_type == XFCE_MIXER_TRACK_TYPE_CAPTURE)
-+    muted = !GST_MIXER_TRACK_HAS_FLAG (mixer_plugin->track, GST_MIXER_TRACK_RECORD);
-+
-   /* Update the volume button */
-   xfce_volume_button_set_volume (XFCE_VOLUME_BUTTON (mixer_plugin->button), volume);
-+  xfce_volume_button_set_muted (XFCE_VOLUME_BUTTON (mixer_plugin->button), muted);
- 
-   /* Free volume array */
-   g_free (volumes);
-@@ -650,7 +661,9 @@
- 
-   /* Replace the track label */
-   g_free (mixer_plugin->track_label);
-+  mixer_plugin->track_label = NULL;
-   g_object_get (track, "label", &mixer_plugin->track_label, NULL);
-+  g_debug ("mixer_plugin->track_label = '%s'", mixer_plugin->track_label);
- }
- 
- 
-
-Modified: xfce4-mixer/xfce-mixer-track.c
-===================================================================
---- xfce4-mixer/xfce-mixer-track.c	2009-04-04 10:12:48 UTC (rev 29702)
-+++ xfce4-mixer/xfce-mixer-track.c	2009-04-05 09:08:37 UTC (rev 29703)
-@@ -265,8 +265,7 @@
- 
-   /* Some of the mixer controls need to be updated before they can be used */
-   xfce_mixer_track_update_mute (track);
--  if (G_UNLIKELY (xfce_mixer_track_type_new (track->gst_track) == XFCE_MIXER_TRACK_TYPE_CAPTURE))
--    xfce_mixer_track_update_record (track);
-+  xfce_mixer_track_update_record (track);
- 
-   /* Free volume array */
-   g_free (volumes);
-@@ -425,11 +424,11 @@
- 
-   g_return_if_fail (IS_XFCE_MIXER_TRACK (track));
- 
--  if (G_UNLIKELY (xfce_mixer_track_type_new (track->gst_track) == XFCE_MIXER_TRACK_TYPE_CAPTURE))
--    return;
--
--  muted = GST_MIXER_TRACK_HAS_FLAG (track->gst_track, GST_MIXER_TRACK_MUTE);
--  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (track->mute_button), muted);
-+  if (G_LIKELY (xfce_mixer_track_type_new (track->gst_track) != XFCE_MIXER_TRACK_TYPE_CAPTURE))
-+    {
-+      muted = GST_MIXER_TRACK_HAS_FLAG (track->gst_track, GST_MIXER_TRACK_MUTE);
-+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (track->mute_button), muted);
-+    }
- }
- 
- 
-@@ -441,8 +440,11 @@
- 
-   g_return_if_fail (IS_XFCE_MIXER_TRACK (track));
- 
--  record = GST_MIXER_TRACK_HAS_FLAG (track->gst_track, GST_MIXER_TRACK_RECORD);
--  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (track->record_button), record);
-+  if (G_UNLIKELY (xfce_mixer_track_type_new (track->gst_track) == XFCE_MIXER_TRACK_TYPE_CAPTURE))
-+    {
-+      record = GST_MIXER_TRACK_HAS_FLAG (track->gst_track, GST_MIXER_TRACK_RECORD);
-+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (track->record_button), record);
-+    }
- }
- 
- 
-
-Modified: xfce4-mixer/xfce-mixer.c
-===================================================================
---- xfce4-mixer/xfce-mixer.c	2009-04-04 10:12:48 UTC (rev 29702)
-+++ xfce4-mixer/xfce-mixer.c	2009-04-05 09:08:37 UTC (rev 29703)
-@@ -351,7 +351,7 @@
-   switch (prop_id)
-     {
-     case PROP_CARD:
--      g_value_set_object (value, g_object_ref (mixer->card));
-+      g_value_set_object (value, mixer->card);
-       break;
-     default:
-       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-@@ -372,7 +372,7 @@
-   switch (prop_id)
-     {
-     case PROP_CARD:
--      mixer->card = g_object_ref (g_value_get_object (value));
-+      mixer->card = g_value_dup_object (value);
-       break;
-     default:
-       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-
diff --git a/audio/xfce4-mixer/pkg-plist b/audio/xfce4-mixer/pkg-plist
index 4c2e1de829ec..caf7b218a09f 100644
--- a/audio/xfce4-mixer/pkg-plist
+++ b/audio/xfce4-mixer/pkg-plist
@@ -14,12 +14,13 @@ share/locale/fr/LC_MESSAGES/xfce4-mixer.mo
 share/locale/gl/LC_MESSAGES/xfce4-mixer.mo
 share/locale/hu/LC_MESSAGES/xfce4-mixer.mo
 share/locale/id/LC_MESSAGES/xfce4-mixer.mo
+share/locale/it/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ja/LC_MESSAGES/xfce4-mixer.mo
-share/locale/nb_NO/LC_MESSAGES/xfce4-mixer.mo
+share/locale/nb/LC_MESSAGES/xfce4-mixer.mo
 share/locale/nl/LC_MESSAGES/xfce4-mixer.mo
 share/locale/pl/LC_MESSAGES/xfce4-mixer.mo
 share/locale/pt_BR/LC_MESSAGES/xfce4-mixer.mo
-share/locale/pt_PT/LC_MESSAGES/xfce4-mixer.mo
+share/locale/pt/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ru/LC_MESSAGES/xfce4-mixer.mo
 share/locale/si/LC_MESSAGES/xfce4-mixer.mo
 share/locale/sv/LC_MESSAGES/xfce4-mixer.mo