7 files changed, 23 insertions, 229 deletions

diff --git a/audio/pavucontrol/Makefile b/audio/pavucontrol/Makefile
index d507c2b42b63..c0791f213478 100644
--- a/audio/pavucontrol/Makefile
+++ b/audio/pavucontrol/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pavucontrol
-PORTVERSION=	2.0
+PORTVERSION=	3.0
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/${PORTNAME}/
 
@@ -32,17 +32,6 @@ GTK2_CONFIGURE_ON=	--disable-gtk3
 GTK3_USE=	GNOME=gtkmm30
 GTK3_LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGTK2}
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-support-gtkmm-24.patch
-.endif
-
-.if ${PORT_OPTIONS:MGTK3}
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-support-gtkmm-30.patch \
-	${FILESDIR}/extra-patch-src_pavucontrol.glade
-.endif
-
 post-patch:
 # Install locales files in right place
 	${REINPLACE_CMD} -e 's|[$$][(]DATADIRNAME[)]|share|' \
diff --git a/audio/pavucontrol/distinfo b/audio/pavucontrol/distinfo
index 757b0a1182f9..6815c15dc786 100644
--- a/audio/pavucontrol/distinfo
+++ b/audio/pavucontrol/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pavucontrol-2.0.tar.xz) = 22f29dd81b4a1a34ec7bffe9b027aff2a37fc76ccded4539d43a8c126a39470b
-SIZE (pavucontrol-2.0.tar.xz) = 151560
+SHA256 (pavucontrol-3.0.tar.xz) = b3d2ea5a25fc88dcee80c396014f72df1b4742f8cfbbc5349c39d64a0d338890
+SIZE (pavucontrol-3.0.tar.xz) = 145092
diff --git a/audio/pavucontrol/files/extra-patch-src_pavucontrol.glade b/audio/pavucontrol/files/extra-patch-src_pavucontrol.glade
deleted file mode 100644
index 579d2b159853..000000000000
--- a/audio/pavucontrol/files/extra-patch-src_pavucontrol.glade
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Fri, 29 Aug 2014 09:42:04 +0200
-Subject: Do not instantiate cardwidget, devicewidget and rolewidget with
- a type of EventBox
-
---- src/pavucontrol.glade.orig	2012-12-17 09:50:42 UTC
-+++ src/pavucontrol.glade
-@@ -12,12 +12,12 @@
-     <property name="can_focus">False</property>
-     <property name="title" translatable="yes">window1</property>
-     <child>
--      <object class="GtkEventBox" id="cardWidget">
-+      <object class="GtkEventBox" id="cardWidgetBox">
-         <property name="visible">True</property>
-         <property name="can_focus">False</property>
-         <property name="visible_window">False</property>
-         <child>
--          <object class="GtkVBox" id="cardWidget1">
-+          <object class="GtkVBox" id="cardWidget">
-             <property name="visible">True</property>
-             <property name="can_focus">False</property>
-             <child>
-@@ -202,12 +202,12 @@
-     <property name="can_focus">False</property>
-     <property name="title" translatable="yes">window1</property>
-     <child>
--      <object class="GtkEventBox" id="deviceWidget">
-+      <object class="GtkEventBox" id="deviceWidgetBox">
-         <property name="visible">True</property>
-         <property name="can_focus">False</property>
-         <property name="visible_window">False</property>
-         <child>
--          <object class="GtkVBox" id="streamWidget2">
-+          <object class="GtkVBox" id="deviceWidget">
-             <property name="visible">True</property>
-             <property name="can_focus">False</property>
-             <child>
-@@ -1316,12 +1316,12 @@
-     <property name="can_focus">False</property>
-     <property name="title" translatable="yes">window1</property>
-     <child>
--      <object class="GtkEventBox" id="streamWidget">
-+      <object class="GtkEventBox" id="streamWidgetBox">
-         <property name="visible">True</property>
-         <property name="can_focus">False</property>
-         <property name="visible_window">False</property>
-         <child>
--          <object class="GtkVBox" id="streamWidget2">
-+          <object class="GtkVBox" id="streamWidget">
-             <property name="visible">True</property>
-             <property name="can_focus">False</property>
-             <child>
diff --git a/audio/pavucontrol/files/extra-patch-support-gtkmm-24.patch b/audio/pavucontrol/files/extra-patch-support-gtkmm-24.patch
deleted file mode 100644
index 5dc886575a77..000000000000
--- a/audio/pavucontrol/files/extra-patch-support-gtkmm-24.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Alam Arias <alam.gbc@gmail.com>
-Date: Fri, 8 Mar 2013 14:27:02 -0500
-Subject: added back support for gtkmm-2.4 builds
-
---- src/devicewidget.cc.orig	2012-12-17 09:50:42 UTC
-+++ src/devicewidget.cc
-@@ -63,8 +63,8 @@ DeviceWidget::DeviceWidget(BaseObjectTyp
-     for (unsigned i = 0; i < PA_CHANNELS_MAX; i++)
-         channelWidgets[i] = NULL;
- 
--    offsetAdjustment = Gtk::Adjustment::create(0.0, -2000.0, 2000.0, 10.0, 50.0, 0.0);
--    offsetButton->configure(offsetAdjustment, 0, 2);
-+    offsetAdjustment = new Gtk::Adjustment(0.0, -2000.0, 2000.0, 10.0, 50.0, 0.0);
-+    offsetButton->configure(*offsetAdjustment, 0.0, 2);
- }
- 
- void DeviceWidget::init(MainWindow* mainWindow, Glib::ustring deviceType) {
---- src/devicewidget.h.orig	2012-12-17 09:17:56 UTC
-+++ src/devicewidget.h
-@@ -98,7 +98,7 @@ protected:
-     Gtk::HBox *portSelect, *offsetSelect;
-     Gtk::ComboBox *portList;
-     Glib::RefPtr<Gtk::ListStore> treeModel;
--    Glib::RefPtr<Gtk::Adjustment> offsetAdjustment;
-+    Gtk::Adjustment *offsetAdjustment;
- 
- private:
-     Glib::ustring mDeviceType;
diff --git a/audio/pavucontrol/files/extra-patch-support-gtkmm-30.patch b/audio/pavucontrol/files/extra-patch-support-gtkmm-30.patch
deleted file mode 100644
index 97eefa13675e..000000000000
--- a/audio/pavucontrol/files/extra-patch-support-gtkmm-30.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Thu, 28 Aug 2014 12:58:05 +0200
-Subject: Reference the widget before returning it from ::create methods
-
---- src/cardwidget.cc.orig	2011-08-12 14:18:44 UTC
-+++ src/cardwidget.cc
-@@ -45,6 +45,7 @@ CardWidget* CardWidget::create() {
-     CardWidget* w;
-     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "cardWidget");
-     x->get_widget_derived("cardWidget", w);
-+    w->reference();
-     return w;
- }
- 
---- src/channelwidget.cc.orig	2011-03-10 07:39:25 UTC
-+++ src/channelwidget.cc
-@@ -53,6 +53,7 @@ ChannelWidget* ChannelWidget::create() {
-     x->add_from_file(GLADE_FILE, "adjustment1");
-     x->add_from_file(GLADE_FILE, "channelWidget");
-     x->get_widget_derived("channelWidget", w);
-+    w->reference();
-     return w;
- }
- 
---- src/mainwindow.cc.orig	2012-12-17 09:19:04 UTC
-+++ src/mainwindow.cc
-@@ -298,6 +298,7 @@ void MainWindow::updateCard(const pa_car
-     else {
-         cardWidgets[info.index] = w = CardWidget::create();
-         cardsVBox->pack_start(*w, false, false, 0);
-+        w->unreference();
-         w->index = info.index;
-         is_new = true;
-     }
-@@ -414,6 +415,7 @@ bool MainWindow::updateSink(const pa_sin
-         sinkWidgets[info.index] = w = SinkWidget::create(this);
-         w->setChannelMap(info.channel_map, !!(info.flags & PA_SINK_DECIBEL_VOLUME));
-         sinksVBox->pack_start(*w, false, false, 0);
-+        w->unreference();
-         w->index = info.index;
-         w->monitor_index = info.monitor_source;
-         is_new = true;
-@@ -567,6 +569,7 @@ void MainWindow::updateSource(const pa_s
-         sourceWidgets[info.index] = w = SourceWidget::create(this);
-         w->setChannelMap(info.channel_map, !!(info.flags & PA_SOURCE_DECIBEL_VOLUME));
-         sourcesVBox->pack_start(*w, false, false, 0);
-+        w->unreference();
-         w->index = info.index;
-         is_new = true;
- 
-@@ -682,6 +685,7 @@ void MainWindow::updateSinkInput(const p
-         sinkInputWidgets[info.index] = w = SinkInputWidget::create(this);
-         w->setChannelMap(info.channel_map, true);
-         streamsVBox->pack_start(*w, false, false, 0);
-+        w->unreference();
-         w->index = info.index;
-         w->clientIndex = info.client;
-         is_new = true;
-@@ -737,6 +741,7 @@ void MainWindow::updateSourceOutput(cons
-         w->setChannelMap(info.channel_map, true);
- #endif
-         recsVBox->pack_start(*w, false, false, 0);
-+        w->unreference();
-         w->index = info.index;
-         w->clientIndex = info.client;
-         is_new = true;
-@@ -830,6 +835,7 @@ bool MainWindow::createEventRoleWidget()
- 
-     eventRoleWidget = RoleWidget::create();
-     streamsVBox->pack_start(*eventRoleWidget, false, false, 0);
-+    eventRoleWidget->unreference();
-     eventRoleWidget->role = "sink-input-by-media-role:event";
-     eventRoleWidget->setChannelMap(cm, true);
- 
---- src/rolewidget.cc.orig	2011-03-10 07:39:25 UTC
-+++ src/rolewidget.cc
-@@ -40,6 +40,7 @@ RoleWidget* RoleWidget::create() {
-     RoleWidget* w;
-     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget");
-     x->get_widget_derived("streamWidget", w);
-+    w->reference();
-     return w;
- }
- 
---- src/sinkinputwidget.cc.orig	2011-03-10 07:39:25 UTC
-+++ src/sinkinputwidget.cc
-@@ -43,6 +43,7 @@ SinkInputWidget* SinkInputWidget::create
-     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget");
-     x->get_widget_derived("streamWidget", w);
-     w->init(mainWindow);
-+    w->reference();
-     return w;
- }
- 
---- src/sinkwidget.cc.orig	2012-12-17 09:50:42 UTC
-+++ src/sinkwidget.cc
-@@ -70,6 +70,7 @@ SinkWidget* SinkWidget::create(MainWindo
-     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "deviceWidget");
-     x->get_widget_derived("deviceWidget", w);
-     w->init(mainWindow, "sink");
-+    w->reference();
-     return w;
- }
- 
---- src/sourceoutputwidget.cc.orig	2011-08-08 13:33:17 UTC
-+++ src/sourceoutputwidget.cc
-@@ -49,6 +49,7 @@ SourceOutputWidget* SourceOutputWidget::
-     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget");
-     x->get_widget_derived("streamWidget", w);
-     w->init(mainWindow);
-+    w->reference();
-     return w;
- }
- 
---- src/sourcewidget.cc.orig	2011-03-10 07:39:25 UTC
-+++ src/sourcewidget.cc
-@@ -35,6 +35,7 @@ SourceWidget* SourceWidget::create(MainW
-     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "deviceWidget");
-     x->get_widget_derived("deviceWidget", w);
-     w->init(mainWindow, "source");
-+    w->reference();
-     return w;
- }
- 
---- src/streamwidget.cc.orig	2011-03-10 07:39:25 UTC
-+++ src/streamwidget.cc
-@@ -77,6 +77,7 @@ void StreamWidget::setChannelMap(const p
-         snprintf(text, sizeof(text), "<b>%s</b>", pa_channel_position_to_pretty_string(m.map[i]));
-         cw->channelLabel->set_markup(text);
-         channelsVBox->pack_start(*cw, false, false, 0);
-+        cw->unreference();
-     }
-     channelWidgets[m.channels-1]->last = true;
-     channelWidgets[m.channels-1]->setBaseVolume(PA_VOLUME_NORM);
diff --git a/audio/pavucontrol/files/patch-src_pavucontrol.glade b/audio/pavucontrol/files/patch-src_pavucontrol.glade
new file mode 100644
index 000000000000..79ee1adbc0e9
--- /dev/null
+++ b/audio/pavucontrol/files/patch-src_pavucontrol.glade
@@ -0,0 +1,20 @@
+--- src/pavucontrol.glade.orig	2015-03-24 14:39:00 UTC
++++ src/pavucontrol.glade
+@@ -312,7 +312,7 @@
+                               <object class="GtkImage" id="image18">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <property name="icon_name">stock_lock</property>
++                                <property name="icon_name">security-medium</property>
+                                 <property name="icon-size">1</property>
+                               </object>
+                             </child>
+@@ -1474,7 +1474,7 @@
+                               <object class="GtkImage" id="image18">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <property name="icon_name">stock_lock</property>
++                                <property name="icon_name">security-medium</property>
+                                 <property name="icon-size">1</property>
+                               </object>
+                             </child>
diff --git a/audio/pavucontrol/pkg-plist b/audio/pavucontrol/pkg-plist
index ec88a81dc913..c1235344ed67 100644
--- a/audio/pavucontrol/pkg-plist
+++ b/audio/pavucontrol/pkg-plist
@@ -1,6 +1,5 @@
 bin/pavucontrol
 share/applications/pavucontrol.desktop
-%%DOCSDIR%%/README
 %%DOCSDIR%%/README.html
 %%DOCSDIR%%/style.css
 share/locale/as/LC_MESSAGES/pavucontrol.mo