version 0.5.1-1

3 files changed, 55 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e3ba9cb3ad90..f0056084a4a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = volumeicon-gtk2
 	pkgdesc = Volume control for your system tray (compiled for gtk2)
-	pkgver = 0.5.0
-	pkgrel = 3
+	pkgver = 0.5.1
+	pkgrel = 1
 	url = http://softwarebakery.com/maato/volumeicon.html
 	arch = x86_64
 	arch = i686
@@ -12,10 +12,10 @@ pkgbase = volumeicon-gtk2
 	depends = libnotify
 	provides = volumeicon
 	conflicts = volumeicon
-	source = http://softwarebakery.com/maato/files/volumeicon/volumeicon-0.5.0.tar.gz
+	source = http://softwarebakery.com/maato/files/volumeicon/volumeicon-0.5.1.tar.gz
 	source = gtk2.patch
-	sha256sums = e5f1179f9ec5ab25e3740e4f6bbe0baa75368f0ae87d370197b3fbefb61bd782
-	sha256sums = d9be16c6536008dd6e8d40a2b7ea9b82c3d6048698c948caddfc9a61ee1ace7e
+	sha256sums = 24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
+	sha256sums = 68a0d28096e40ec734a0dd27d7bbfba45e26024a609a06aa52b5c6c5f1c665b8
 
 pkgname = volumeicon-gtk2
 
diff --git a/PKGBUILD b/PKGBUILD
index 6b384e32c45f..5428a6afebc5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
 
 pkgname=volumeicon-gtk2
 _pkgname=volumeicon
-pkgver=0.5.0
-pkgrel=3
+pkgver=0.5.1
+pkgrel=1
 pkgdesc='Volume control for your system tray (compiled for gtk2)'
 arch=('x86_64' 'i686')
 url='http://softwarebakery.com/maato/volumeicon.html'
@@ -20,8 +20,8 @@ depends=('gtk2' 'alsa-lib' 'libnotify')
 makedepends=('intltool')
 source=("http://softwarebakery.com/maato/files/volumeicon/$_pkgname-$pkgver.tar.gz"
         gtk2.patch)
-sha256sums=('e5f1179f9ec5ab25e3740e4f6bbe0baa75368f0ae87d370197b3fbefb61bd782'
-            'd9be16c6536008dd6e8d40a2b7ea9b82c3d6048698c948caddfc9a61ee1ace7e')
+sha256sums=('24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0'
+            '68a0d28096e40ec734a0dd27d7bbfba45e26024a609a06aa52b5c6c5f1c665b8')
 
 prepare() {
   cd "$_pkgname-$pkgver"
@@ -36,7 +36,7 @@ build() {
   ./configure \
     --prefix=/usr \
     --enable-notify
-  make
+  make V=0
 }
 
 package() {
diff --git a/gtk2.patch b/gtk2.patch
index 4a8d6cbac2ce..a86062334bdd 100644
--- a/gtk2.patch
+++ b/gtk2.patch
@@ -1,6 +1,6 @@
-diff -up src/volumeicon-0.5.0/configure.ac.orig src/volumeicon-0.5.0/configure.ac
---- src/volumeicon-0.5.0/configure.ac.orig	2013-02-25 09:06:49.000000000 -0700
-+++ src/volumeicon-0.5.0/configure.ac	2014-05-17 08:58:51.000000000 -0600
+diff -up src/volumeicon-0.5.1/configure.ac.orig src/volumeicon-0.5.1/configure.ac
+--- src/volumeicon-0.5.1/configure.ac.orig	2015-03-02 15:42:13.000000000 -0700
++++ src/volumeicon-0.5.1/configure.ac	2015-07-19 19:54:36.000000000 -0600
 @@ -35,7 +35,7 @@ AC_ARG_ENABLE([notify],
    [notify=no])
  
@@ -30,9 +30,9 @@ diff -up src/volumeicon-0.5.0/configure.ac.orig src/volumeicon-0.5.0/configure.a
  CPPFLAGS=${OLD_CPPFLAGS}
  
  # Pass the absolute path to the OSS header file
-diff -up src/volumeicon-0.5.0/src/bind.c.orig src/volumeicon-0.5.0/src/bind.c
---- src/volumeicon-0.5.0/src/bind.c.orig	2012-10-25 09:59:10.000000000 -0600
-+++ src/volumeicon-0.5.0/src/bind.c	2014-05-17 08:57:35.000000000 -0600
+diff -up src/volumeicon-0.5.1/src/bind.c.orig src/volumeicon-0.5.1/src/bind.c
+--- src/volumeicon-0.5.1/src/bind.c.orig	2015-03-02 13:03:01.000000000 -0700
++++ src/volumeicon-0.5.1/src/bind.c	2015-07-19 19:54:36.000000000 -0600
 @@ -151,7 +151,11 @@ grab_ungrab_with_ignorable_modifiers (Gd
  			XGrabKey (GDK_WINDOW_XDISPLAY (rootwin),
  			          keycode,
@@ -59,10 +59,10 @@ diff -up src/volumeicon-0.5.0/src/bind.c.orig src/volumeicon-0.5.0/src/bind.c
  		}
  	}
  	gdk_flush();
-diff -up src/volumeicon-0.5.0/src/volumeicon.c.orig src/volumeicon-0.5.0/src/volumeicon.c
---- src/volumeicon-0.5.0/src/volumeicon.c.orig	2013-02-25 08:52:49.000000000 -0700
-+++ src/volumeicon-0.5.0/src/volumeicon.c	2014-05-17 08:57:35.000000000 -0600
-@@ -527,6 +527,7 @@ static gboolean scale_timeout(gpointer d
+diff -up src/volumeicon-0.5.1/src/volumeicon.c.orig src/volumeicon-0.5.1/src/volumeicon.c
+--- src/volumeicon-0.5.1/src/volumeicon.c.orig	2015-03-02 15:27:44.000000000 -0700
++++ src/volumeicon-0.5.1/src/volumeicon.c	2015-07-19 20:06:26.000000000 -0600
+@@ -710,6 +710,7 @@ static gboolean scale_timeout(gpointer d
  	gtk_window_get_size(GTK_WINDOW(m_scale_window), &window.width, &window.height);
  	gtk_status_icon_get_geometry(m_status_icon, NULL, &icon, NULL);
  
@@ -70,7 +70,7 @@ diff -up src/volumeicon-0.5.0/src/volumeicon.c.orig src/volumeicon-0.5.0/src/vol
  	GdkWindow *root_window;
  	GdkDeviceManager *device_manager;
  	GdkDevice *pointer;
-@@ -536,6 +537,15 @@ static gboolean scale_timeout(gpointer d
+@@ -719,6 +720,15 @@ static gboolean scale_timeout(gpointer d
  	device_manager = gdk_display_get_device_manager(gdk_window_get_display(root_window));
  	pointer = gdk_device_manager_get_client_pointer(device_manager);
  	gdk_window_get_device_position(root_window, pointer, &x, &y, NULL);
@@ -86,7 +86,7 @@ diff -up src/volumeicon-0.5.0/src/volumeicon.c.orig src/volumeicon-0.5.0/src/vol
  
  	if(scale_point_in_rect(&window, x, y) || scale_point_in_rect(&icon, x, y))
  	{
-@@ -827,6 +837,7 @@ static void render_widget (cairo_t *cair
+@@ -1070,6 +1080,7 @@ static void render_widget (cairo_t *cair
  	cairo_paint (cairo_context);
  }
  
@@ -94,7 +94,7 @@ diff -up src/volumeicon-0.5.0/src/volumeicon.c.orig src/volumeicon-0.5.0/src/vol
  static void update_widget (GtkWidget *widget, gint width, gint height)
  {
  	cairo_surface_t *mask;
-@@ -857,6 +868,32 @@ static void update_widget (GtkWidget *wi
+@@ -1100,6 +1111,32 @@ static void update_widget (GtkWidget *wi
  		cairo_surface_destroy(mask);
  	}
  }
@@ -127,7 +127,7 @@ diff -up src/volumeicon-0.5.0/src/volumeicon.c.orig src/volumeicon-0.5.0/src/vol
  
  static gboolean on_configure (GtkWidget *widget, GdkEventConfigure *event, gpointer user_data)
  {
-@@ -871,9 +908,17 @@ static gboolean on_configure (GtkWidget
+@@ -1114,9 +1151,17 @@ static gboolean on_configure (GtkWidget
  
  static gboolean on_draw (GtkWidget *widget, cairo_t *cairo_context, gpointer user_data)
  {
@@ -145,25 +145,31 @@ diff -up src/volumeicon-0.5.0/src/volumeicon.c.orig src/volumeicon-0.5.0/src/vol
  	return FALSE;
  }
  
-@@ -888,10 +933,17 @@ static void scale_setup()
+@@ -1131,11 +1176,21 @@ static void scale_setup()
  {
  	GdkScreen *screen;
  
 +#if GTK_CHECK_VERSION(3,0,0)
  	if(config_get_use_horizontal_slider())
  		m_scale = gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL, 0.0, 100.0, 1.0);
- 	else
+-	else
++	else {
  		m_scale = gtk_scale_new_with_range(GTK_ORIENTATION_VERTICAL, 0.0, 100.0, 1.0);
+-	gtk_range_set_inverted(GTK_RANGE(m_scale), TRUE);
++		gtk_range_set_inverted(GTK_RANGE(m_scale), TRUE);
++	}
 +#elif GTK_CHECK_VERSION(2,16,0)
 +	if (config_get_use_horizontal_slider())
 +		m_scale = gtk_hscale_new_with_range(0.0, 100.0, 1.0);
-+	else
++	else {
 +		m_scale = gtk_vscale_new_with_range(0.0, 100.0, 1.0);
++		gtk_range_set_inverted(GTK_RANGE(m_scale), TRUE);
++	}
 +#endif
- 	gtk_range_set_inverted(GTK_RANGE(m_scale), TRUE);
  	gtk_scale_set_draw_value(GTK_SCALE(m_scale), config_get_show_sound_level());
  
-@@ -904,15 +956,27 @@ static void scale_setup()
+ 	m_scale_window = gtk_window_new(GTK_WINDOW_POPUP);
+@@ -1147,15 +1202,27 @@ static void scale_setup()
  			gtk_widget_set_visual(GTK_WIDGET(m_scale_window), visual);
  			gtk_widget_set_app_paintable(GTK_WIDGET(m_scale_window), TRUE);
  			gtk_widget_realize(GTK_WIDGET(m_scale_window));
@@ -191,3 +197,23 @@ diff -up src/volumeicon-0.5.0/src/volumeicon.c.orig src/volumeicon-0.5.0/src/vol
  		}
  	}
  
+@@ -1273,11 +1340,19 @@ int main(int argc, char * argv[])
+     gtk_progress_bar_set_fraction(m_pbar, 0.0);
+     gtk_orientable_set_orientation(GTK_ORIENTABLE(m_pbar),
+                                    GTK_ORIENTATION_HORIZONTAL);
++#if GTK_CHECK_VERSION(3,0,0)
+     gtk_progress_bar_set_show_text(m_pbar, TRUE);
++#endif
+     gtk_widget_show(GTK_WIDGET(m_pbar));
+ 
+     /* Add icon image and progress bar to hbox. */
++#if GTK_CHECK_VERSION(3,0,0)
+     GtkBox *hbox = (GtkBox *)gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3);
++#elif GTK_CHECK_VERSION(2,16,0)
++    GtkHBox *hbox = (GtkHBox *)gtk_hbox_new(FALSE, 3);
++#else
++#error No GTK version
++#endif
+     gtk_box_pack_start(
+         GTK_BOX(hbox), GTK_WIDGET(m_popup_icon), FALSE, FALSE, 0);
+     gtk_box_pack_start(