[PATCH] gnu: xchat: Add new pkg XChat IRC Client

DoneSubmitted by R Veera Kumar.
Details
2 participants
  • Gábor Boskovits
  • R Veera Kumar
Owner
unassigned
Severity
normal
R
R
R Veera Kumar wrote on 24 Mar 10:25 +0100
(address . guix-patches@gnu.org)
20200324092526.GA3208@tulip
Add the XChat IRC client for Guix.
As per IRC Chat in #guix drakonis, brendyyn objected to inclusion of thisin guix. They said xchat is old, unmaintained software and no new releasesince 2010. Hexchat is new maintained version. Debian 10 stills pkgs it.
Gabor Boskovits told me send in it as wontfix and be put in issue tracker.
Regards,Veera
R
R
R Veera Kumar wrote on 24 Mar 10:47 +0100
[PATCH] gnu: xchat: Add new xchat package
(address . 40208@debbugs.gnu.org)
20200324094723.GA3296@tulip
Add XChat IRC client for X
Signed-off-by: R Veera Kumar <vkor@vkten.in>--- .../xchat-2.8.8-configure-with-gmodule.patch | 29 +++++++++++ .../xchat-2.8.8-glib-single-include.patch | 47 ++++++++++++++++++ gnu/packages/xchat.scm | 49 +++++++++++++++++++ 3 files changed, 125 insertions(+) create mode 100644 gnu/packages/patches/xchat-2.8.8-configure-with-gmodule.patch create mode 100644 gnu/packages/patches/xchat-2.8.8-glib-single-include.patch create mode 100644 gnu/packages/xchat.scm
Toggle diff (145 lines)diff --git a/gnu/packages/patches/xchat-2.8.8-configure-with-gmodule.patch b/gnu/packages/patches/xchat-2.8.8-configure-with-gmodule.patchnew file mode 100644index 0000000000..ee8c347089--- /dev/null+++ b/gnu/packages/patches/xchat-2.8.8-configure-with-gmodule.patch@@ -0,0 +1,29 @@+Description: Don't strip -lgmodule-2.0 from RDYNAMIC_LIBS+Author: R Veera Kumar <vkor@vkten.in>++---+diff -uN a/configure b/configure+--- a/configure 2020-03-22 07:31:13.869314485 +0530++++ b/configure 2020-03-22 07:33:25.295563550 +0530+@@ -18010,7 +18010,7 @@+ fi+ + +- RDYNAMIC_FLAGS="`$pkgconfigpath gmodule-2.0 --libs | $sedpath 's/ -lgmodule-2.0//'`"++ RDYNAMIC_FLAGS="`$pkgconfigpath gmodule-2.0 --libs`"+ LIBS="$LIBS $RDYNAMIC_FLAGS"+ if test "$LD" = ""; then+ VS="`ld --help | grep version-script 2> /dev/null`"+diff -uN a/configure.in b/configure.in+--- a/configure.in 2020-03-22 07:26:51.872539516 +0530++++ b/configure.in 2020-03-22 07:32:28.192334665 +0530+@@ -445,8 +445,7 @@+ if test "$have_dl" = yes; then+ AC_DEFINE(USE_PLUGIN)+ AC_PATH_PROG(pkgconfigpath, pkg-config)+- dnl we just need the -Wl,--export-dynamic, but not -lgmodule-2.0+- RDYNAMIC_FLAGS="`$pkgconfigpath gmodule-2.0 --libs | $sedpath 's/ -lgmodule-2.0//'`"++ RDYNAMIC_FLAGS="`$pkgconfigpath gmodule-2.0 --libs`"+ LIBS="$LIBS $RDYNAMIC_FLAGS"+ if test "$LD" = ""; then+ VS="`ld --help | grep version-script 2> /dev/null`"diff --git a/gnu/packages/patches/xchat-2.8.8-glib-single-include.patch b/gnu/packages/patches/xchat-2.8.8-glib-single-include.patchnew file mode 100644index 0000000000..e19b3b22e1--- /dev/null+++ b/gnu/packages/patches/xchat-2.8.8-glib-single-include.patch@@ -0,0 +1,47 @@+--- a/src/common/servlist.c++++ b/src/common/servlist.c+@@ -24,7 +24,7 @@+ #include <unistd.h>+ + #include "xchat.h"+-#include <glib/ghash.h>++#include <glib.h>+ + #include "cfgfiles.h"+ #include "fe.h"+--- a/src/common/text.c++++ b/src/common/text.c+@@ -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"+--- a/src/common/util.c++++ b/src/common/util.c+@@ -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"+--- a/src/common/xchat.h++++ b/src/common/xchat.h+@@ -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_Hdiff --git a/gnu/packages/xchat.scm b/gnu/packages/xchat.scmnew file mode 100644index 0000000000..551a8e3ca5--- /dev/null+++ b/gnu/packages/xchat.scm@@ -0,0 +1,49 @@+(define-module (gnu packages xchat)+ #:use-module ((guix licenses) #:prefix license:)+ #:use-module (guix packages)+ #:use-module (guix download)+ #:use-module (guix build-system gnu)+ #:use-module (gnu packages)+ #:use-module (gnu packages glib)+ #:use-module (gnu packages gtk)+ #:use-module (gnu packages image)+ #:use-module (gnu packages pkg-config))++(define-public xchat+ (package+ (name "xchat")+ (version "2.8.8")+ (source+ (origin+ (method url-fetch)+ (uri (string-append "http://xchat.org/files/source/2.8/xchat-"+ version ".tar.xz"))+ (sha256+ (base32 "02riy26ssnvqkbzvlc2lihdwfjh02j6fvl5xbmzy2xjmggcazdrp"))+ (patches+ (search-patches+ "xchat-2.8.8-configure-with-gmodule.patch"+ "xchat-2.8.8-glib-single-include.patch"))))+ (build-system gnu-build-system)+ (native-inputs+ `(("pkg-config" ,pkg-config)))+ (inputs+ `(("libpng" ,libpng)+ ("pango" ,pango)+ ("glib" ,glib)+ ("atk" , atk)+ ("gtk+" ,gtk+-2)))+ (arguments+ `(#:configure-flags+ (list+ "--enable-plugin"+ "--disable-nls"+ "--disable-python"+ "--disable-perl")+ #:tests? #f))+ (home-page "http://xchat.org/")+ (synopsis "Graphical IRC client for X")+ (description+ "XChat is a fully-featured graphical IRC client using the GTK+ toolkit.+It supports multiple server/channel windows, dialog windows and a plugin API.")+ (license license:gpl2)))-- 2.25.1
G
G
Gábor Boskovits wrote on 29 Mar 11:33 +0200
[PATCH] gnu: xchat: Add new pkg XChat IRC Client
(address . control@debbugs.gnu.org)
CAE4v=phEYZnpmQtQX7ALsAs7=_L_WngYSSNdZ9Kit9te2-2sqQ@mail.gmail.com
tags 40208 wontfixclose 40208
-- OpenPGP Key Fingerprint: 7988:3B9F:7D6A:4DBF:3719:0367:2506:A96C:CF63:0B21
G
G
Gábor Boskovits wrote on 29 Mar 15:27 +0200
Fwd: Closing XChat won't fix
(address . 40208-done@debbugs.gnu.org)
CAE4v=pi-8azQsAi1tmnPPVTe4Z62d81mnrZg-Tn61qm3Kbt8-Q@mail.gmail.com
---------- Forwarded message ---------Feladó: Gábor Boskovits <boskovits@gmail.com>Date: 2020. márc. 29., V, 14:30Subject: Closing XChat won't fixTo: <40208-done@debbugs.gnu.org>

First of all, thanks for this patch.
As the patch is for inclusion unmaintained software with several knownbugs, this will not be merged.
Nevertheless keeping it in the tracker will help others not to runinto this again.
As this is a working recipe I would vouch for it as a valid andcompleted contribution.
Best regards,g_bor--OpenPGP Key Fingerprint: 7988:3B9F:7D6A:4DBF:3719:0367:2506:A96C:CF63:0B21

-- OpenPGP Key Fingerprint: 7988:3B9F:7D6A:4DBF:3719:0367:2506:A96C:CF63:0B21
Closed
?