[mail-notification/f14/master] Fix a crash (RHBZ #654826) and build with -O0

[epienbro]

commit a4a8d3020adf9f02d4c88820374e2a7d119b7c73
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Thu Feb 17 18:23:55 2011 +0100

    Fix a crash (RHBZ #654826) and build with -O0
    
    - Don't throw assertion errors (and a possible crash) when
      some icons can't be found. Fixes RHBZ #654826
    - (Temporary) build with -O0 in order to get more sane stacktraces so
      we can properly investigate and fix RHBZ #531088

 mail-notification-5.4-add-fallback-icon.patch      |   16 ++++++++++++++++
 ...ication-5.4-build-without-optimalisations.patch |   12 ++++++++++++
 mail-notification.spec                             |   20 ++++++++++++++++++--
 3 files changed, 46 insertions(+), 2 deletions(-)
---
diff --git a/mail-notification-5.4-add-fallback-icon.patch b/mail-notification-5.4-add-fallback-icon.patch
new file mode 100644
index 0000000..41c28e8
--- /dev/null
+++ b/mail-notification-5.4-add-fallback-icon.patch
@@ -0,0 +1,16 @@
+--- src/mn-stock.c.orig	2011-02-17 17:42:39.886767087 +0100
++++ src/mn-stock.c	2011-02-17 17:49:37.415541177 +0100
+@@ -86,6 +86,13 @@
+ 	  gtk_icon_source_set_icon_name(icon_source, icons[i].icon_name);
+ 	  gtk_icon_set_add_source(icon_set, icon_source);
+ 	  gtk_icon_source_free(icon_source);
++
++          /* Add a fallback icon */
++          icon_source = gtk_icon_source_new();
++          gtk_icon_source_set_icon_name(icon_source, "mail-notification");
++          gtk_icon_source_set_state_wildcarded(icon_source, TRUE);
++          gtk_icon_set_add_source(icon_set, icon_source);
++          gtk_icon_source_free(icon_source);
+ 	}
+       else if (icons[i].source_stock_id)
+ 	{
diff --git a/mail-notification-5.4-build-without-optimalisations.patch b/mail-notification-5.4-build-without-optimalisations.patch
new file mode 100644
index 0000000..7dce834
--- /dev/null
+++ b/mail-notification-5.4-build-without-optimalisations.patch
@@ -0,0 +1,12 @@
+--- jbsrc/jb.c.orig	2011-02-08 23:11:32.767114666 +0100
++++ jbsrc/jb.c	2011-02-08 23:18:48.870910628 +0100
+@@ -443,6 +443,9 @@
+    */
+   jb_compile_options_add_ldflags(object->compile_options, "-Wl,--export-dynamic");
+ 
++  jb_compile_options_add_cppflags(object->compile_options, "-O0");
++  jb_compile_options_add_ldflags(object->compile_options, "-O0");
++
+   jb_compile_options_add_libs(object->compile_options, "-lm");
+ 
+   jb_compile_options_add_package(object->compile_options, "gettext");
diff --git a/mail-notification.spec b/mail-notification.spec
index 7cedd31..4ef9728 100644
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        5.4
-Release:        25%{?dist}
+Release:        26%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -16,6 +16,8 @@ Patch5:		mail-notification-5.4-icons.patch
 Patch6:		mail-notification-5.4-weak.patch
 Patch7:		mail-notification-5.4-popup-attach.patch
 Patch8:		mail-notification-5.4-kde-trayicon.patch
+Patch9:		mail-notification-5.4-build-without-optimalisations.patch
+Patch10:	mail-notification-5.4-add-fallback-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext
@@ -75,7 +77,15 @@ Evolution support for Mail Notification.
 %patch7 -p1 -b .popup_attach
 %patch8 -p1 -b .kde_trayicon
 
-#  Drop #line statements in C sources generated bu .gob,
+# Temporary patch to build without any optimalisations so we
+# can get better stacktraces for RHBZ #531088
+%patch9 -p0 -b .gcc
+
+# Don't throw assertion errors (and a possible crash) when
+# some icons can't be found. Fixes RHBZ #654826
+%patch10 -p0 -b .fallback_icon
+
+#  Drop #line statements in C sources generated by .gob,
 #  for the proper debuginfo package
 pushd build/src
 for f in *.c *.h
@@ -199,6 +209,12 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
 
 %changelog
+* Thu Feb 17 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4-26
+- Don't throw assertion errors (and a possible crash) when
+  some icons can't be found. Fixes RHBZ #654826
+- (Temporary) build with -O0 in order to get more sane stacktraces so
+  we can properly investigate and fix RHBZ #531088
+
 * Mon Oct 11 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-25
 - fix popup window place
   (#608372, by Erik van Pienbroek <erik-fedora at vanpienbroek.nl>)