From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d569m-0004bY-BZ for guix-patches@gnu.org; Mon, 01 May 2017 03:54:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d569j-0006LF-5K for guix-patches@gnu.org; Mon, 01 May 2017 03:54:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:50263) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d569i-0006LB-T1 for guix-patches@gnu.org; Mon, 01 May 2017 03:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d569i-00038N-Go for guix-patches@gnu.org; Mon, 01 May 2017 03:54:02 -0400 Subject: bug#26718: Update hexchat to 2.12.4 Resent-Message-ID: Date: Mon, 1 May 2017 09:52:36 +0200 From: Julien Lepiller Message-ID: <20170501095233.3f647127@lepiller.eu> In-Reply-To: <3ceff414-da73-2415-a43f-62da6c8b3814@tobias.gr> References: <20170430192256.40abec3c@lepiller.eu> <20170430213539.789280bb@lepiller.eu> <20170430200534.GA27383@jasmine> <3ceff414-da73-2415-a43f-62da6c8b3814@tobias.gr> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/JYd47pBR68U9Q60ewcY6MJY" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26718@debbugs.gnu.org --MP_/JYd47pBR68U9Q60ewcY6MJY Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Le Sun, 30 Apr 2017 23:11:24 +0200, Tobias Geerinckx-Rice a =C3=A9crit : > On 30/04/17 22:05, Leo Famulari wrote: > > Then there are changes we make in order to port software to Guix or > > make other relatively unimportant changes. If they can be done with > > a sed-like / regex substitution, we do them in build phases. It's > > helpful to keep them in Scheme, and we don't want to distribute > > them via `guix build --source`. =20 >=20 > Ah, I never considered this as a Guix-related fix: shipping symlinks > to /usr might happen to work on some (?) other systems, but it's > obviously not how autotools should be used. >=20 > We should serve users with a --source tarball that is either already > bootstrapped or ready to be, not in some dead-end third state. >=20 > The correct answer in either case is, of course: =E2=80=98it's a silly de= tail, > Tobias=E2=80=99. >=20 > Kind regards, >=20 > T G-R >=20 Here's the updated patch. --MP_/JYd47pBR68U9Q60ewcY6MJY Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-hexchat-Update-to-2.12.4.patch =46rom 1d631e557802e2392df5f744b22cbd8d732b31fa Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 30 Apr 2017 19:21:46 +0200 Subject: [PATCH] gnu: hexchat: Update to 2.12.4. * gnu/packages/messaging.scm (hexchat): Update to 2.12.4. --- gnu/packages/messaging.scm | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 59e2b23d3..5754fb2d3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2014, 2015, 2016 Mark H Weaver -;;; Copyright =C2=A9 2014 Julien Lepiller +;;; Copyright =C2=A9 2014, 2017 Julien Lepiller ;;; Copyright =C2=A9 2015 Taylan Ulrich Bay=C4=B1rl=C4=B1/Kammer ;;; Copyright =C2=A9 2015 Andreas Enge ;;; Copyright =C2=A9 2015, 2016, 2017 Ricardo Wurmus @@ -166,17 +166,35 @@ identi.ca and status.net).") (define-public hexchat (package (name "hexchat") - (version "2.12.2") + (version "2.12.4") (source (origin (method url-fetch) (uri (string-append "https://dl.hexchat.net/hexchat/hexchat-" version ".tar.xz")) (sha256 (base32 - "1xnclfbrgbkqndxygi5f27q00jd7yy54jbd1061jmhxa6wzpibbd")))) + "0ficrx56knz5y297qb0x5y02339yvyv734z7kpcx1ixvb0qr2dgs")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete dangling symlinks to a non-existent =E2=80=98/= usr=E2=80=99. + (with-directory-excursion "m4" + (for-each (lambda (f) (delete-file f)) + '("intltool.m4" "libtool.m4" "lt~obsolete.m4" + "ltoptions.m4" "ltsugar.m4" "ltversion.m4"= ))) + (delete-file-recursively "build-aux") + (delete-file "po/Makefile.in.in") + ;; This file is still required for autoreconf. + (copy-file (string-append (assoc-ref inputs "intltool") + "/share/intltool/Makefile.in.i= n") + "po/Makefile.in.in"))))) (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config) - ("intltool" ,intltool))) + (native-inputs `(("autoconf" ,autoconf) + ("autoconf-archive" ,autoconf-archive) + ("automake" ,automake) + ("intltool" ,intltool) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) (inputs `(("dbus-glib" ,dbus-glib) ("dbus" ,dbus) ("enchant" ,enchant) @@ -190,6 +208,13 @@ identi.ca and status.net).") ("luajit" ,luajit) ("perl-xml-parser" ,perl-xml-parser) ("python-2" ,python-2))) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Release 2.12.4 wasn't properly bootstrapped. Later ones might= be! + (add-after 'unpack 'bootstrap + (lambda* (#:key inputs #:allow-other-keys) + (zero? (system* "autoreconf" "-fiv"))))))) (synopsis "Graphical IRC Client") (description "HexChat lets you connect to multiple IRC networks at once. The main --=20 2.12.2 --MP_/JYd47pBR68U9Q60ewcY6MJY--