From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d76xq-0006bm-HZ for guix-patches@gnu.org; Sat, 06 May 2017 17:10:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d76xm-00012x-7N for guix-patches@gnu.org; Sat, 06 May 2017 17:10:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:60460) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d76xl-00012s-RC for guix-patches@gnu.org; Sat, 06 May 2017 17:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d76xl-00045k-Js for guix-patches@gnu.org; Sat, 06 May 2017 17:10:01 -0400 Subject: bug#26718: Update hexchat to 2.12.4 Resent-Message-ID: Date: Sat, 6 May 2017 23:08:34 +0200 From: Julien Lepiller Message-ID: <20170506230826.5a13541c@lepiller.eu> In-Reply-To: <20170506195518.GA28630@jasmine> References: <20170430192256.40abec3c@lepiller.eu> <20170430213539.789280bb@lepiller.eu> <20170430200534.GA27383@jasmine> <3ceff414-da73-2415-a43f-62da6c8b3814@tobias.gr> <20170501095233.3f647127@lepiller.eu> <20170505202157.GC18285@jasmine> <20170506195518.GA28630@jasmine> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/oV1mrmeLsC.OU7qFIXn1/Vs" 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_/oV1mrmeLsC.OU7qFIXn1/Vs Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Le Sat, 6 May 2017 15:55:18 -0400, Leo Famulari a =C3=A9crit : > On Fri, May 05, 2017 at 04:21:57PM -0400, Leo Famulari wrote: > > On Mon, May 01, 2017 at 09:52:36AM +0200, Julien Lepiller wrote: =20 > > > Subject: [PATCH] gnu: hexchat: Update to 2.12.4. > > >=20 > > > * gnu/packages/messaging.scm (hexchat): Update to 2.12.4. =20 > >=20 > > LGTM, thank you! =20 >=20 > Sorry, I only checked it for style. It fails to build like this: >=20 > ------ > source is under 'hexchat-2.12.4' > ;;; /gnu/store/19lkrck1844idbcfq6ajzr0akmr8rshj-hexchat-2.12.4.tar.xz-bui= lder:1:2293: > warning: possibly unbound variable `inputs' Backtrace: > In ice-9/boot-9.scm: > 160: 14 [catch #t # ...] > In unknown file: > ?: 13 [apply-smob/1 #] > In ice-9/boot-9.scm: > 66: 12 [call-with-prompt prompt0 ...] > In ice-9/eval.scm: > 432: 11 [eval # #] > In ice-9/boot-9.scm: > 2412: 10 [save-module-excursion # ice-9/boot-9.scm:4084:3 ()>] 4089: 9 [# ice-9/boot-9.scm:4084:3 ()>] 1734: 8 [%start-stack load-stack > #] 1739: 7 > [#] In unknown file: > ?: 6 [primitive-load > "/gnu/store/19lkrck1844idbcfq6ajzr0akmr8rshj-hexchat-2.12.4.tar.xz-builde= r"] > In ice-9/eval.scm: 399: 5 [eval # #] > In system/base/compile.scm: > 254: 4 [compile (begin # # # ...) #:from scheme ...] > 182: 3 [lp (#value (x e opts)>) # 8dd020> ...] In ice-9/boot-9.scm: > 2412: 2 [save-module-excursion # language/objcode/spec.scm:33:9 ()>] In language/objcode/spec.scm: > 35: 1 [#] > In /gnu/store/19lkrck1844idbcfq6ajzr0akmr8rshj-hexchat-2.12.4.tar.xz-buil= der: > 1: 0 [#] >=20 > /gnu/store/19lkrck1844idbcfq6ajzr0akmr8rshj-hexchat-2.12.4.tar.xz-builder= :1:2293: > In procedure # ()>: /gnu/store/19lkrck1844idbcfq6ajzr0akmr8rshj-hexchat-2.12.4.tar.xz-bu= ilder:1:2293: > In procedure module-lookup: Unbound variable: inputs builder for > `/gnu/store/gp1jrrhk8hd46ji2gciyjjpgxr9lhfxc-hexchat-2.12.4.tar.xz.drv' > failed with exit code 1 @ > build-failed /gnu/store/gp1jrrhk8hd46ji2gciyjjpgxr9lhfxc-hexchat-2.12.4.t= ar.xz.drv > - 1 builder for > `/gnu/store/gp1jrrhk8hd46ji2gciyjjpgxr9lhfxc-hexchat-2.12.4.tar.xz.drv' > failed with exit code 1 cannot build derivation > `/gnu/store/g6jrq9a0bj4za1yg0fcx9ni7nkwlm91r-hexchat-2.12.4.drv': 1 > dependencies couldn't be built guix build: error: build failed: build > of `/gnu/store/g6jrq9a0bj4za1yg0fcx9ni7nkwlm91r-hexchat-2.12.4.drv' > failed ------ >=20 > So, I reverted it with commit > 2f0ad2a4232549a3bbb43565fa3b82a6c85e59a8. Indeed, I made a mistake here... So here is a patch that should work (tested). --MP_/oV1mrmeLsC.OU7qFIXn1/Vs Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-hexchat-Update-to-2.12.4.patch =46rom 5e001a92828dd998d5ed5c3b3a2772c1c15e303f 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. MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (hexchat): Update to 2.12.4. [source]: Remove incorrectly bootstrapped files. [native-inputs]: Add autoconf, autoconf-archive, automake, libtool, pkg-config. [arguments]: Add =E2=80=98bootstrap=E2=80=99 phase. --- 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 9e45b7ad0..89df0970d 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,31 @@ 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"))))) (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 +204,17 @@ 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) + ;; This file is still required for autoreconf. + (copy-file (string-append (assoc-ref inputs "intltool") + "/share/intltool/Makefile.in.in") + "po/Makefile.in.in") + (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_/oV1mrmeLsC.OU7qFIXn1/Vs--