From: Tobias Geerinckx-Rice <me@tobias.gr>
To: julien@lepiller.eu, 26718@debbugs.gnu.org
Subject: bug#26718: Update hexchat to 2.12.4
Date: Sun, 30 Apr 2017 20:19:49 +0200 [thread overview]
Message-ID: <e91cf3ea-eeff-74d9-d5cd-bfab0b00016c@tobias.gr> (raw)
In-Reply-To: <20170430192256.40abec3c@lepiller.eu>
[-- Attachment #1.1.1: Type: text/plain, Size: 2406 bytes --]
Julien,
On 30/04/17 19:22, Julien Lepiller wrote:
> Hi,
>
> here is a patch to update hexchat to 2.12.4.
...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 ‘autogen.sh’ — which we're
not calling — I'd just call this ‘bootstrap’ or so. Avoids confusion.
> + (lambda* (#:key inputs #:allow-other-keys)
It looks like something went wrong with the indentation of this block.
The ‘(’ of ‘(lambda’ should be under the first ‘d’ of ‘(add-after’.
> + ;; these files are symlinks to /usr and cannot be used.
Another nitpick: full-line comment, so ‘;; These’.
> + (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: ‘guix lint’ complains that
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.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.2: 0001-gnu-hexchat-Update-to-2.12.4.patch --]
[-- Type: text/x-patch; name="0001-gnu-hexchat-Update-to-2.12.4.patch", Size: 3183 bytes --]
From b88935a8636c8c7258a9db172af9fe4706b06746 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
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=UTF-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 ‘bootstrap’ 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/hexchat-"
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 ‘/usr’.
+ (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 might 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} (IRC)
--
2.11.0
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 504 bytes --]
next prev parent reply other threads:[~2017-04-30 18:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-30 17:22 bug#26718: Update hexchat to 2.12.4 Julien Lepiller
2017-04-30 18:19 ` Tobias Geerinckx-Rice [this message]
2017-04-30 19:35 ` Julien Lepiller
2017-04-30 20:05 ` Leo Famulari
2017-04-30 21:11 ` Tobias Geerinckx-Rice
2017-05-01 7:52 ` Julien Lepiller
2017-05-05 20:21 ` Leo Famulari
2017-05-06 19:55 ` Leo Famulari
2017-05-06 21:08 ` Julien Lepiller
2017-05-06 22:02 ` Tobias Geerinckx-Rice
2017-05-06 8:22 ` bug#26718: (no subject) Julien Lepiller
2017-05-06 13:48 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e91cf3ea-eeff-74d9-d5cd-bfab0b00016c@tobias.gr \
--to=me@tobias.gr \
--cc=26718@debbugs.gnu.org \
--cc=julien@lepiller.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).