* [bug#46653] Make some changes to Profanity stuff @ 2021-02-20 3:08 Raghav Gururajan via Guix-patches via [not found] ` <handler.46653.B.161379050225230.ack@debbugs.gnu.org> 0 siblings, 1 reply; 10+ messages in thread From: Raghav Gururajan via Guix-patches via @ 2021-02-20 3:08 UTC (permalink / raw) To: 46653 [-- Attachment #1.1.1: Type: text/plain, Size: 0 bytes --] [-- Attachment #1.1.2: 0001-gnu-libmesode-Change-source-url-and-home-page-to-off.patch --] [-- Type: text/x-patch, Size: 1517 bytes --] 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(-) 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 [-- Attachment #1.1.3: 0002-gnu-profanity-Add-missing-inputs.patch --] [-- Type: text/x-patch, Size: 992 bytes --] 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(+) 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 [-- Attachment #1.1.4: 0003-gnu-libmesode-Disable-static-libraries.patch --] [-- Type: text/x-patch, Size: 1083 bytes --] 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(+) 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 [-- Attachment #1.1.5: 0004-gnu-profanity-Disable-static-libraries.patch --] [-- Type: text/x-patch, Size: 823 bytes --] 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(+) 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 #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 236 bytes --] ^ permalink raw reply related [flat|nested] 10+ messages in thread
[parent not found: <handler.46653.B.161379050225230.ack@debbugs.gnu.org>]
* [bug#46653] Make some changes to Profanity stuff (v2) [not found] ` <handler.46653.B.161379050225230.ack@debbugs.gnu.org> @ 2021-02-23 17:08 ` Raghav Gururajan via Guix-patches via 2021-02-23 17:28 ` Leo Prikler 0 siblings, 1 reply; 10+ messages in thread From: Raghav Gururajan via Guix-patches via @ 2021-02-23 17:08 UTC (permalink / raw) To: 46653; +Cc: Leo Prikler [-- Attachment #1.1.1: Type: text/plain, Size: 0 bytes --] [-- Attachment #1.1.2: 0001-gnu-libmesode-Update-source-home-page-URIs.patch --] [-- Type: text/x-patch, Size: 1506 bytes --] 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(-) 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-profanity-Add-missing-inputs.patch --] [-- Type: text/x-patch, Size: 992 bytes --] 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(+) 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 [-- Attachment #1.1.4: 0003-gnu-libmesode-Disable-static-libraries.patch --] [-- Type: text/x-patch, Size: 1083 bytes --] 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(+) 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 [-- Attachment #1.1.5: 0004-gnu-profanity-Disable-static-libraries.patch --] [-- Type: text/x-patch, Size: 823 bytes --] 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(+) 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 [-- Attachment #1.1.6: 0005-gnu-libstrophe-Update-to-0.10.1.patch --] [-- Type: text/x-patch, Size: 1207 bytes --] 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(-) 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 [-- Attachment #1.1.7: 0006-gnu-libstrophe-Disable-static-libraries.patch --] [-- Type: text/x-patch, Size: 1065 bytes --] 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(+) 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 #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 236 bytes --] ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [bug#46653] Make some changes to Profanity stuff (v2) 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 0 siblings, 1 reply; 10+ messages in thread From: Leo Prikler @ 2021-02-23 17:28 UTC (permalink / raw) To: Raghav Gururajan, 46653 Hi Raghav, Am Dienstag, den 23.02.2021, 12:08 -0500 schrieb Raghav Gururajan: > + (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. > + (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 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [bug#46653] Make some changes to Profanity stuff (v2) 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 0 siblings, 1 reply; 10+ messages in thread From: Raghav Gururajan via Guix-patches via @ 2021-02-23 17:32 UTC (permalink / raw) To: Leo Prikler, 46653 [-- Attachment #1.1: Type: text/plain, Size: 533 bytes --] 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. > Since this issue is related, we should really get to the roots of it. > Let's hope for a response. Yeah. > 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 #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 236 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* [bug#46653] Make some changes to Profanity stuff (v2) 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 0 siblings, 1 reply; 10+ messages in thread From: Leo Prikler @ 2021-02-23 17:39 UTC (permalink / raw) To: Raghav Gururajan, 46653 Am Dienstag, den 23.02.2021, 12:32 -0500 schrieb Raghav Gururajan: > 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 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [bug#46653] Make some changes to Profanity stuff (v2) 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 0 siblings, 1 reply; 10+ messages in thread From: Raghav Gururajan via Guix-patches via @ 2021-02-23 17:41 UTC (permalink / raw) To: Leo Prikler, 46653 [-- Attachment #1.1.1: Type: text/plain, Size: 144 bytes --] Hi Leo! > In other words all tests fail to build? That would indicate some > serious breakage. That would be 3 tests. Regards, RG. [-- Attachment #1.1.2: OpenPGP_0x5F5816647F8BE551.asc --] [-- Type: application/pgp-keys, Size: 2649 bytes --] [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 236 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* [bug#46653] Make some changes to Profanity stuff (v3) 2021-02-23 17:41 ` Raghav Gururajan via Guix-patches via @ 2021-02-23 17:48 ` Raghav Gururajan via Guix-patches via 2021-02-23 18:01 ` Leo Prikler 0 siblings, 1 reply; 10+ messages in thread From: Raghav Gururajan via Guix-patches via @ 2021-02-23 17:48 UTC (permalink / raw) To: Leo Prikler, 46653 [-- Attachment #1.1.1: Type: text/plain, Size: 58 bytes --] Hi Leo! I have re-order the patches. Regards, RG. [-- Attachment #1.1.2: 0001-gnu-profanity-Add-missing-inputs.patch --] [-- Type: text/x-patch, Size: 992 bytes --] 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(+) 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 [-- Attachment #1.1.3: 0002-gnu-profanity-Disable-static-libraries.patch --] [-- Type: text/x-patch, Size: 823 bytes --] 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(+) 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 [-- Attachment #1.1.4: 0003-gnu-libstrophe-Update-to-0.10.1.patch --] [-- Type: text/x-patch, Size: 1207 bytes --] 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(-) 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 [-- Attachment #1.1.5: 0004-gnu-libstrophe-Disable-static-libraries.patch --] [-- Type: text/x-patch, Size: 1065 bytes --] 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(+) 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 [-- Attachment #1.1.6: 0005-gnu-libmesode-Update-source-home-page-URIs.patch --] [-- Type: text/x-patch, Size: 1506 bytes --] 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(-) 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 [-- Attachment #1.1.7: 0006-gnu-libmesode-Disable-static-libraries.patch --] [-- Type: text/x-patch, Size: 1083 bytes --] 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(+) 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 #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 236 bytes --] ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [bug#46653] Make some changes to Profanity stuff (v3) 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 ` [bug#46653] Make some changes to Profanity stuff (v4) Raghav Gururajan via Guix-patches via 0 siblings, 1 reply; 10+ messages in thread From: Leo Prikler @ 2021-02-23 18:01 UTC (permalink / raw) To: Raghav Gururajan, 46653 Am Dienstag, den 23.02.2021, 12:48 -0500 schrieb Raghav Gururajan: > 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. > That would be 3 tests. 3 of how many? And how many on the other package? Regards, Leo ^ permalink raw reply [flat|nested] 10+ messages in thread
* [bug#46653] Make some changes to Profanity stuff (v4) 2021-02-23 18:01 ` Leo Prikler @ 2021-02-23 20:01 ` Raghav Gururajan via Guix-patches via 2021-02-24 0:02 ` bug#46653: " Leo Prikler 0 siblings, 1 reply; 10+ messages in thread From: Raghav Gururajan via Guix-patches via @ 2021-02-23 20:01 UTC (permalink / raw) To: Leo Prikler, 46653 [-- 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 --] ^ permalink raw reply related [flat|nested] 10+ messages in thread
* bug#46653: Make some changes to Profanity stuff (v4) 2021-02-23 20:01 ` [bug#46653] Make some changes to Profanity stuff (v4) Raghav Gururajan via Guix-patches via @ 2021-02-24 0:02 ` Leo Prikler 0 siblings, 0 replies; 10+ messages in thread From: Leo Prikler @ 2021-02-24 0:02 UTC (permalink / raw) To: Raghav Gururajan, 46653-done Hi Raghav, Am Dienstag, den 23.02.2021, 15:01 -0500 schrieb Raghav Gururajan: > 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 ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-02-24 0:03 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 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 ` [bug#46653] Make some changes to Profanity stuff (v4) Raghav Gururajan via Guix-patches via 2021-02-24 0:02 ` bug#46653: " Leo Prikler
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.