wok-next rev 17982
pavucontrol: remove patch
author | Richard Dunbar <mojo@slitaz.org> |
---|---|
date | Sun Apr 19 16:50:55 2015 -0400 (2015-04-19) |
parents | adb299446f40 |
children | 87a2f75d7a93 |
files | pavucontrol/receipt pavucontrol/stuff/pavucontrol-2.0-gtk2.patch |
line diff
1.1 --- a/pavucontrol/receipt Sun Apr 19 16:32:26 2015 -0400 1.2 +++ b/pavucontrol/receipt Sun Apr 19 16:50:55 2015 -0400 1.3 @@ -17,7 +17,6 @@ 1.4 # Rules to configure and make the package. 1.5 compile_rules() 1.6 { 1.7 - patch -Np1 -i $stuff/pavucontrol-2.0-gtk2.patch 1.8 ./configure $CONFIGURE_ARGS --disable-gtk3 \ 1.9 && make && make install 1.10 }
2.1 --- a/pavucontrol/stuff/pavucontrol-2.0-gtk2.patch Sun Apr 19 16:32:26 2015 -0400 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,47 +0,0 @@ 2.4 -From 0aa2afc1b5ce24329f65c507111bfc1de5c53706 Mon Sep 17 00:00:00 2001 2.5 -From: Alam Arias <Alam.GBC@gmail.com> 2.6 -Date: Fri, 8 Mar 2013 13:33:42 -0500 2.7 -Subject: [PATCH] added back support for gtkmm-2.4 builds 2.8 - 2.9 ---- 2.10 - src/devicewidget.cc | 5 +++++ 2.11 - src/devicewidget.h | 4 ++++ 2.12 - 2 files changed, 9 insertions(+) 2.13 - 2.14 -diff --git a/src/devicewidget.cc b/src/devicewidget.cc 2.15 -index 1c34ea6..1a148ee 100644 2.16 ---- a/src/devicewidget.cc 2.17 -+++ b/src/devicewidget.cc 2.18 -@@ -63,8 +63,13 @@ 2.19 - for (unsigned i = 0; i < PA_CHANNELS_MAX; i++) 2.20 - channelWidgets[i] = NULL; 2.21 - 2.22 -+#ifdef HAVE_GTK3 2.23 - offsetAdjustment = Gtk::Adjustment::create(0.0, -2000.0, 2000.0, 10.0, 50.0, 0.0); 2.24 - offsetButton->configure(offsetAdjustment, 0, 2); 2.25 -+#else 2.26 -+ offsetAdjustment = new Gtk::Adjustment(0.0, -2000.0, 2000.0, 10.0, 50.0, 0.0); 2.27 -+ offsetButton->configure(*offsetAdjustment, 0.0, 2); 2.28 -+#endif /* HAVE_GTK3 */ 2.29 - } 2.30 - 2.31 - void DeviceWidget::init(MainWindow* mainWindow, Glib::ustring deviceType) { 2.32 -diff --git a/src/devicewidget.h b/src/devicewidget.h 2.33 -index d2dff51..586c2cf 100644 2.34 ---- a/src/devicewidget.h 2.35 -+++ b/src/devicewidget.h 2.36 -@@ -98,7 +98,11 @@ class DeviceWidget : public MinimalStreamWidget { 2.37 - Gtk::HBox *portSelect, *offsetSelect; 2.38 - Gtk::ComboBox *portList; 2.39 - Glib::RefPtr<Gtk::ListStore> treeModel; 2.40 -+#ifdef HAVE_GTK3 2.41 - Glib::RefPtr<Gtk::Adjustment> offsetAdjustment; 2.42 -+#else 2.43 -+ Gtk::Adjustment *offsetAdjustment; 2.44 -+#endif /* HAVE_GTK3 */ 2.45 - 2.46 - private: 2.47 - Glib::ustring mDeviceType; 2.48 --- 2.49 -1.8.1.6 2.50 -