From ee5137df0526fe52685ad62b333c0f6a7f06a751 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Jan 22 2013 14:15:05 +0000
Subject: libmcs has been deprecated by GSettings. Do not use it in newly written code.


---

diff --git a/audacious-plugins-3.3.3-aosd-trigger-config.patch b/audacious-plugins-3.3.3-aosd-trigger-config.patch
new file mode 100644
index 0000000..e4a7489
--- /dev/null
+++ b/audacious-plugins-3.3.3-aosd-trigger-config.patch
@@ -0,0 +1,13 @@
+diff -Nur audacious-plugins-3.3.3-orig/src/aosd/aosd_cfg.c audacious-plugins-3.3.3/src/aosd/aosd_cfg.c
+--- audacious-plugins-3.3.3-orig/src/aosd/aosd_cfg.c	2012-12-11 00:49:06.000000000 +0100
++++ audacious-plugins-3.3.3/src/aosd/aosd_cfg.c	2013-01-22 15:06:22.090800928 +0100
+@@ -322,7 +322,8 @@
+     while ( trig_active_strv[j] != NULL )
+     {
+       gint trig_active_val = strtol( trig_active_strv[j] , NULL , 10 );
+-      g_array_append_val( cfg->osd->trigger.active , trig_active_val );
++      if (trig_active_val<4 && trig_active_val>=0)
++          g_array_append_val( cfg->osd->trigger.active , trig_active_val );
+       j++;
+     }
+     g_strfreev( trig_active_strv );
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 2163b34..72c59b3 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -11,7 +11,7 @@
 
 Name: audacious-plugins
 Version: 3.3.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -34,6 +34,9 @@ Patch3: audacious-plugins-3.3.3-m3u-empty-lines.patch
 Patch4: audacious-plugins-3.3.3-wavpack.patch
 # merged from post-3.3.x for libcdio API changes
 Patch5: audacious-plugins-3.3.3-libcdio.patch
+# special aosd plugin config with triggers for Audacious <= 3.2.4
+# crashes with 3.3.3 because of renamed/reduced constants (bz #902796)
+Patch6: audacious-plugins-3.3.3-aosd-trigger-config.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: gettext-devel
@@ -140,6 +143,7 @@ providers may build it with libsidplay 2 instead.
 %patch3 -p1 -b .m3u-empty-lines
 %patch4 -p1 -b .wavpack
 %patch5 -p1 -b .libcdio-new
+%patch6 -p1 -b .aosd-trigger-config
 
 for i in src/ladspa/plugin.c
 do
@@ -224,6 +228,10 @@ make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
 
 
 %changelog
+* Tue Jan 22 2013 Michael Schwendt <mschwendt@fedoraproject.org> - 3.3.3-4
+- Make AOSD plug-in not crash when running into old config values from
+  Audacious 3.2.4 or older. User should revisit plug-in preferences, too!
+
 * Fri Jan 11 2013 Michael Schwendt <mschwendt@fedoraproject.org> - 3.3.3-3
 - Drop added .desktop files in favour of advertizing all MimeTypes in
   Audacious' own .desktop file. This is supposed to fix the assignment