From: Raghav Gururajan via Guix-patches via <guix-patches@gnu.org>
To: Leo Prikler <leo.prikler@student.tugraz.at>, 46653@debbugs.gnu.org
Subject: [bug#46653] Make some changes to Profanity stuff (v4)
Date: Tue, 23 Feb 2021 15:01:35 -0500 [thread overview]
Message-ID: <1c4c1c15-9230-1991-78d6-1fbbc322ebd5@raghavgururajan.name> (raw)
In-Reply-To: <049d3b368514b72d7c267fd9d7fdcf78e7059fe8.camel@student.tugraz.at>
[-- Attachment #1.1.1: Type: text/plain, Size: 281 bytes --]
Hi Leo!
> Great, now re-order them again so that no patch causes a rebuild of a
> formerly patched package.
Done in v4.
>> That would be 3 tests.
> 3 of how many? And how many on the other package?
Tests are now fixed in v4, with the help of Tobias.
Regards,
RG.
[-- Attachment #1.1.2: 0001-gnu-libmesode-Update-source-home-page-URIs.patch --]
[-- Type: text/x-patch, Size: 1506 bytes --]
From 2e1a5f04edba75795aa260697e704b189f4ec41d Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Fri, 19 Feb 2021 19:37:30 -0500
Subject: [PATCH 1/6] gnu: libmesode: Update source, home-page URIs.
* gnu/packages/messaging.scm (libmesode) [source]: Update to new
upstream URI.
[home-page]: Same.
---
gnu/packages/messaging.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 1878c71c7d..a20a322725 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2008,7 +2008,7 @@ is also scriptable and extensible via Guile.")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/boothj5/libmesode")
+ (url "https://github.com/profanity-im/libmesode")
(commit version)))
(file-name (git-file-name name version))
(sha256
@@ -2027,7 +2027,7 @@ is also scriptable and extensible via Guile.")
(description "Libmesode is a fork of libstrophe for use with Profanity
XMPP Client. In particular, libmesode provides extra TLS functionality such as
manual SSL certificate verification.")
- (home-page "https://github.com/boothj5/libmesode")
+ (home-page "https://github.com/profanity/libmesode")
;; Dual-licensed.
(license (list license:gpl3+ license:x11))))
--
2.30.1
[-- Attachment #1.1.3: 0002-gnu-libmesode-Disable-static-libraries.patch --]
[-- Type: text/x-patch, Size: 1246 bytes --]
From 8d062edc31ca954c4896b3421128687037758bc4 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Fri, 19 Feb 2021 20:24:15 -0500
Subject: [PATCH 2/6] gnu: libmesode: Disable static libraries.
* gnu/packages/messaging.scm (libmesode) [arguments]<#:phases>['patch-make]: New phase.
<#:configure-flags>[--disable-static]: New flag.
---
gnu/packages/messaging.scm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index a20a322725..53515abe8b 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2015,6 +2015,17 @@ is also scriptable and extensible via Guile.")
(base32
"1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags
+ (list
+ "--disable-static")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-make
+ (lambda _
+ (substitute* "Makefile.am"
+ (("'\\^xmpp_'") "'.'"))
+ #t)))))
(inputs
`(("expat" ,expat)
("openssl" ,openssl)))
--
2.30.1
[-- Attachment #1.1.4: 0003-gnu-libstrophe-Update-to-0.10.1.patch --]
[-- Type: text/x-patch, Size: 1207 bytes --]
From bb38ac368dfd1cd8c1cae4783f1fd9b5368a2c52 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Tue, 23 Feb 2021 09:39:22 -0500
Subject: [PATCH 3/6] gnu: libstrophe: Update to 0.10.1.
* gnu/packages/messaging.scm (libstrophe) [version]: Update to 0.10.1.
---
gnu/packages/messaging.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 53515abe8b..14d4a0052a 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2045,7 +2045,7 @@ manual SSL certificate verification.")
(define-public libstrophe
(package
(name "libstrophe")
- (version "0.9.3")
+ (version "0.10.1")
(source
(origin
(method git-fetch)
@@ -2054,7 +2054,7 @@ manual SSL certificate verification.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1g1l0w9z9hdy5ncdvd9097gi7k7783did6py5h9camlpb2fnk5mk"))))
+ (base32 "11d341avsfr0z4lq15cy5dkmff6qpy91wkgzdpfdy31l27pa1g79"))))
(build-system gnu-build-system)
(inputs
`(("expat" ,expat)
--
2.30.1
[-- Attachment #1.1.5: 0004-gnu-libstrophe-Disable-static-libraries.patch --]
[-- Type: text/x-patch, Size: 1231 bytes --]
From 9a5e084babd6ad1bef077e63257f2e5c7c230167 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Tue, 23 Feb 2021 12:03:23 -0500
Subject: [PATCH 4/6] gnu: libstrophe: Disable static libraries.
* gnu/packages/messaging.scm (libstrope) [arguments]<#:phases>['patch-make]: New phase.
<#:configure-flags>[--disable-static]: New flag.
---
gnu/packages/messaging.scm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 14d4a0052a..5f2df4c6fc 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2056,6 +2056,17 @@ manual SSL certificate verification.")
(sha256
(base32 "11d341avsfr0z4lq15cy5dkmff6qpy91wkgzdpfdy31l27pa1g79"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags
+ (list
+ "--disable-static")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-make
+ (lambda _
+ (substitute* "Makefile.am"
+ (("'\\^xmpp_'") "'.'"))
+ #t)))))
(inputs
`(("expat" ,expat)
("openssl" ,openssl)))
--
2.30.1
[-- Attachment #1.1.6: 0005-gnu-profanity-Add-missing-inputs.patch --]
[-- Type: text/x-patch, Size: 992 bytes --]
From 06dfa7fb50fcb29faa2ae4f465612cb0daa51368 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Fri, 19 Feb 2021 19:46:39 -0500
Subject: [PATCH 5/6] gnu: profanity: Add missing inputs.
* gnu/packages/messaging.scm (profanity) [inputs]: Add libgcrypt.
---
gnu/packages/messaging.scm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 5f2df4c6fc..1f4c7aae4d 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2121,10 +2121,12 @@ are both supported).")
("glib" ,glib)
("gpgme" ,gpgme)
("gtk+" ,gtk+-2)
+ ("libgcrypt" ,libgcrypt)
("libmesode" ,libmesode)
("libnotify" ,libnotify)
("libotr" ,libotr)
("libsignal-protocol-c" ,libsignal-protocol-c)
+ ;; ("libxss" ,libxss)
("ncurses" ,ncurses)
("openssl" ,openssl)
("python" ,python-wrapper)
--
2.30.1
[-- Attachment #1.1.7: 0006-gnu-profanity-Disable-static-libraries.patch --]
[-- Type: text/x-patch, Size: 823 bytes --]
From 90d6f7db7fdfadfb5ebc546702fe0c1a468bc92e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Fri, 19 Feb 2021 20:28:57 -0500
Subject: [PATCH 6/6] gnu: profanity: Disable static libraries.
* gnu/packages/messaging.scm (profanity) [arguments]<#:configure-flag>: Add --disable-static.
---
gnu/packages/messaging.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 1f4c7aae4d..d6e160d5dc 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2100,6 +2100,7 @@ are both supported).")
(arguments
`(#:configure-flags
(list
+ "--disable-static"
"--enable-notifications"
"--enable-python-plugins"
"--enable-c-plugins"
--
2.30.1
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
next prev parent reply other threads:[~2021-02-23 20:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-20 3:08 [bug#46653] Make some changes to Profanity stuff Raghav Gururajan via Guix-patches via
[not found] ` <handler.46653.B.161379050225230.ack@debbugs.gnu.org>
2021-02-23 17:08 ` [bug#46653] Make some changes to Profanity stuff (v2) Raghav Gururajan via Guix-patches via
2021-02-23 17:28 ` Leo Prikler
2021-02-23 17:32 ` Raghav Gururajan via Guix-patches via
2021-02-23 17:39 ` Leo Prikler
2021-02-23 17:41 ` Raghav Gururajan via Guix-patches via
2021-02-23 17:48 ` [bug#46653] Make some changes to Profanity stuff (v3) Raghav Gururajan via Guix-patches via
2021-02-23 18:01 ` Leo Prikler
2021-02-23 20:01 ` Raghav Gururajan via Guix-patches via [this message]
2021-02-24 0:02 ` bug#46653: Make some changes to Profanity stuff (v4) Leo Prikler
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1c4c1c15-9230-1991-78d6-1fbbc322ebd5@raghavgururajan.name \
--to=guix-patches@gnu.org \
--cc=46653@debbugs.gnu.org \
--cc=leo.prikler@student.tugraz.at \
--cc=rg@raghavgururajan.name \
/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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.