[rpms/abrt] update-2.17.8: added forgotten patch

[rpms/abrt] update-2.17.8: added forgotten patch

[Jiri Moskovcak]

A new commit has been pushed.

Repo   : rpms/abrt
Branch : update-2.17.8
Commit : 5b837249a5b5a5d1f66d421e391d23cc8c9defa4
Author : Jiri Moskovcak <jmoskovc@redhat.com>
Date   : 2011-11-05T18:52:36+01:00
Stats  : +72/-0 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/abrt/c/5b837249a5b5a5d1f66d421e391d23cc8c9defa4?branch=update-2.17.8

Log:
added forgotten patch

---
diff --git a/0003-glib-2.31-build-fixes.patch b/0003-glib-2.31-build-fixes.patch
new file mode 100644
index 0000000..86f5ce4
--- /dev/null
+++ b/0003-glib-2.31-build-fixes.patch
@@ -0,0 +1,72 @@
+From ecfc461fd979aeb2d3ce4b9d811e4bf4a7730532 Mon Sep 17 00:00:00 2001
+From: Jiri Moskovcak <jmoskovc@redhat.com>
+Date: Sat, 5 Nov 2011 18:04:54 +0100
+Subject: [PATCH 3/3] - glib 2.31 build fixes
+
+---
+ src/applet/applet.c |   14 +++++++++++++-
+ src/gui-gtk/main.c  |    4 ++--
+ 2 files changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/src/applet/applet.c b/src/applet/applet.c
+index 95b7091..bead61f 100644
+--- a/src/applet/applet.c
++++ b/src/applet/applet.c
+@@ -766,10 +766,20 @@ int main(int argc, char** argv)
+     textdomain(PACKAGE);
+ #endif
+ 
++  /* Glib 2.31:
++    * Major changes to threading and synchronisation
++     - threading is now always enabled in GLib
++     - support for custom thread implementations (including our own internal
++     - support for errorcheck mutexes) has been removed
++  */
++#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 31)
++    //can't use log(), because g_verbose is not set yet
++    g_print("abrt-applet: glib < 2.31 - init threading\n");
+     /* Need to be thread safe */
+     g_thread_init(NULL);
+     gdk_threads_init();
+     gdk_threads_enter();
++#endif
+ 
+     gtk_init(&argc, &argv);
+ 
+@@ -869,8 +879,10 @@ int main(int argc, char** argv)
+ 
+     /* Enter main loop */
+     gtk_main();
+-
++#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 31)
+     gdk_threads_leave();
++#endif
++
+     if (notify_is_initted())
+         notify_uninit();
+ 
+diff --git a/src/gui-gtk/main.c b/src/gui-gtk/main.c
+index b31509b..a24745a 100644
+--- a/src/gui-gtk/main.c
++++ b/src/gui-gtk/main.c
+@@ -912,7 +912,7 @@ static gboolean handle_signal_pipe(GIOChannel *gio, GIOCondition condition, gpoi
+      */
+     gchar buf[16];
+     gsize bytes_read;
+-    g_io_channel_read(gio, buf, sizeof(buf), &bytes_read);
++    g_io_channel_read_chars(gio, buf, sizeof(buf), &bytes_read, NULL);
+ 
+     /* Destroy zombies */
+     while (safe_waitpid(-1, NULL, WNOHANG) > 0)
+@@ -975,7 +975,7 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin
+     /* We read inotify events, but don't analyze them */
+     gchar buf[sizeof(struct inotify_event) + PATH_MAX + 64];
+     gsize bytes_read;
+-    while (g_io_channel_read(gio, buf, sizeof(buf), &bytes_read) == G_IO_ERROR_NONE
++    while (g_io_channel_read_chars(gio, buf, sizeof(buf), &bytes_read, NULL) == G_IO_STATUS_NORMAL
+         && bytes_read > 0
+     ) {
+         continue;
+-- 
+1.7.7
+

[rpms/abrt] update-2.17.8: added forgotten patch

[Jiri Moskovcak]

A new commit has been pushed.

Repo   : rpms/abrt
Branch : update-2.17.8
Commit : f7e2556354e3ff5fbb8c807efc9a4f09ea8c355f
Author : Jiri Moskovcak <jmoskovc@redhat.com>
Date   : 2011-11-05T12:21:33+01:00
Stats  : +79/-0 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/abrt/c/f7e2556354e3ff5fbb8c807efc9a4f09ea8c355f?branch=update-2.17.8

Log:
added forgotten patch

---
diff --git a/0002-gtk3-build-fixes.patch b/0002-gtk3-build-fixes.patch
new file mode 100644
index 0000000..47682f2
--- /dev/null
+++ b/0002-gtk3-build-fixes.patch
@@ -0,0 +1,79 @@
+From af62f5f9fc31a8b24a56983d37cad2d29380ff20 Mon Sep 17 00:00:00 2001
+From: Jiri Moskovcak <jmoskovc@redhat.com>
+Date: Fri, 4 Nov 2011 15:28:15 +0100
+Subject: [PATCH 2/2] gtk3 build fixes
+
+---
+ configure.ac        |    7 ++++++-
+ src/applet/applet.c |    4 ++--
+ src/gui-gtk/main.c  |    7 ++++++-
+ 3 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6b0732c..d584047 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,6 +20,11 @@ AC_ARG_ENABLE(debug,
+                              [Enable debug information])],
+               [CFLAGS="$CFLAGS -DDEBUG -ggdb -g"])
+ 
++AC_ARG_ENABLE(gtk3,
++              [AC_HELP_STRING([--enable-gtk3],
++                             [Use gtk3 instead of gtk2])],
++              [GTK_VER="gtk+-3.0"],[GTK_VER="gtk+-2.0"])
++
+ dnl ****** INTERNATIONALIZATION **********************
+ GETTEXT_PACKAGE=abrt
+ AC_SUBST(GETTEXT_PACKAGE)
+@@ -56,7 +61,7 @@ AC_PATH_PROG([XMLTO], [xmlto], [no])
+     [exit 1]
+ [fi]
+ 
+-PKG_CHECK_MODULES([GTK], [gtk+-2.0])
++PKG_CHECK_MODULES([GTK], [$GTK_VER])
+ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.21])
+ PKG_CHECK_MODULES([DBUS], [dbus-1])
+ PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
+diff --git a/src/applet/applet.c b/src/applet/applet.c
+index 4ff73b6..95b7091 100644
+--- a/src/applet/applet.c
++++ b/src/applet/applet.c
+@@ -581,8 +581,8 @@ static void init_applet(void)
+             ap_status_icon = gtk_status_icon_new_from_icon_name("abrt");
+         }
+         hide_icon();
+-        g_signal_connect(G_OBJECT(ap_status_icon), "activate", GTK_SIGNAL_FUNC(on_applet_activate_cb), NULL);
+-        g_signal_connect(G_OBJECT(ap_status_icon), "popup_menu", GTK_SIGNAL_FUNC(on_menu_popup_cb), NULL);
++        g_signal_connect(G_OBJECT(ap_status_icon), "activate", G_CALLBACK(on_applet_activate_cb), NULL);
++        g_signal_connect(G_OBJECT(ap_status_icon), "popup_menu", G_CALLBACK(on_menu_popup_cb), NULL);
+         ap_menu = create_menu();
+     }
+ 
+diff --git a/src/gui-gtk/main.c b/src/gui-gtk/main.c
+index a8aacec..b31509b 100644
+--- a/src/gui-gtk/main.c
++++ b/src/gui-gtk/main.c
+@@ -25,6 +25,11 @@
+ #include <internal_libreport_gtk.h>
+ #include "libabrt.h"
+ 
++#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 22
++# define GDK_KEY_Delete GDK_Delete
++# define GDK_KEY_KP_Delete GDK_KP_Delete
++#endif
++
+ static void scan_dirs_and_add_to_dirlist(void);
+ 
+ 
+@@ -460,7 +465,7 @@ static gint on_key_press_event_cb(GtkTreeView *treeview, GdkEventKey *key, gpoin
+ {
+     int k = key->keyval;
+ 
+-    if (k == GDK_Delete || k == GDK_KP_Delete)
++    if (k == GDK_KEY_Delete || k == GDK_KEY_KP_Delete)
+     {
+         delete_report(treeview);
+         return TRUE;
+-- 
+1.7.7
+