Index: head/audio/pavucontrol/Makefile =================================================================== --- head/audio/pavucontrol/Makefile (revision 384942) +++ head/audio/pavucontrol/Makefile (revision 384943) @@ -1,51 +1,40 @@ # Created by: Romain Tartière # $FreeBSD$ PORTNAME= pavucontrol -PORTVERSION= 2.0 +PORTVERSION= 3.0 CATEGORIES= audio MASTER_SITES= http://freedesktop.org/software/pulseaudio/${PORTNAME}/ MAINTAINER= romain@FreeBSD.org COMMENT= GTK mixer for PulseAudio LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio GNU_CONFIGURE= yes USES= gmake pkgconfig gettext tar:xz USE_GNOME= glibmm intltool libsigc++20 OPTIONS_SUB= yes OPTIONS_SINGLE= GTK OPTIONS_SINGLE_GTK= GTK2 GTK3 OPTIONS_DEFAULT= GTK2 CONFIGURE_ARGS= --disable-lynx GTK2_USE= GNOME=gtkmm24 GTK2_LIB_DEPENDS= libcanberra.so:${PORTSDIR}/audio/libcanberra GTK2_CONFIGURE_ON= --disable-gtk3 GTK3_USE= GNOME=gtkmm30 GTK3_LIB_DEPENDS= libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 - -.include - -.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|' \ ${WRKSRC}/po/Makefile.in.in .include Index: head/audio/pavucontrol/distinfo =================================================================== --- head/audio/pavucontrol/distinfo (revision 384942) +++ head/audio/pavucontrol/distinfo (revision 384943) @@ -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 Index: head/audio/pavucontrol/files/extra-patch-src_pavucontrol.glade =================================================================== --- head/audio/pavucontrol/files/extra-patch-src_pavucontrol.glade (revision 384942) +++ head/audio/pavucontrol/files/extra-patch-src_pavucontrol.glade (nonexistent) @@ -1,52 +0,0 @@ -From: Hans de Goede -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 @@ - False - window1 - -- -+ - True - False - False - -- -+ - True - False - -@@ -202,12 +202,12 @@ - False - window1 - -- -+ - True - False - False - -- -+ - True - False - -@@ -1316,12 +1316,12 @@ - False - window1 - -- -+ - True - False - False - -- -+ - True - False - Property changes on: head/audio/pavucontrol/files/extra-patch-src_pavucontrol.glade ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/pavucontrol/files/extra-patch-support-gtkmm-24.patch =================================================================== --- head/audio/pavucontrol/files/extra-patch-support-gtkmm-24.patch (revision 384942) +++ head/audio/pavucontrol/files/extra-patch-support-gtkmm-24.patch (nonexistent) @@ -1,28 +0,0 @@ -From: Alam Arias -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 treeModel; -- Glib::RefPtr offsetAdjustment; -+ Gtk::Adjustment *offsetAdjustment; - - private: - Glib::ustring mDeviceType; Property changes on: head/audio/pavucontrol/files/extra-patch-support-gtkmm-24.patch ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/pavucontrol/files/extra-patch-support-gtkmm-30.patch =================================================================== --- head/audio/pavucontrol/files/extra-patch-support-gtkmm-30.patch (revision 384942) +++ head/audio/pavucontrol/files/extra-patch-support-gtkmm-30.patch (nonexistent) @@ -1,134 +0,0 @@ -From: Hans de Goede -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 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 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 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 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 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 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), "%s", 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); Property changes on: head/audio/pavucontrol/files/extra-patch-support-gtkmm-30.patch ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/pavucontrol/files/patch-src_pavucontrol.glade =================================================================== --- head/audio/pavucontrol/files/patch-src_pavucontrol.glade (nonexistent) +++ head/audio/pavucontrol/files/patch-src_pavucontrol.glade (revision 384943) @@ -0,0 +1,20 @@ +--- src/pavucontrol.glade.orig 2015-03-24 14:39:00 UTC ++++ src/pavucontrol.glade +@@ -312,7 +312,7 @@ + + True + False +- stock_lock ++ security-medium + 1 + + +@@ -1474,7 +1474,7 @@ + + True + False +- stock_lock ++ security-medium + 1 + + Property changes on: head/audio/pavucontrol/files/patch-src_pavucontrol.glade ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/pavucontrol/pkg-plist =================================================================== --- head/audio/pavucontrol/pkg-plist (revision 384942) +++ head/audio/pavucontrol/pkg-plist (revision 384943) @@ -1,41 +1,40 @@ bin/pavucontrol share/applications/pavucontrol.desktop -%%DOCSDIR%%/README %%DOCSDIR%%/README.html %%DOCSDIR%%/style.css share/locale/as/LC_MESSAGES/pavucontrol.mo share/locale/bn_IN/LC_MESSAGES/pavucontrol.mo share/locale/ca/LC_MESSAGES/pavucontrol.mo share/locale/cs/LC_MESSAGES/pavucontrol.mo share/locale/da/LC_MESSAGES/pavucontrol.mo share/locale/de/LC_MESSAGES/pavucontrol.mo share/locale/el/LC_MESSAGES/pavucontrol.mo share/locale/es/LC_MESSAGES/pavucontrol.mo share/locale/fi/LC_MESSAGES/pavucontrol.mo share/locale/fr/LC_MESSAGES/pavucontrol.mo share/locale/gu/LC_MESSAGES/pavucontrol.mo share/locale/hi/LC_MESSAGES/pavucontrol.mo share/locale/hu/LC_MESSAGES/pavucontrol.mo share/locale/it/LC_MESSAGES/pavucontrol.mo share/locale/ja/LC_MESSAGES/pavucontrol.mo share/locale/kn/LC_MESSAGES/pavucontrol.mo share/locale/ml/LC_MESSAGES/pavucontrol.mo share/locale/mr/LC_MESSAGES/pavucontrol.mo share/locale/nl/LC_MESSAGES/pavucontrol.mo share/locale/or/LC_MESSAGES/pavucontrol.mo share/locale/pa/LC_MESSAGES/pavucontrol.mo share/locale/pl/LC_MESSAGES/pavucontrol.mo share/locale/pt/LC_MESSAGES/pavucontrol.mo share/locale/pt_BR/LC_MESSAGES/pavucontrol.mo share/locale/ru/LC_MESSAGES/pavucontrol.mo share/locale/sk/LC_MESSAGES/pavucontrol.mo share/locale/sr/LC_MESSAGES/pavucontrol.mo share/locale/sr@latin/LC_MESSAGES/pavucontrol.mo share/locale/sv/LC_MESSAGES/pavucontrol.mo share/locale/ta/LC_MESSAGES/pavucontrol.mo share/locale/te/LC_MESSAGES/pavucontrol.mo share/locale/th/LC_MESSAGES/pavucontrol.mo share/locale/tr/LC_MESSAGES/pavucontrol.mo share/locale/uk/LC_MESSAGES/pavucontrol.mo share/locale/zh_CN/LC_MESSAGES/pavucontrol.mo %%DATADIR%%/pavucontrol.glade