dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #12171 from jgillich/rm-xchat

Browse Source 
removed xchat
This commit is contained in:
Shea Levy 2016-01-06 07:37:56 -05:00
commit 64f85edad8
3 changed files with 0 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/networking/irc/xchat/default.nix
View File

@ -1,19 +0,0 @@
{stdenv, fetchurl, pkgconfig, tcl, gtk, gtkspell }:
stdenv.mkDerivation {
name = "xchat-2.8.8";
src = fetchurl {
url = http://www.xchat.org/files/source/2.8/xchat-2.8.8.tar.bz2;
sha256 = "0d6d69437b5e1e45f3e66270fe369344943de8a1190e498fafa5296315a27db0";
};
buildInputs = [pkgconfig tcl gtk gtkspell];
configureFlags = "--disable-nls --enable-spell=gtkspell";
patches = [ ./glib-top-level-header.patch ];
meta = {
description = "IRC client using GTK";
homepage = http://www.xchat.org;
platforms = with stdenv.lib.platforms; linux;
};
}

75
pkgs/applications/networking/irc/xchat/glib-top-level-header.patch
View File

@ -1,75 +0,0 @@
diff -Naur xchat-2.8.8-orig/src/common/dbus/dbus-plugin.c xchat-2.8.8/src/common/dbus/dbus-plugin.c
--- xchat-2.8.8-orig/src/common/dbus/dbus-plugin.c 2009-08-16 05:40:15.000000000 -0400
+++ xchat-2.8.8/src/common/dbus/dbus-plugin.c 2012-07-15 23:07:33.678948703 -0400
@@ -24,7 +24,7 @@
#include <config.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
-#include <glib/gi18n.h>
+#include <glib.h>
#include "../xchat-plugin.h"
#define PNAME _("remote access")
diff -Naur xchat-2.8.8-orig/src/common/modes.c xchat-2.8.8/src/common/modes.c
--- xchat-2.8.8-orig/src/common/modes.c 2010-05-29 21:52:18.000000000 -0400
+++ xchat-2.8.8/src/common/modes.c 2012-07-15 23:07:33.654948723 -0400
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <glib.h>
-#include <glib/gprintf.h>
+#include <glib.h>
#include "xchat.h"
#include "xchatc.h"
diff -Naur xchat-2.8.8-orig/src/common/servlist.c xchat-2.8.8/src/common/servlist.c
--- xchat-2.8.8-orig/src/common/servlist.c 2010-05-16 03:24:26.000000000 -0400
+++ xchat-2.8.8/src/common/servlist.c 2012-07-15 23:07:33.643948732 -0400
@@ -24,7 +24,7 @@
#include <unistd.h>
#include "xchat.h"
-#include <glib/ghash.h>
+#include <glib.h>
#include "cfgfiles.h"
#include "fe.h"
diff -Naur xchat-2.8.8-orig/src/common/text.c xchat-2.8.8/src/common/text.c
--- xchat-2.8.8-orig/src/common/text.c 2010-05-29 22:14:41.000000000 -0400
+++ xchat-2.8.8/src/common/text.c 2012-07-15 23:07:33.671948706 -0400
@@ -28,7 +28,7 @@
#include <sys/mman.h>
#include "xchat.h"
-#include <glib/ghash.h>
+#include <glib.h>
#include "cfgfiles.h"
#include "chanopt.h"
#include "plugin.h"
diff -Naur xchat-2.8.8-orig/src/common/util.c xchat-2.8.8/src/common/util.c
--- xchat-2.8.8-orig/src/common/util.c 2009-08-16 05:40:16.000000000 -0400
+++ xchat-2.8.8/src/common/util.c 2012-07-15 23:07:33.649948724 -0400
@@ -39,7 +39,7 @@
#include <errno.h>
#include "xchat.h"
#include "xchatc.h"
-#include <glib/gmarkup.h>
+#include <glib.h>
#include <ctype.h>
#include "util.h"
#include "../../config.h"
diff -Naur xchat-2.8.8-orig/src/common/xchat.h xchat-2.8.8/src/common/xchat.h
--- xchat-2.8.8-orig/src/common/xchat.h 2009-08-16 05:40:16.000000000 -0400
+++ xchat-2.8.8/src/common/xchat.h 2012-07-15 23:08:20.855910521 -0400
@@ -1,10 +1,6 @@
#include "../../config.h"
-#include <glib/gslist.h>
-#include <glib/glist.h>
-#include <glib/gutils.h>
-#include <glib/giochannel.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
#include <time.h> /* need time_t */
#ifndef XCHAT_H

2
pkgs/top-level/all-packages.nix
View File

@ -13746,8 +13746,6 @@ let
xchainkeys = callPackage ../tools/X11/xchainkeys { };
xchat = callPackage ../applications/networking/irc/xchat { };
xchm = callPackage ../applications/misc/xchm { };
inherit (xorg) xcompmgr;