(name . Guix)(address . guix-patches@gnu.org)
20191024141000.l7qqh3ka4tlllxfj@rafflesia
[PATCH 0/2] gnu: profanity: Update to 0.7.1.
- Done
Details
- 2 participants
- Mathieu Othacehe
- Tanguy Le Carrour
- Owner
- unassigned
- Submitted by
- Tanguy Le Carrour
- Severity
- normal
T
T
[PATCH 1/2] gnu: profanity: Update to 0.7.1.
(address . 37903@debbugs.gnu.org)
20191024141224.ymmaelohihudavov@rafflesia
From 5eac4a4afd1211a4f40096f716d1aa15b4be9559 Mon Sep 17 00:00:00 2001
From: Tanguy Le Carrour <tanguy@bioneland.org>
Date: Thu, 24 Oct 2019 15:51:34 +0200
Subject: [PATCH 1/2] gnu: profanity: Update to 0.7.1.
* gnu/packages/messaging.scm (profanity): Update to 0.7.1.
---
gnu/packages/messaging.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
Toggle diff (32 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 741b3285e2..ca51024d2b 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -15,6 +15,7 @@
;;; Copyright � 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright � 2018 Leo Famulari <leo@famulari.name>
;;; Copyright � 2018 Pierre-Antoine Rouby <contact@parouby.fr>
+;;; Copyright � 2019 Tanguy Le Carrour <tanguy@bioneland.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1617,14 +1618,14 @@ are both supported).")
(define-public profanity
(package
(name "profanity")
- (version "0.5.1")
+ (version "0.7.1")
(source (origin
(method url-fetch)
- (uri (string-append "http://www.profanity.im/profanity-"
+ (uri (string-append "https://profanity-im.github.io/profanity-"
version ".tar.gz"))
(sha256
(base32
- "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3"))))
+ "0nxh81j8ky0fzv47pip1jb7rs5rrin3jx0f3h632bvpjiya45r1z"))))
(build-system gnu-build-system)
(inputs
`(("curl" ,curl)
--
2.23.0
T
[PATCH 2/2] gnu: profanity: Correct indentation.
(address . 37903@debbugs.gnu.org)
20191024141303.wc6sfpe5m4fi6ndx@rafflesia
From 4cde7142307210ececf842bb5a3d643cef8811f5 Mon Sep 17 00:00:00 2001
From: Tanguy Le Carrour <tanguy@bioneland.org>
Date: Thu, 24 Oct 2019 15:53:14 +0200
Subject: [PATCH 2/2] gnu: profanity: Correct indentation.
* gnu/packages/messaging.scm (profanity): Correct indentation.
---
gnu/packages/messaging.scm | 64 +++++++++++++++++++-------------------
1 file changed, 32 insertions(+), 32 deletions(-)
Toggle diff (78 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index ca51024d2b..f890ad8dd5 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1616,39 +1616,39 @@ are both supported).")
(license (list license:gpl3+ license:x11))))
(define-public profanity
- (package
- (name "profanity")
- (version "0.7.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://profanity-im.github.io/profanity-"
- version ".tar.gz"))
- (sha256
- (base32
- "0nxh81j8ky0fzv47pip1jb7rs5rrin3jx0f3h632bvpjiya45r1z"))))
- (build-system gnu-build-system)
- (inputs
- `(("curl" ,curl)
- ("expat" ,expat)
- ("glib" ,glib)
- ("gpgme" ,gpgme)
- ("libmesode" ,libmesode)
- ("libotr" ,libotr)
- ("ncurses" ,ncurses)
- ("openssl" ,openssl)
- ("readline" ,readline)))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("autoconf-archive" ,autoconf-archive)
- ("automake" ,automake)
- ("cmocka" ,cmocka)
- ("libtool" ,libtool)
- ("pkg-config" ,pkg-config)))
- (synopsis "Console-based XMPP client")
- (description "Profanity is a console based XMPP client written in C
+ (package
+ (name "profanity")
+ (version "0.7.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://profanity-im.github.io/profanity-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0nxh81j8ky0fzv47pip1jb7rs5rrin3jx0f3h632bvpjiya45r1z"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("curl" ,curl)
+ ("expat" ,expat)
+ ("glib" ,glib)
+ ("gpgme" ,gpgme)
+ ("libmesode" ,libmesode)
+ ("libotr" ,libotr)
+ ("ncurses" ,ncurses)
+ ("openssl" ,openssl)
+ ("readline" ,readline)))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("autoconf-archive" ,autoconf-archive)
+ ("automake" ,automake)
+ ("cmocka" ,cmocka)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)))
+ (synopsis "Console-based XMPP client")
+ (description "Profanity is a console based XMPP client written in C
using ncurses and libmesode, inspired by Irssi.")
- (home-page "http://www.profanity.im")
- (license license:gpl3+)))
+ (home-page "http://www.profanity.im")
+ (license license:gpl3+)))
(define-public libircclient
(package
--
2.23.0
M
Re: [bug#37903] [PATCH 1/2] gnu: profanity: Update to 0.7.1.
(address . guix-patches@gnu.org)(address . 37903@debbugs.gnu.org)
87wocuyvvj.fsf@gmail.com
Hello Tanguy,
Toggle quote (2 lines)
> * gnu/packages/messaging.scm (profanity): Update to 0.7.1.
This patch doesn't apply on master. Can you rebase it please?
You also need to add mention of the uri update in the commit message.
Thanks,
Mathieu
T
[PATCH v2 1/2] gnu: profanity: Update to 0.7.1.
(address . 37903@debbugs.gnu.org)
20191025124619.zkr4sf42j5rbsvsz@rafflesia
Sorry, I thought I had pull the latest master!
I also added something about the source URL in the commit message.
From fe29bf229aba44a4ddff2903c26f43d69b372819 Mon Sep 17 00:00:00 2001
From: Tanguy Le Carrour <tanguy@bioneland.org>
Date: Thu, 24 Oct 2019 15:51:34 +0200
Subject: [PATCH v2 1/2] gnu: profanity: Update to 0.7.1.
* gnu/packages/messaging.scm (profanity): Update to 0.7.1. Update
source URL to the one provided on the website.
---
gnu/packages/messaging.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
Toggle diff (32 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 741b3285e2..ca51024d2b 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -15,6 +15,7 @@
;;; Copyright � 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright � 2018 Leo Famulari <leo@famulari.name>
;;; Copyright � 2018 Pierre-Antoine Rouby <contact@parouby.fr>
+;;; Copyright � 2019 Tanguy Le Carrour <tanguy@bioneland.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1617,14 +1618,14 @@ are both supported).")
(define-public profanity
(package
(name "profanity")
- (version "0.5.1")
+ (version "0.7.1")
(source (origin
(method url-fetch)
- (uri (string-append "http://www.profanity.im/profanity-"
+ (uri (string-append "https://profanity-im.github.io/profanity-"
version ".tar.gz"))
(sha256
(base32
- "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3"))))
+ "0nxh81j8ky0fzv47pip1jb7rs5rrin3jx0f3h632bvpjiya45r1z"))))
(build-system gnu-build-system)
(inputs
`(("curl" ,curl)
--
2.23.0
T
[PATCH v2 2/2] gnu: profanity: Correct indentation.
(address . 37903@debbugs.gnu.org)
20191025124652.szspqcgdimbyqxb3@rafflesia
From 2fffd07b71d6dcecab6d8a9fc0e51fe4d8c13580 Mon Sep 17 00:00:00 2001
From: Tanguy Le Carrour <tanguy@bioneland.org>
Date: Thu, 24 Oct 2019 15:53:14 +0200
Subject: [PATCH v2 2/2] gnu: profanity: Correct indentation.
* gnu/packages/messaging.scm (profanity): Correct indentation.
---
gnu/packages/messaging.scm | 64 +++++++++++++++++++-------------------
1 file changed, 32 insertions(+), 32 deletions(-)
Toggle diff (78 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index ca51024d2b..f890ad8dd5 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1616,39 +1616,39 @@ are both supported).")
(license (list license:gpl3+ license:x11))))
(define-public profanity
- (package
- (name "profanity")
- (version "0.7.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://profanity-im.github.io/profanity-"
- version ".tar.gz"))
- (sha256
- (base32
- "0nxh81j8ky0fzv47pip1jb7rs5rrin3jx0f3h632bvpjiya45r1z"))))
- (build-system gnu-build-system)
- (inputs
- `(("curl" ,curl)
- ("expat" ,expat)
- ("glib" ,glib)
- ("gpgme" ,gpgme)
- ("libmesode" ,libmesode)
- ("libotr" ,libotr)
- ("ncurses" ,ncurses)
- ("openssl" ,openssl)
- ("readline" ,readline)))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("autoconf-archive" ,autoconf-archive)
- ("automake" ,automake)
- ("cmocka" ,cmocka)
- ("libtool" ,libtool)
- ("pkg-config" ,pkg-config)))
- (synopsis "Console-based XMPP client")
- (description "Profanity is a console based XMPP client written in C
+ (package
+ (name "profanity")
+ (version "0.7.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://profanity-im.github.io/profanity-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0nxh81j8ky0fzv47pip1jb7rs5rrin3jx0f3h632bvpjiya45r1z"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("curl" ,curl)
+ ("expat" ,expat)
+ ("glib" ,glib)
+ ("gpgme" ,gpgme)
+ ("libmesode" ,libmesode)
+ ("libotr" ,libotr)
+ ("ncurses" ,ncurses)
+ ("openssl" ,openssl)
+ ("readline" ,readline)))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("autoconf-archive" ,autoconf-archive)
+ ("automake" ,automake)
+ ("cmocka" ,cmocka)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)))
+ (synopsis "Console-based XMPP client")
+ (description "Profanity is a console based XMPP client written in C
using ncurses and libmesode, inspired by Irssi.")
- (home-page "http://www.profanity.im")
- (license license:gpl3+)))
+ (home-page "http://www.profanity.im")
+ (license license:gpl3+)))
(define-public libircclient
(package
--
2.23.0
M
Re: [bug#37903] [PATCH v2 1/2] gnu: profanity: Update to 0.7.1.
(name . Tanguy Le Carrour)(address . tanguy@bioneland.org)(address . 37903-done@debbugs.gnu.org)
CANVeeZzPHuXqrT8JGNJ_DGBJqCNLS5AYm2mLwmCUBddu8Qz_=g@mail.gmail.com
Hello Tanguy,
Toggle quote (3 lines)
> Sorry, I thought I had pull the latest master!
> I also added something about the source URL in the commit message.
The patch applying issue seems to come from an encoding issue. Could you
check the configuration of your mailer, or use git send-email instead?
You can convince yourself of the issue by trying to apply your patch,
from your email, using git am command.
I also edited the commit message of the first patch to follow commit log
conventions.
Thanks for your work :),
Mathieu
Closed
T
(name . Mathieu Othacehe)(address . m.othacehe@gmail.com)(address . 37903-done@debbugs.gnu.org)
20191025143142.kwxy5jn5qpaszbe7@rafflesia
Hi!
Le 10/25, Mathieu Othacehe a �crit :
Toggle quote (6 lines)
> > Sorry, I thought I had pull the latest master!
> > I also added something about the source URL in the commit message.
>
> The patch applying issue seems to come from an encoding issue. Could you
> check the configuration of your mailer, or use git send-email instead?
I'm sending patches with neomutt, but it turns out to be really painful
when there are more than 2 patches.
I'll configure `git send-email` asap!
Toggle quote (3 lines)
> I also edited the commit message of the first patch to follow commit log
> conventions.
Yeah, I have to work on that, sorry! I usually go through the log
history to find something similar, but it's not always successful!
Toggle quote (2 lines)
> Thanks for your work :),
Thanks for your!
--
Tanguy
Closed
?