# HG changeset patch # User Richard Dunbar # Date 1429476655 14400 # Node ID 057c6366ef5915d15d6148be23cce6e803077aae # Parent adb299446f406cd7aa474045f867e4c9d88dff63 pavucontrol: remove patch diff -r adb299446f40 -r 057c6366ef59 pavucontrol/receipt --- a/pavucontrol/receipt Sun Apr 19 16:32:26 2015 -0400 +++ b/pavucontrol/receipt Sun Apr 19 16:50:55 2015 -0400 @@ -17,7 +17,6 @@ # Rules to configure and make the package. compile_rules() { - patch -Np1 -i $stuff/pavucontrol-2.0-gtk2.patch ./configure $CONFIGURE_ARGS --disable-gtk3 \ && make && make install } diff -r adb299446f40 -r 057c6366ef59 pavucontrol/stuff/pavucontrol-2.0-gtk2.patch --- a/pavucontrol/stuff/pavucontrol-2.0-gtk2.patch Sun Apr 19 16:32:26 2015 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -From 0aa2afc1b5ce24329f65c507111bfc1de5c53706 Mon Sep 17 00:00:00 2001 -From: Alam Arias -Date: Fri, 8 Mar 2013 13:33:42 -0500 -Subject: [PATCH] added back support for gtkmm-2.4 builds - ---- - src/devicewidget.cc | 5 +++++ - src/devicewidget.h | 4 ++++ - 2 files changed, 9 insertions(+) - -diff --git a/src/devicewidget.cc b/src/devicewidget.cc -index 1c34ea6..1a148ee 100644 ---- a/src/devicewidget.cc -+++ b/src/devicewidget.cc -@@ -63,8 +63,13 @@ - for (unsigned i = 0; i < PA_CHANNELS_MAX; i++) - channelWidgets[i] = NULL; - -+#ifdef HAVE_GTK3 - offsetAdjustment = Gtk::Adjustment::create(0.0, -2000.0, 2000.0, 10.0, 50.0, 0.0); - offsetButton->configure(offsetAdjustment, 0, 2); -+#else -+ offsetAdjustment = new Gtk::Adjustment(0.0, -2000.0, 2000.0, 10.0, 50.0, 0.0); -+ offsetButton->configure(*offsetAdjustment, 0.0, 2); -+#endif /* HAVE_GTK3 */ - } - - void DeviceWidget::init(MainWindow* mainWindow, Glib::ustring deviceType) { -diff --git a/src/devicewidget.h b/src/devicewidget.h -index d2dff51..586c2cf 100644 ---- a/src/devicewidget.h -+++ b/src/devicewidget.h -@@ -98,7 +98,11 @@ class DeviceWidget : public MinimalStreamWidget { - Gtk::HBox *portSelect, *offsetSelect; - Gtk::ComboBox *portList; - Glib::RefPtr treeModel; -+#ifdef HAVE_GTK3 - Glib::RefPtr offsetAdjustment; -+#else -+ Gtk::Adjustment *offsetAdjustment; -+#endif /* HAVE_GTK3 */ - - private: - Glib::ustring mDeviceType; --- -1.8.1.6 -