pyrox.dev / nixpkgs
lol
fork atom

xchat: Fix build with glib-2.32.4

Shea Levy f85fc1ea 1e4e0c18

+77
+2
pkgs/applications/networking/irc/xchat/default.nix
··· 9 9 buildInputs = [pkgconfig tcl gtk]; 10 10 configureFlags = "--disable-nls"; 11 11 12 + patches = [ ./glib-top-level-header.patch ]; 13 + 12 14 meta = { 13 15 description = "IRC client using GTK"; 14 16 homepage = http://www.xchat.org;
+75
pkgs/applications/networking/irc/xchat/glib-top-level-header.patch
··· 1 + diff -Naur xchat-2.8.8-orig/src/common/dbus/dbus-plugin.c xchat-2.8.8/src/common/dbus/dbus-plugin.c 2 + --- xchat-2.8.8-orig/src/common/dbus/dbus-plugin.c 2009-08-16 05:40:15.000000000 -0400 3 + +++ xchat-2.8.8/src/common/dbus/dbus-plugin.c 2012-07-15 23:07:33.678948703 -0400 4 + @@ -24,7 +24,7 @@ 5 + #include <config.h> 6 + #include <dbus/dbus-glib.h> 7 + #include <dbus/dbus-glib-lowlevel.h> 8 + -#include <glib/gi18n.h> 9 + +#include <glib.h> 10 + #include "../xchat-plugin.h" 11 + 12 + #define PNAME _("remote access") 13 + diff -Naur xchat-2.8.8-orig/src/common/modes.c xchat-2.8.8/src/common/modes.c 14 + --- xchat-2.8.8-orig/src/common/modes.c 2010-05-29 21:52:18.000000000 -0400 15 + +++ xchat-2.8.8/src/common/modes.c 2012-07-15 23:07:33.654948723 -0400 16 + @@ -20,7 +20,7 @@ 17 + #include <stdlib.h> 18 + #include <stdio.h> 19 + #include <glib.h> 20 + -#include <glib/gprintf.h> 21 + +#include <glib.h> 22 + 23 + #include "xchat.h" 24 + #include "xchatc.h" 25 + diff -Naur xchat-2.8.8-orig/src/common/servlist.c xchat-2.8.8/src/common/servlist.c 26 + --- xchat-2.8.8-orig/src/common/servlist.c 2010-05-16 03:24:26.000000000 -0400 27 + +++ xchat-2.8.8/src/common/servlist.c 2012-07-15 23:07:33.643948732 -0400 28 + @@ -24,7 +24,7 @@ 29 + #include <unistd.h> 30 + 31 + #include "xchat.h" 32 + -#include <glib/ghash.h> 33 + +#include <glib.h> 34 + 35 + #include "cfgfiles.h" 36 + #include "fe.h" 37 + diff -Naur xchat-2.8.8-orig/src/common/text.c xchat-2.8.8/src/common/text.c 38 + --- xchat-2.8.8-orig/src/common/text.c 2010-05-29 22:14:41.000000000 -0400 39 + +++ xchat-2.8.8/src/common/text.c 2012-07-15 23:07:33.671948706 -0400 40 + @@ -28,7 +28,7 @@ 41 + #include <sys/mman.h> 42 + 43 + #include "xchat.h" 44 + -#include <glib/ghash.h> 45 + +#include <glib.h> 46 + #include "cfgfiles.h" 47 + #include "chanopt.h" 48 + #include "plugin.h" 49 + diff -Naur xchat-2.8.8-orig/src/common/util.c xchat-2.8.8/src/common/util.c 50 + --- xchat-2.8.8-orig/src/common/util.c 2009-08-16 05:40:16.000000000 -0400 51 + +++ xchat-2.8.8/src/common/util.c 2012-07-15 23:07:33.649948724 -0400 52 + @@ -39,7 +39,7 @@ 53 + #include <errno.h> 54 + #include "xchat.h" 55 + #include "xchatc.h" 56 + -#include <glib/gmarkup.h> 57 + +#include <glib.h> 58 + #include <ctype.h> 59 + #include "util.h" 60 + #include "../../config.h" 61 + diff -Naur xchat-2.8.8-orig/src/common/xchat.h xchat-2.8.8/src/common/xchat.h 62 + --- xchat-2.8.8-orig/src/common/xchat.h 2009-08-16 05:40:16.000000000 -0400 63 + +++ xchat-2.8.8/src/common/xchat.h 2012-07-15 23:08:20.855910521 -0400 64 + @@ -1,10 +1,6 @@ 65 + #include "../../config.h" 66 + 67 + -#include <glib/gslist.h> 68 + -#include <glib/glist.h> 69 + -#include <glib/gutils.h> 70 + -#include <glib/giochannel.h> 71 + -#include <glib/gstrfuncs.h> 72 + +#include <glib.h> 73 + #include <time.h> /* need time_t */ 74 + 75 + #ifndef XCHAT_H