diff --git a/xchat-2.8.8-glib.patch b/xchat-2.8.8-glib.patch new file mode 100644 index 0000000..0012ce5 --- /dev/null +++ b/xchat-2.8.8-glib.patch @@ -0,0 +1,61 @@ +--- src/common/text.c.orig 2012-02-25 11:05:23.890274334 -0600 ++++ src/common/text.c 2012-02-25 11:05:39.006195489 -0600 +@@ -28,7 +28,7 @@ + #include + + #include "xchat.h" +-#include ++#include + #include "cfgfiles.h" + #include "chanopt.h" + #include "plugin.h" +--- src/common/servlist.c.orig 2012-02-25 11:04:30.601501605 -0600 ++++ src/common/servlist.c 2012-02-25 11:04:42.964072823 -0600 +@@ -24,7 +24,7 @@ + #include + + #include "xchat.h" +-#include ++#include + + #include "cfgfiles.h" + #include "fe.h" +--- src/common/dbus/dbus-client.c.orig 2012-02-25 10:59:23.948527589 -0600 ++++ src/common/dbus/dbus-client.c 2012-02-25 11:00:40.082203787 -0600 +@@ -53,11 +53,6 @@ + GError *error = NULL; + char *command = NULL; + +- /* GnomeVFS >=2.15 uses D-Bus and threads, so threads should be +- * initialised before opening for the first time a D-Bus connection */ +- if (!g_thread_supported ()) { +- g_thread_init (NULL); +- } + dbus_g_thread_init (); + + /* if there is nothing to do, return now. */ +--- src/common/xchat.h.orig 2012-02-25 11:29:33.400499630 -0600 ++++ src/common/xchat.h 2012-02-25 11:29:51.774834912 -0600 +@@ -1,10 +1,6 @@ + #include "../../config.h" + +-#include +-#include +-#include +-#include +-#include ++#include + #include /* need time_t */ + + #ifndef XCHAT_H +--- src/common/util.c.orig 2012-02-25 11:38:29.404622998 -0600 ++++ src/common/util.c 2012-02-25 11:38:51.904482615 -0600 +@@ -39,7 +39,7 @@ + #include + #include "xchat.h" + #include "xchatc.h" +-#include ++#include + #include + #include "util.h" + #include "../../config.h" diff --git a/xchat.spec b/xchat.spec index 40fe0da..84624e9 100644 --- a/xchat.spec +++ b/xchat.spec @@ -4,7 +4,7 @@ Summary: A popular and easy to use graphical IRC (chat) client Name: xchat Version: 2.8.8 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 1 Group: Applications/Internet License: GPLv2+ @@ -34,6 +34,8 @@ Patch52: xchat-2.8.8-libnotify07.patch # link against libnotify # https://sourceforge.net/tracker/?func=detail&aid=3280223&group_id=239&atid=100239 Patch53: xchat-2.8.8-link-against-libnotify.patch +# Only glib.h can be included and g_thread_init should no longer be used +Patch54: xchat-2.8.8-glib.patch BuildRequires: perl perl(ExtUtils::Embed) python-devel openssl-devel pkgconfig, tcl-devel BuildRequires: GConf2-devel BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60 @@ -88,6 +90,7 @@ This package contains the X-Chat plugin providing the Tcl scripting interface. %patch51 -p1 -b .freenode-ports %patch52 -p1 -b .libnotify07 %patch53 -p1 -b .link-against-libnotify +%patch54 -p0 -b .glib sed -i -e 's/#define GTK_DISABLE_DEPRECATED//g' src/fe-gtk/*.c @@ -184,6 +187,9 @@ fi %{_libdir}/xchat/plugins/tcl.so %changelog +* Sat Feb 25 2012 Bruno Wolff III - 1:2.8.8-13 +- Adjust to glib changes so that xchat will build again + * Sat Jan 14 2012 Fedora Release Engineering - 1:2.8.8-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild