Make some changes to Profanity stuff

  • Done
  • quality assurance status badge
Details
2 participants
  • Leo Prikler
  • Raghav Gururajan
Owner
unassigned
Submitted by
Raghav Gururajan
Severity
normal
R
R
Raghav Gururajan wrote on 20 Feb 2021 04:08
(address . guix-patches@gnu.org)
adc3155a-d41a-b5ea-31e7-6ecd0fbeaf3e@raghavgururajan.name

From aff3b7f4d00497c13b36cc18bbaab377ba73236c 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/4] gnu: libmesode: Change source url and home-page to
official one.

* gnu/packages/messaging.scm (libmesode): Change source url and home-page to official one.
---
gnu/packages/messaging.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index a60c9ec8f6..375d90ae85 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2051,7 +2051,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
@@ -2070,7 +2070,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
From 66846151205e6f49a1391101caa095026c4d48cf Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Fri, 19 Feb 2021 19:46:39 -0500
Subject: [PATCH 2/4] gnu: profanity: Add missing inputs.

* gnu/packages/messaging.scm (profanity) [inputs]: Add libgcrypt.
---
gnu/packages/messaging.scm | 2 ++
1 file changed, 2 insertions(+)

Toggle diff (19 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 375d90ae85..f79fe93e7d 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2142,10 +2142,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
From 07e88a75facc34bf691f4efede96114644c93d43 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Fri, 19 Feb 2021 20:24:15 -0500
Subject: [PATCH 3/4] gnu: libmesode: Disable static libraries.

* gnu/packages/messaging.scm (libmesode) [arguments]<#:tests?>: New argument.
<#:configure-flags>[--disable-static]: New flag.
---
gnu/packages/messaging.scm | 5 +++++
1 file changed, 5 insertions(+)

Toggle diff (18 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index f79fe93e7d..189b789811 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2058,6 +2058,11 @@ is also scriptable and extensible via Guile.")
(base32
"1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; https://github.com/profanity-im/libmesode/issues/20
+ #:configure-flags
+ (list
+ "--disable-static")))
(inputs
`(("expat" ,expat)
("openssl" ,openssl)))
--
2.30.1
From 6293a8e4b2b9916b6091027caa218a84826b4bc9 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Fri, 19 Feb 2021 20:28:57 -0500
Subject: [PATCH 4/4] 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(+)

Toggle diff (14 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 189b789811..3806e092e5 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2126,6 +2126,7 @@ are both supported).")
(arguments
`(#:configure-flags
(list
+ "--disable-static"
"--enable-notifications"
"--enable-python-plugins"
"--enable-c-plugins"
--
2.30.1
Attachment: OpenPGP_signature
R
R
Raghav Gururajan wrote on 23 Feb 2021 18:08
Re: Make some changes to Profanity stuff (v2)
(address . 46653@debbugs.gnu.org)(name . Leo Prikler)(address . leo.prikler@student.tugraz.at)
13de1bda-3aa8-684c-3294-f6c37ab93cce@raghavgururajan.name

From ca55754d71e34d0a0e5f9406d0ba7714da811bac 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(-)

Toggle diff (24 lines)
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
From 7c9cb64cdf83eec4ab67a634a61e8ec1a21fffe4 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Fri, 19 Feb 2021 19:46:39 -0500
Subject: [PATCH 2/6] gnu: profanity: Add missing inputs.

* gnu/packages/messaging.scm (profanity) [inputs]: Add libgcrypt.
---
gnu/packages/messaging.scm | 2 ++
1 file changed, 2 insertions(+)

Toggle diff (19 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index a20a322725..2e339e8679 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2099,10 +2099,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
From 77a4ef5deb973f0605f2c8bd26f2065f6bcbe5e4 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Fri, 19 Feb 2021 20:24:15 -0500
Subject: [PATCH 3/6] gnu: libmesode: Disable static libraries.

* gnu/packages/messaging.scm (libmesode) [arguments]<#:tests?>: New argument.
<#:configure-flags>[--disable-static]: New flag.
---
gnu/packages/messaging.scm | 5 +++++
1 file changed, 5 insertions(+)

Toggle diff (18 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 2e339e8679..57a95bead3 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2015,6 +2015,11 @@ is also scriptable and extensible via Guile.")
(base32
"1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; https://github.com/profanity-im/libmesode/issues/20
+ #:configure-flags
+ (list
+ "--disable-static")))
(inputs
`(("expat" ,expat)
("openssl" ,openssl)))
--
2.30.1
From 3bfe888be7b96e6b1bc1283db179e5e644560b62 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Fri, 19 Feb 2021 20:28:57 -0500
Subject: [PATCH 4/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(+)

Toggle diff (14 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 57a95bead3..c7e010800b 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2083,6 +2083,7 @@ are both supported).")
(arguments
`(#:configure-flags
(list
+ "--disable-static"
"--enable-notifications"
"--enable-python-plugins"
"--enable-c-plugins"
--
2.30.1
From f04d8094b26ca57adc62f685aa60ae381c9fcece Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Tue, 23 Feb 2021 09:39:22 -0500
Subject: [PATCH 5/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(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index c7e010800b..f9173113bf 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2039,7 +2039,7 @@ manual SSL certificate verification.")
(define-public libstrophe
(package
(name "libstrophe")
- (version "0.9.3")
+ (version "0.10.1")
(source
(origin
(method git-fetch)
@@ -2048,7 +2048,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
From bd09f7f9f90a912cc130d6a1f882210f90d51b4d Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Tue, 23 Feb 2021 12:03:23 -0500
Subject: [PATCH 6/6] gnu: libstrophe: Disable static libraries.

* gnu/packages/messaging.scm (libstrope) [arguments]<#:tests?>: New argument.
<#:configure-flags>[--disable-static]: New flag.
---
gnu/packages/messaging.scm | 5 +++++
1 file changed, 5 insertions(+)

Toggle diff (18 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index f9173113bf..4bd5534fa6 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2050,6 +2050,11 @@ manual SSL certificate verification.")
(sha256
(base32 "11d341avsfr0z4lq15cy5dkmff6qpy91wkgzdpfdy31l27pa1g79"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; https://github.com/strophe/libstrophe/issues/175
+ #:configure-flags
+ (list
+ "--disable-static")))
(inputs
`(("expat" ,expat)
("openssl" ,openssl)))
--
2.30.1
Attachment: OpenPGP_signature
L
L
Leo Prikler wrote on 23 Feb 2021 18:28
73f708d8213aaac67e357bba5efd29fc6f8e1fbe.camel@student.tugraz.at
Hi Raghav,

Am Dienstag, den 23.02.2021, 12:08 -0500 schrieb Raghav Gururajan:
Toggle quote (6 lines)
> + (arguments
> + `(#:tests? #f ;
> https://github.com/profanity-im/libmesode/issues/20
> + #:configure-flags
> + (list
> + "--disable-static")))
There is just one failing test here. If there's really no way around
it, disable that one, but try to investigate the link error first.

Toggle quote (6 lines)
> + (arguments
> + `(#:tests? #f ;
> https://github.com/strophe/libstrophe/issues/175
> + #:configure-flags
> + (list
> + "--disable-static")))
Since this issue is related, we should really get to the roots of it.
Let's hope for a response.

The ordering of these patches seems a little weird. Could you group
them so that it's libmesode, then profanity, then libstrophe?

Regards,
Leo
R
R
Raghav Gururajan wrote on 23 Feb 2021 18:32
3cf8c70f-176e-74cb-d01e-15cd0043844a@raghavgururajan.name
Hi Leo!

Toggle quote (3 lines)
> There is just one failing test here. If there's really no way around
> it, disable that one, but try to investigate the link error first.

I already tried disabling that test. Two other tests that comes next to
it fail in same way.

Toggle quote (3 lines)
> Since this issue is related, we should really get to the roots of it.
> Let's hope for a response.

Yeah.

Toggle quote (3 lines)
> The ordering of these patches seems a little weird. Could you group
> them so that it's libmesode, then profanity, then libstrophe?

Sure.

Regards,
RG.
Attachment: OpenPGP_signature
L
L
Leo Prikler wrote on 23 Feb 2021 18:39
78adf800f0dc37d53ed9fc1727e89ec122b20f0f.camel@student.tugraz.at
Am Dienstag, den 23.02.2021, 12:32 -0500 schrieb Raghav Gururajan:
Toggle quote (9 lines)
> Hi Leo!
>
> > There is just one failing test here. If there's really no way
> > around
> > it, disable that one, but try to investigate the link error first.
>
> I already tried disabling that test. Two other tests that comes next
> to
> it fail in same way.
In other words all tests fail to build? That would indicate some
serious breakage.

Regards,
Leo
R
R
Raghav Gururajan wrote on 23 Feb 2021 18:41
b0bc6d3e-7b95-0160-5254-7f23f1aaacd9@raghavgururajan.name
Hi Leo!

Toggle quote (3 lines)
> In other words all tests fail to build? That would indicate some
> serious breakage.

That would be 3 tests.

Regards,
RG.
Attachment: OpenPGP_signature
R
R
Raghav Gururajan wrote on 23 Feb 2021 18:48
Re: Make some changes to Profanity stuff (v3)
c160daeb-08c7-727e-e5fb-f48ac2f4cb80@raghavgururajan.name
Hi Leo!

I have re-order the patches.

Regards,
RG.
From 6f8dd272536d8e775c12ba4c712a1661990c3cb0 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Fri, 19 Feb 2021 19:46:39 -0500
Subject: [PATCH 1/6] gnu: profanity: Add missing inputs.

* gnu/packages/messaging.scm (profanity) [inputs]: Add libgcrypt.
---
gnu/packages/messaging.scm | 2 ++
1 file changed, 2 insertions(+)

Toggle diff (19 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 1878c71c7d..a040c91283 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2099,10 +2099,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
From f1d581f0b1895399087c71dde8a9949d92522245 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Fri, 19 Feb 2021 20:28:57 -0500
Subject: [PATCH 2/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(+)

Toggle diff (14 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index a040c91283..a9ecfc9a6b 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2078,6 +2078,7 @@ are both supported).")
(arguments
`(#:configure-flags
(list
+ "--disable-static"
"--enable-notifications"
"--enable-python-plugins"
"--enable-c-plugins"
--
2.30.1
From 80888970e39c7d15eafa30bc37a100c6691771e4 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(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index a9ecfc9a6b..86dc232372 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2034,7 +2034,7 @@ manual SSL certificate verification.")
(define-public libstrophe
(package
(name "libstrophe")
- (version "0.9.3")
+ (version "0.10.1")
(source
(origin
(method git-fetch)
@@ -2043,7 +2043,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
From f150845dc2832e535b619d33b25d3a5797f8e041 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]<#:tests?>: New argument.
<#:configure-flags>[--disable-static]: New flag.
---
gnu/packages/messaging.scm | 5 +++++
1 file changed, 5 insertions(+)

Toggle diff (18 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 86dc232372..5319ce116f 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2045,6 +2045,11 @@ manual SSL certificate verification.")
(sha256
(base32 "11d341avsfr0z4lq15cy5dkmff6qpy91wkgzdpfdy31l27pa1g79"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; https://github.com/strophe/libstrophe/issues/175
+ #:configure-flags
+ (list
+ "--disable-static")))
(inputs
`(("expat" ,expat)
("openssl" ,openssl)))
--
2.30.1
From c78d83fdc8485f0b3c9cf61d8423ee49f9035de4 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Fri, 19 Feb 2021 19:37:30 -0500
Subject: [PATCH 5/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(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 5319ce116f..1f741a9164 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
From 5732c28480d10881d7163493947032d659702020 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Fri, 19 Feb 2021 20:24:15 -0500
Subject: [PATCH 6/6] gnu: libmesode: Disable static libraries.

* gnu/packages/messaging.scm (libmesode) [arguments]<#:tests?>: New argument.
<#:configure-flags>[--disable-static]: New flag.
---
gnu/packages/messaging.scm | 5 +++++
1 file changed, 5 insertions(+)

Toggle diff (18 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 1f741a9164..4bd5534fa6 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2015,6 +2015,11 @@ is also scriptable and extensible via Guile.")
(base32
"1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; https://github.com/profanity-im/libmesode/issues/20
+ #:configure-flags
+ (list
+ "--disable-static")))
(inputs
`(("expat" ,expat)
("openssl" ,openssl)))
--
2.30.1
Attachment: OpenPGP_signature
L
L
Leo Prikler wrote on 23 Feb 2021 19:01
049d3b368514b72d7c267fd9d7fdcf78e7059fe8.camel@student.tugraz.at
Am Dienstag, den 23.02.2021, 12:48 -0500 schrieb Raghav Gururajan:
Toggle quote (3 lines)
> Hi Leo!
>
> I have re-order the patches.
Great, now re-order them again so that no patch causes a rebuild of a
formerly patched package.

Toggle quote (1 lines)
> That would be 3 tests.
3 of how many? And how many on the other package?

Regards,
Leo
R
R
Raghav Gururajan wrote on 23 Feb 2021 21:01
Re: Make some changes to Profanity stuff (v4)
1c4c1c15-9230-1991-78d6-1fbbc322ebd5@raghavgururajan.name
Hi Leo!

Toggle quote (3 lines)
> Great, now re-order them again so that no patch causes a rebuild of a
> formerly patched package.

Done in v4.

Toggle quote (2 lines)
>> 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.
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(-)

Toggle diff (24 lines)
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
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(+)

Toggle diff (24 lines)
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
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(-)

Toggle diff (24 lines)
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
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(+)

Toggle diff (24 lines)
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
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(+)

Toggle diff (19 lines)
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
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(+)

Toggle diff (14 lines)
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: OpenPGP_signature
L
L
Leo Prikler wrote on 24 Feb 2021 01:02
526ee0970b3a580cd7eca3de171d50c424c123b4.camel@student.tugraz.at
Hi Raghav,

Am Dienstag, den 23.02.2021, 15:01 -0500 schrieb Raghav Gururajan:
Toggle quote (11 lines)
> 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.
Thanks! Pushed with some cosmetic changes.

Regards,
Leo
Closed
?