[mail-notification] Applied various Debian patches

[Erik van Pienbroek]

commit 14785bdeb4b51941cb9afb559504347530dc7ec4
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Jun 15 15:51:20 2012 +0200

    Applied various Debian patches
    
    - Drop Fedora >= 15 conditionals as older Fedora versions aren't supported any more
    - Don't crash when the system tray manager (like gnome-shell) is restarted
      Patch created by Julien Danjou, http://bugs.debian.org/500880
    - Fix segfault when the Polish translation is used
      Patch created by Przemysław, http://bugs.debian.org/523873

 eggtrayicon-segfault-fix.patch |   16 ++++++++++++++++
 mail-notification.spec         |   24 ++++++++++++++++++------
 polish-error-fix.patch         |   19 +++++++++++++++++++
 3 files changed, 53 insertions(+), 6 deletions(-)
---
diff --git a/eggtrayicon-segfault-fix.patch b/eggtrayicon-segfault-fix.patch
new file mode 100644
index 0000000..7fe1877
--- /dev/null
+++ b/eggtrayicon-segfault-fix.patch
@@ -0,0 +1,16 @@
+Description: Avoid segfaulting if no display is found
+Author: Julien Danjou <julien at danjou.info>
+Origin: http://bugs.debian.org/500880
+
+--- mail-notification-5.4.dfsg.1.orig/src/eggtrayicon.c
++++ mail-notification-5.4.dfsg.1/src/eggtrayicon.c
+@@ -326,6 +326,9 @@
+ 
+   xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
+ 
++  if (!xdisplay)
++    return;
++
+   XGrabServer (xdisplay);
+ 
+   icon->manager_window = XGetSelectionOwner (xdisplay,
diff --git a/mail-notification.spec b/mail-notification.spec
index bec02f5..a1e68eb 100644
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        5.4
-Release:        57%{?dist}
+Release:        58%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -25,6 +25,8 @@ Patch14:	mail-notification-5.4-make-properties-dialog-resizable.patch
 Patch15:	mail-notification-5.4-prevent-memory-corruption-in-tooltips-code.patch
 Patch16:	mail-notification-5.4-libemail.patch
 Patch17:	mail-notification-5.4-prevent-stack-overflow-in-verify-ssl-certificate-function.patch
+Patch18:	eggtrayicon-segfault-fix.patch
+Patch19:	polish-error-fix.patch
 
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils, scrollkeeper
@@ -88,8 +90,6 @@ Evolution support for Mail Notification.
 
 # Evolution 3.0 requires a patch as the pkgconfig names have changed
 # GTK3 requires various changes as well
-%if 0%{?fedora} >= 15
-
 # Convert the Glade UI to GtkBuilder
 pushd ui
 gtk-builder-convert mailbox-properties-dialog.glade mailbox-properties-dialog.ui
@@ -100,7 +100,6 @@ popd
 
 %patch9 -p0 -b .evolution30
 %patch10 -p0 -b .gtk3
-%endif
 
 # Temporary patch to build without any optimalisations so we
 # can get better stacktraces for RHBZ #531088
@@ -125,6 +124,14 @@ popd
 # https://bugzilla.redhat.com/show_bug.cgi?id=810054
 %patch17 -p0 -b .stack_overflow_verify_ssl_certificate
 
+# Don't crash when the system tray manager (like gnome-shell) is restarted
+# Patch created by Julien Danjou, http://bugs.debian.org/500880
+%patch18 -p1 -b .eggtrayicon_segfault
+
+# Fix segfault when the Polish translation is used
+# Patch created by Przemysław, http://bugs.debian.org/523873
+%patch19 -p1 -b .polish_translation_segfault
+
 #  Drop #line statements in C sources generated by .gob,
 #  for the proper debuginfo package
 pushd build/src
@@ -186,13 +193,11 @@ desktop-file-install --vendor fedora                   \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/mail-notification-properties.desktop
 
 # Replace the Glade files with their GtkBuilder counterparts
-%if 0%{?fedora} >= 15
 pushd ui
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/*.glade
 install -m0644 mailbox-properties-dialog.ui $RPM_BUILD_ROOT%{_datadir}/%{name}/mailbox-properties-dialog.ui
 install -m0644 properties-dialog.ui $RPM_BUILD_ROOT%{_datadir}/%{name}/properties-dialog.ui
 popd
-%endif
 
 %find_lang %{name}
 
@@ -239,6 +244,13 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %changelog
+* Fri Jun 15 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4-58
+- Drop Fedora >= 15 conditionals as older Fedora versions aren't supported any more
+- Don't crash when the system tray manager (like gnome-shell) is restarted
+  Patch created by Julien Danjou, http://bugs.debian.org/500880
+- Fix segfault when the Polish translation is used
+  Patch created by Przemysław, http://bugs.debian.org/523873
+
 * Sun Jun 10 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4-57
 - Another rebuild against the latest evolution
 
diff --git a/polish-error-fix.patch b/polish-error-fix.patch
new file mode 100644
index 0000000..cc99623
--- /dev/null
+++ b/polish-error-fix.patch
@@ -0,0 +1,19 @@
+Description: Fix format string typo in the Polish translation
+Author: Przemysław <prometheus at o2.pl>
+Origin: http://bugs.debian.org/523873
+
+--- mail-notification-5.4.dfsg.1.orig/po/pl.po
++++ mail-notification-5.4.dfsg.1/po/pl.po
+@@ -777,9 +777,9 @@
+ #, c-format
+ msgid "feed retrieved successfully (%i byte)"
+ msgid_plural "feed retrieved successfully (%i bytes)"
+-msgstr[0] "nagłówek pobrany pomyślnie (%s bajt)"
+-msgstr[1] "nagłówek pobrany pomyślnie (%s bajty)"
+-msgstr[2] "nagłówek pobrany pomyślnie (%s bajtów)"
++msgstr[0] "nagłówek pobrany pomyślnie (%i bajt)"
++msgstr[1] "nagłówek pobrany pomyślnie (%i bajty)"
++msgstr[2] "nagłówek pobrany pomyślnie (%i bajtów)"
+ 
+ #: ../src/mn-gmail-mailbox.gob:203 ../src/mn-gmail-mailbox.gob:254
+ msgid "unable to parse feed"