[emacs] Rebuild with new ImageMagick

[Petr Hracek]

commit 6530f9798d7837d1dad63b2856cb4136d53bff80
Author: Petr Hracek <phracek at redhat.com>
Date:   Thu Apr 4 13:03:20 2013 +0200

    Rebuild with new ImageMagick

 emacs-gtk-warning.patch |   43 +++++++++++++++++++++++++++++++++++++++++++
 emacs.spec              |    5 ++++-
 2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/emacs-gtk-warning.patch b/emacs-gtk-warning.patch
new file mode 100644
index 0000000..b01f2cf
--- /dev/null
+++ b/emacs-gtk-warning.patch
@@ -0,0 +1,43 @@
+diff --git a/src/gtkutil.c b/src/gtkutil.c
+index 44f828c..d434a48 100644
+--- a/src/gtkutil.c
++++ b/src/gtkutil.c
+@@ -784,6 +784,14 @@ xg_hide_tooltip (FRAME_PTR f)
+     General functions for creating widgets, resizing, events, e.t.c.
+  ***********************************************************************/
+ 
++static void
++my_log_handler (const gchar *log_domain, GLogLevelFlags log_level,
++                        const gchar *msg, gpointer user_data)
++{
++    if (!strstr (msg, "visible children"))
++        fprintf (stderr, "XX %s-WARNING **: %s\n", log_domain, msg);
++}
++
+ /* Make a geometry string and pass that to GTK.  It seems this is the
+    only way to get geometry position right if the user explicitly
+    asked for a position when starting Emacs.
+@@ -799,6 +807,7 @@ xg_set_geometry (FRAME_PTR f)
+       int top = f->top_pos;
+       int yneg = f->size_hint_flags & YNegative;
+       char geom_str[sizeof "=x--" + 4 * INT_STRLEN_BOUND (int)];
++      guint id;
+ 
+       if (xneg)
+         left = -left;
+@@ -811,9 +820,15 @@ xg_set_geometry (FRAME_PTR f)
+                (xneg ? '-' : '+'), left,
+                (yneg ? '-' : '+'), top);
+ 
++      /* Silence warning about visible children.  */
++      id = g_log_set_handler ("Gtk", G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL
++                              | G_LOG_FLAG_RECURSION, my_log_handler, NULL);
++
+       if (!gtk_window_parse_geometry (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
+                                       geom_str))
+         fprintf (stderr, "Failed to parse: '%s'\n", geom_str);
++
++      g_log_remove_handler ("Gtk", id);
+     }
+ }
+ 
diff --git a/emacs.spec b/emacs.spec
index ec2e64d..762328b 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 24.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -447,6 +447,9 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/emacs/site-lisp/site-start.d
 
 %changelog
+* Thu Apr 04 2013 Petr Hracek <phracek at redhat.com> - 1:24.3-6
+- Rebuild with new ImageMagick
+
 * Thu Apr 04 2013 Petr Hracek <phracek at redhat.com> - 1:24.3-5
 - Fix for Gtk-Warning (#929353)