From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4tR4-00074m-Mw for guix-patches@gnu.org; Sun, 30 Apr 2017 14:19:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4tR0-0003Tc-Li for guix-patches@gnu.org; Sun, 30 Apr 2017 14:19:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:49820) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d4tR0-0003TY-HC for guix-patches@gnu.org; Sun, 30 Apr 2017 14:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d4tR0-0005tp-By for guix-patches@gnu.org; Sun, 30 Apr 2017 14:19:02 -0400 Subject: bug#26718: Update hexchat to 2.12.4 Resent-Message-ID: References: <20170430192256.40abec3c@lepiller.eu> From: Tobias Geerinckx-Rice Message-ID: Date: Sun, 30 Apr 2017 20:19:49 +0200 MIME-Version: 1.0 In-Reply-To: <20170430192256.40abec3c@lepiller.eu> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="7MCphg8xFAxNJcanXi1okASkJRbF5aqSs" 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: julien@lepiller.eu, 26718@debbugs.gnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --7MCphg8xFAxNJcanXi1okASkJRbF5aqSs Content-Type: multipart/mixed; boundary="txVcjJ2tRD63mCUKsHDMfKloKutAfLlD4"; protected-headers="v1" From: Tobias Geerinckx-Rice To: julien@lepiller.eu, 26718@debbugs.gnu.org Message-ID: Subject: Re: bug#26718: Update hexchat to 2.12.4 References: <20170430192256.40abec3c@lepiller.eu> In-Reply-To: <20170430192256.40abec3c@lepiller.eu> --txVcjJ2tRD63mCUKsHDMfKloKutAfLlD4 Content-Type: multipart/mixed; boundary="------------331A5DE1AA72AA49F517B30D" This is a multi-part message in MIME format. --------------331A5DE1AA72AA49F517B30D Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Julien, On 30/04/17 19:22, Julien Lepiller wrote: > Hi, >=20 > here is a patch to update hexchat to 2.12.4. =2E..great! I was just doing the exact same thing. :-D > Subject: [PATCH] gnu: hexchat: Update to 2.12.4. > > * gnu/packages/messaging.scm (hexchat): Update to 2.12.4. The commit message must also mention new native-inputs, phases, etc. > (native-inputs `(("pkg-config" ,pkg-config) > - ("intltool" ,intltool))) > + ("intltool" ,intltool) > + ("autoconf" ,autoconf) > + ("autoconf-archive" ,autoconf-archive) > + ("automake" ,automake) > + ("libtool" ,libtool))) Even though these weren't sorted to begin with, it would be nice to do so now. > + (arguments > + `(#:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'autogen Nitpick: as the sources do contain an actual =E2=80=98autogen.sh=E2=80=99= =E2=80=94 which we're not calling =E2=80=94 I'd just call this =E2=80=98bootstrap=E2=80=99 or s= o. Avoids confusion. > + (lambda* (#:key inputs #:allow-other-keys) It looks like something went wrong with the indentation of this block. The =E2=80=98(=E2=80=99 of =E2=80=98(lambda=E2=80=99 should be under the = first =E2=80=98d=E2=80=99 of =E2=80=98(add-after=E2=80=99. > + ;; these files are symlinks to /usr and cannot be used. Another nitpick: full-line comment, so =E2=80=98;; These=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") I'd move all of this to a separate snippet. These files can cause pain when building manually, too. > + (copy-file (string-append (assoc-ref inputs "intltool") > + "/share/intltool/Makefile.in.in") > + "po/Makefile.in.in") Ah, so this is what I was hunting down when your mail appeared. Good catch! I've taken the liberty to attach my patch[1] as well; it illustrates some of the points mentioned above. Do with it what you will... :-) Thanks! T G-R [1]: Audience question, somewhat: =E2=80=98guix lint=E2=80=99 complains t= hat hexchat@2.12.4: 'glib:bin' should probably be a native input If no-one disagrees I'll dig up why & add it in a follow-up. --------------331A5DE1AA72AA49F517B30D Content-Type: text/x-patch; name="0001-gnu-hexchat-Update-to-2.12.4.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-hexchat-Update-to-2.12.4.patch" =46rom b88935a8636c8c7258a9db172af9fe4706b06746 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Apr 2017 19:58:09 +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 | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 8a8dbd711..ee24e44e3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -166,16 +166,30 @@ 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/hexcha= t-" version ".tar.xz")) (sha256 (base32 - "1xnclfbrgbkqndxygi5f27q00jd7yy54jbd1061jmhxa6wzpibbd"))= )) + "0ficrx56knz5y297qb0x5y02339yvyv734z7kpcx1ixvb0qr2dgs"))= + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete incorrectly bootstrapped bundled files. + (for-each delete-file-recursively + (list "build-aux" "po/Makefile.in.in")) + ;; Delete dangling symlinks to a non-existent =E2=80=98= /usr=E2=80=99. + (for-each delete-file + (find-files "m4" "^[^a].*\\.m4$")) + #t)))) (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config) + (native-inputs `(("autoconf" ,autoconf) + ("autoconf-archive" ,autoconf-archive) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) ("intltool" ,intltool))) (inputs `(("dbus-glib" ,dbus-glib) ("dbus" ,dbus) @@ -190,6 +204,16 @@ 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 mig= ht be! + (add-before 'configure 'bootstrap + (lambda* (#:key inputs #:allow-other-keys) + (copy-file (string-append (assoc-ref inputs "intltool") + "/share/intltool/Makefile.in.in")= + "po/Makefile.in.in") + (zero? (system* "autoreconf" "-vfi"))))))) (synopsis "Graphical IRC Client") (description "HexChat lets you connect to multiple @dfn{Internet Relay Chat} (IR= C) --=20 2.11.0 --------------331A5DE1AA72AA49F517B30D-- --txVcjJ2tRD63mCUKsHDMfKloKutAfLlD4-- --7MCphg8xFAxNJcanXi1okASkJRbF5aqSs Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQFBBAEBCgArFiEEeqzfDJ8DWw5d4xcqkczbm0hUG5kFAlkGKsUNHG1lQHRvYmlh cy5ncgAKCRCRzNubSFQbmc3+B/42O3Kw6Wd/h8sUpM8TT6DFjHBVpiguejp6LqIa ilh0re9bj+scoVblXs3TEUPeoiKHnvFuwA8f66biGKYh3IldKe4g9NN3DdRSU4N1 sfBG6DN4RviffOj6wRWMzIM5LtjD+Ck1DlLTA7ZFTNg1AyS2aOXpKKQz35/jBeod tjXbAZG4C0knM8atJuxiNGYKbzak7q9kT/CJGblh41VR5XhVnk616dpuP5UiIyvq Q9haNUbCr2vEsKTkApEe/Sw8EG/VDDKgT4rdOFDouQtfjQPgf+kzy5EqZW545IIp Q17a3+9XwTljSJZPhncp34pJKZlk6f7Hlpxl/PrDPDDAkLM+ =/IQH -----END PGP SIGNATURE----- --7MCphg8xFAxNJcanXi1okASkJRbF5aqSs--