From patchwork Tue Mar 24 09:47:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: R Veera Kumar X-Patchwork-Id: 20870 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CA95427BBEA; Tue, 24 Mar 2020 10:22:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 643B727BBE4 for ; Tue, 24 Mar 2020 10:22:14 +0000 (GMT) Received: from localhost ([::1]:45642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGghJ-0007Iv-UZ for patchwork@mira.cbaines.net; Tue, 24 Mar 2020 06:22:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52195) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGghA-0007D4-8O for guix-patches@gnu.org; Tue, 24 Mar 2020 06:22:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGgh8-00084z-Kx for guix-patches@gnu.org; Tue, 24 Mar 2020 06:22:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47952) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGgh8-00084i-H9 for guix-patches@gnu.org; Tue, 24 Mar 2020 06:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jGgh8-0002s4-E4 for guix-patches@gnu.org; Tue, 24 Mar 2020 06:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40208] [PATCH] gnu: xchat: Add new xchat package References: <20200324092526.GA3208@tulip> In-Reply-To: <20200324092526.GA3208@tulip> Resent-From: R Veera Kumar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Mar 2020 10:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40208 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40208@debbugs.gnu.org Received: via spool by 40208-submit@debbugs.gnu.org id=B40208.158504527410947 (code B ref 40208); Tue, 24 Mar 2020 10:22:02 +0000 Received: (at 40208) by debbugs.gnu.org; 24 Mar 2020 10:21:14 +0000 Received: from localhost ([127.0.0.1]:53923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jGggM-0002qQ-1V for submit@debbugs.gnu.org; Tue, 24 Mar 2020 06:21:14 -0400 Received: from vkten.in ([104.244.73.96]:56660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jGg9s-0001w2-MD for 40208@debbugs.gnu.org; Tue, 24 Mar 2020 05:47:41 -0400 Received: (qmail 1844 invoked from network); 24 Mar 2020 09:47:32 -0000 Received: from unknown (HELO tulip) (vkor@vkten.in@117.202.224.5) de/crypted with TLSv1.3: TLS_AES_256_GCM_SHA384 [256/256] DN=none by vkten with ESMTPSA; 24 Mar 2020 09:47:32 -0000 Date: Tue, 24 Mar 2020 15:17:23 +0530 From: R Veera Kumar Message-ID: <20200324094723.GA3296@tulip> MIME-Version: 1.0 Content-Disposition: inline X-Mailman-Approved-At: Tue, 24 Mar 2020 06:21:12 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Add XChat IRC client for X Signed-off-by: R Veera Kumar --- .../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 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.patch new file mode 100644 index 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 + +--- +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.patch new file mode 100644 index 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 + + #include "xchat.h" +-#include ++#include + + #include "cfgfiles.h" + #include "fe.h" +--- a/src/common/text.c ++++ b/src/common/text.c +@@ -28,7 +28,7 @@ + #include + + #include "xchat.h" +-#include ++#include + #include "cfgfiles.h" + #include "chanopt.h" + #include "plugin.h" +--- a/src/common/util.c ++++ b/src/common/util.c +@@ -39,7 +39,7 @@ + #include + #include "xchat.h" + #include "xchatc.h" +-#include ++#include + #include + #include "util.h" + #include "../../config.h" +--- a/src/common/xchat.h ++++ b/src/common/xchat.h +@@ -1,10 +1,6 @@ + #include "../../config.h" + +-#include +-#include +-#include +-#include +-#include ++#include + #include /* need time_t */ + + #ifndef XCHAT_H diff --git a/gnu/packages/xchat.scm b/gnu/packages/xchat.scm new file mode 100644 index 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)))