From: Raghav Gururajan <raghavgururajan@disroot.org>
To: Danny Milosavljevic <dannym@scratchpost.org>
Cc: 43348@debbugs.gnu.org
Subject: [bug#43348] Profanity
Date: Sun, 13 Sep 2020 00:38:02 -0400 [thread overview]
Message-ID: <13b0be17-7d6d-dc37-c5d7-44171301f477@disroot.org> (raw)
In-Reply-To: <20200912025125.7540e02a@scratchpost.org>
[-- Attachment #1.1.1: Type: text/plain, Size: 1259 bytes --]
Hi Danny!
> please, for existing packages, try to be as clear as possible in the commit
> messages in what is changed (only one related set of things should be changed
> per commit).
>
> In this case the commit confounds things:
>
> * Changing the build-system reference. This does not enable runtime
> features--which is what the commit message's topic stated that the commit does.
> * Changing the autoconf method. This does not enable runtime features--which
> is what the commit message's topic stated that the commit does.
> * Adding Python as a NATIVE input. What is that about? Is profanity using
> a Python program as a compiler only?
> * I think that moving those native-inputs to inputs, while correct, does not
> enable runtime features--which is what the commit message's topic stated that
> the commit does.
> * Please use two spaces (after the period) in order to separate sentences.
> * Moving blocks around makes review much harder for users.
>
> The goal of those commit messages, and of the commit rules, is to make it
> easy for each user to see at a glance what topic each commit changes.
You are correct. I always do these in a hurry, sorry about that. Please
find the attached patches.
Regards,
RG.
[-- Attachment #1.1.2: 0001-gnu-profanity-Make-some-cosmetic-changes.patch --]
[-- Type: text/x-patch, Size: 2909 bytes --]
From 45c296918fbaa8b6f6e5d8d89616683e2934292b Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 13 Sep 2020 00:19:38 -0400
Subject: [PATCH 1/4] gnu: profanity: Make some cosmetic changes.
* gnu/packages/messaging.scm (profanity): Make some cosmetic changes.
---
gnu/packages/messaging.scm | 51 ++++++++++++++++++++------------------
1 file changed, 27 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 1f41f0cb8b..18919341f4 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1774,22 +1774,35 @@ are both supported).")
(package
(name "profanity")
(version "0.9.5")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://profanity-im.github.io/profanity-"
- version ".tar.gz"))
- (sha256
- (base32
- "00j9l9v62rz9hprgiy1vrz8v3v59ph18h8kskqxr31fgqvjv5xr3"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://profanity-im.github.io/profanity-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "00j9l9v62rz9hprgiy1vrz8v3v59ph18h8kskqxr31fgqvjv5xr3"))))
(build-system gnu-build-system)
(arguments
- '(#:configure-flags
- (list "--enable-c-plugins"
- "--enable-otr"
- "--enable-omemo"
- "--enable-pgp"
- "--enable-icons"
- "--enable-notifications")))
+ `(#:configure-flags
+ (list
+ "--enable-notifications"
+ "--enable-c-plugins"
+ "--enable-otr"
+ "--enable-pgp"
+ "--enable-omemo"
+ "--enable-icons")))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("autoconf-archive" ,autoconf-archive)
+ ("automake" ,automake)
+ ("cmocka" ,cmocka)
+ ("gtk+" ,gtk+-2)
+ ("libnotify" ,libnotify)
+ ("libtool" ,libtool)
+ ("libsignal-protocol-c" ,libsignal-protocol-c)
+ ("pkg-config" ,pkg-config)))
(inputs
`(("curl" ,curl)
("expat" ,expat)
@@ -1801,16 +1814,6 @@ are both supported).")
("openssl" ,openssl)
("readline" ,readline)
("sqlite" ,sqlite)))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("autoconf-archive" ,autoconf-archive)
- ("automake" ,automake)
- ("cmocka" ,cmocka)
- ("gtk+" ,gtk+-2)
- ("libnotify" ,libnotify)
- ("libtool" ,libtool)
- ("libsignal-protocol-c" ,libsignal-protocol-c)
- ("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.")
--
2.28.0
[-- Attachment #1.1.3: 0002-gnu-profanity-Move-some-dependencies.patch --]
[-- Type: text/x-patch, Size: 1462 bytes --]
From 564fd2546244744d32fe22461406b23ba6e84f0d Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 13 Sep 2020 00:22:25 -0400
Subject: [PATCH 2/4] gnu: profanity: Move some dependencies.
* gnu/packages/messaging.scm (profanity) [native-inputs]: Move gtk-2,
libnotify and libsignal-protocol-c to ...
[inputs]: ... here.
The above dependencies should have been added as inputs, instead of
native-inputs.
---
gnu/packages/messaging.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 18919341f4..13ed7b489c 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1798,18 +1798,18 @@ are both supported).")
("autoconf-archive" ,autoconf-archive)
("automake" ,automake)
("cmocka" ,cmocka)
- ("gtk+" ,gtk+-2)
- ("libnotify" ,libnotify)
("libtool" ,libtool)
- ("libsignal-protocol-c" ,libsignal-protocol-c)
("pkg-config" ,pkg-config)))
(inputs
`(("curl" ,curl)
("expat" ,expat)
("glib" ,glib)
("gpgme" ,gpgme)
+ ("gtk+" ,gtk+-2)
("libmesode" ,libmesode)
+ ("libnotify" ,libnotify)
("libotr" ,libotr)
+ ("libsignal-protocol-c" ,libsignal-protocol-c)
("ncurses" ,ncurses)
("openssl" ,openssl)
("readline" ,readline)
--
2.28.0
[-- Attachment #1.1.4: 0003-gnu-profanity-Enable-missing-features.patch --]
[-- Type: text/x-patch, Size: 1666 bytes --]
From 0207fce7eae5b41c5f4df32ffeddeb3bba3e25cd Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 13 Sep 2020 00:27:19 -0400
Subject: [PATCH 3/4] gnu: profanity: Enable missing features.
* gnu/packages/messaging.scm (profanity) [arguments]<#:configure-flags>
[--enable-python-plugins]: New flag.
[--enable-plugins]: New flag.
[--enable-icons-and-clipboard]: New flag.
[--enable-icons]: Remove flag.
[native-inputs]: Add python-wrapper.
The above changes enables support for general-plugins, python-plugins,
icons and clipboard. The python-wrapper is required to enable python-plugins.
---
gnu/packages/messaging.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 13ed7b489c..232d80a5fc 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1788,18 +1788,21 @@ are both supported).")
`(#:configure-flags
(list
"--enable-notifications"
+ "--enable-python-plugins"
"--enable-c-plugins"
+ "--enable-plugins"
"--enable-otr"
"--enable-pgp"
"--enable-omemo"
- "--enable-icons")))
+ "--enable-icons-and-clipboard")))
(native-inputs
`(("autoconf" ,autoconf)
("autoconf-archive" ,autoconf-archive)
("automake" ,automake)
("cmocka" ,cmocka)
("libtool" ,libtool)
- ("pkg-config" ,pkg-config)))
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)))
(inputs
`(("curl" ,curl)
("expat" ,expat)
--
2.28.0
[-- Attachment #1.1.5: 0004-gnu-profanity-Change-build-system.patch --]
[-- Type: text/x-patch, Size: 981 bytes --]
From 1c777d5bd598f97bf6978f863d6752e0942ab236 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 13 Sep 2020 00:30:10 -0400
Subject: [PATCH 4/4] gnu: profanity: Change build system.
* gnu/package/messaging.scm (profanity) [build-system]: Change from
gnu to glib-or-gtk.
Glib-or-gtk is the appropriate build system, as the package depends
on glib and gtk+.
---
gnu/packages/messaging.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 232d80a5fc..ef553e2acb 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1783,7 +1783,7 @@ are both supported).")
(sha256
(base32
"00j9l9v62rz9hprgiy1vrz8v3v59ph18h8kskqxr31fgqvjv5xr3"))))
- (build-system gnu-build-system)
+ (build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags
(list
--
2.28.0
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-09-13 4:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-11 19:52 [bug#43348] Profanity Raghav Gururajan
2020-09-12 0:51 ` Danny Milosavljevic
2020-09-13 4:38 ` Raghav Gururajan [this message]
2020-09-13 9:11 ` Danny Milosavljevic
2020-09-13 9:12 ` Raghav Gururajan
2020-09-13 9:54 ` bug#43348: Profanity Danny Milosavljevic
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=13b0be17-7d6d-dc37-c5d7-44171301f477@disroot.org \
--to=raghavgururajan@disroot.org \
--cc=43348@debbugs.gnu.org \
--cc=dannym@scratchpost.org \
/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).