[volumeicon] Fix build error on rawhide

[Christoph Wickert]

commit 8c714012304c4e68805b5f0ab255814f5e95cc54
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Jan 28 13:02:39 2012 +0100

    Fix build error on rawhide

 volumeicon-0.4.6-fedora.patch |   30 ++++++++++++++++++++++++++++++
 volumeicon.spec               |   10 ++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)
---
diff --git a/volumeicon-0.4.6-fedora.patch b/volumeicon-0.4.6-fedora.patch
new file mode 100644
index 0000000..81e6bbb
--- /dev/null
+++ b/volumeicon-0.4.6-fedora.patch
@@ -0,0 +1,30 @@
+diff --git a/src/alsa_backend.c b/src/alsa_backend.c
+index 4635231..d9d63a5 100644
+--- a/src/alsa_backend.c
++++ b/src/alsa_backend.c
+@@ -22,10 +22,8 @@
+ //##############################################################################
+ 
+ #include <alsa/asoundlib.h>
+-#include <glib/gstring.h>
+-#include <glib/gstdio.h>
+-#include <glib/glist.h>
+-#include <glib/giochannel.h>
++
++#include <glib.h>
+ 
+ #include "alsa_backend.h"
+ 
+diff --git a/src/volumeicon.c b/src/volumeicon.c
+index 29d787b..5b7f6cd 100644
+--- a/src/volumeicon.c
++++ b/src/volumeicon.c
+@@ -761,7 +761,7 @@ static void volume_icon_load_icons()
+ 		gchar * icon_path = g_strdup_printf(ICONS_DIR"/%s/%d.png",
+ 			config_get_theme(), i+1);
+ 		if(icons_loaded && (NULL != m_icons[i]))
+-			gdk_pixbuf_unref(m_icons[i]);
++			g_object_unref(m_icons[i]);
+ 		m_icons[i] = gdk_pixbuf_new_from_file(icon_path, NULL);
+ 		if(NULL == m_icons[i])
+ 			g_message("Failed to load '%s'", icon_path);
diff --git a/volumeicon.spec b/volumeicon.spec
index 5bcdb06..0c27135 100644
--- a/volumeicon.spec
+++ b/volumeicon.spec
@@ -2,7 +2,7 @@
 
 Name:           volumeicon
 Version:        0.4.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Lightweight volume control for the system tray
 
 License:        GPLv3
@@ -13,6 +13,8 @@ Source1:        %{name}.desktop
 # Use pavucontrol by default in Fedora. Not upstreamed.
 # Do not hardcode card hw:0. Submitted upstream by mail on 2012-01-14. Accepted.
 Patch0:         %{name}-0.4.5-default-config.patch
+# Fix build error on Fedora. Received by mail from upstream on 2012-01-19.
+Patch1:         %{name}-0.4.6-fedora.patch
 
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
@@ -35,7 +37,8 @@ Features:
 
 %prep
 %setup -q
-#%patch0 -p1 -b .default
+%patch0 -p1 -b .default
+%patch1 -p1 -b .default
 
 
 %build
@@ -61,6 +64,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/
 
 %changelog
+* Sat Jan 28 2012 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.5-2
+- Fix build error on rawhide
+
 * Sat Jan 14 2012 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.5-1
 - Update ot 0.4.5 (#781649)
 - Enable libnotify support (#781642)