* [bug#46762] Make some changes to Mcabber stuff
@ 2021-02-25 4:39 Raghav Gururajan via Guix-patches via
2021-02-26 0:30 ` Danny Milosavljevic
0 siblings, 1 reply; 2+ messages in thread
From: Raghav Gururajan via Guix-patches via @ 2021-02-25 4:39 UTC (permalink / raw)
To: 46762
[-- Attachment #1.1.1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #1.1.2: 0001-gnu-loudmouth-Update-to-1.5.4.patch --]
[-- Type: text/x-patch, Size: 1137 bytes --]
From 49c131d97bc6802b11d9cf831473bea8f8c5646b Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Tue, 23 Feb 2021 15:41:48 -0500
Subject: [PATCH 01/10] gnu: loudmouth: Update to 1.5.4.
* gnu/packages/messaging.scm (loudmouth) [version]: Update to 1.5.4.
---
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 d6e160d5dc..0a09c4962f 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1889,7 +1889,7 @@ many bug fixes.")
(define-public loudmouth
(package
(name "loudmouth")
- (version "1.5.3")
+ (version "1.5.4")
(source
(origin
(method url-fetch)
@@ -1897,7 +1897,7 @@ many bug fixes.")
name "-" version ".tar.bz2"))
(sha256
(base32
- "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl"))))
+ "03adv5xc84l9brcx0dpyqyffmsclans8yfrpnd357k6x3wfckjri"))))
(build-system gnu-build-system)
(inputs
`(("glib" ,glib)
--
2.30.1
[-- Attachment #1.1.3: 0002-gnu-loudmouth-Disable-static-libraries.patch --]
[-- Type: text/x-patch, Size: 1337 bytes --]
From e189a40d6a86857cef6ef06c31b3b06253135a1c Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Wed, 24 Feb 2021 21:31:47 -0500
Subject: [PATCH 02/10] gnu: loudmouth: Disable static libraries.
* gnu/packages/messaging.scm (loudmouth) [arguments]: Add --disable-static
configure-flag and CFLAGS make-flag.
---
gnu/packages/messaging.scm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 0a09c4962f..033fe552b1 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1899,6 +1899,13 @@ many bug fixes.")
(base32
"03adv5xc84l9brcx0dpyqyffmsclans8yfrpnd357k6x3wfckjri"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags
+ (list
+ "--disable-static")
+ #:make-flags
+ (list
+ "CFLAGS=-Wno-error=all")))
(inputs
`(("glib" ,glib)
("gnutls" ,gnutls)
@@ -1906,7 +1913,7 @@ many bug fixes.")
(native-inputs
`(("pkg-config" ,pkg-config)
("check" ,check)
- ("glib" ,glib "bin") ; gtester
+ ("glib" ,glib "bin") ; gtester
("gtk-doc" ,gtk-doc)))
(home-page "https://mcabber.com/")
(description
--
2.30.1
[-- Attachment #1.1.4: 0003-gnu-loudmouth-Enable-GSSAPI.patch --]
[-- Type: text/x-patch, Size: 1067 bytes --]
From 84d5bcf66b117d70d18a3cdb16ddcec199fdc1c0 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Wed, 24 Feb 2021 21:52:45 -0500
Subject: [PATCH 03/10] gnu: loudmouth: Enable GSSAPI.
* gnu/packages/messaging.scm (loudmouth) [inputs]: Add mit-krb5.
---
gnu/packages/messaging.scm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 033fe552b1..405530c9e8 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -78,6 +78,7 @@
#:use-module (gnu packages guile)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
+ #:use-module (gnu packages kerberos)
#:use-module (gnu packages less)
#:use-module (gnu packages libcanberra)
#:use-module (gnu packages libidn)
@@ -1909,6 +1910,7 @@ many bug fixes.")
(inputs
`(("glib" ,glib)
("gnutls" ,gnutls)
+ ("krb5" ,mit-krb5)
("libidn" ,libidn)))
(native-inputs
`(("pkg-config" ,pkg-config)
--
2.30.1
[-- Attachment #1.1.5: 0004-gnu-loudmouth-Generate-documentation.patch --]
[-- Type: text/x-patch, Size: 1223 bytes --]
From f8e48eec796b6f37ca0558118cf22c5b6327248b Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Wed, 24 Feb 2021 22:48:01 -0500
Subject: [PATCH 04/10] gnu: loudmouth: Generate documentation.
* gnu/packages/messaging.scm (loudmouth) [outputs]: New output "doc".
[arguments]: Add --enable-gtk-doc and --with-html-dir configure-flags.
---
gnu/packages/messaging.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 405530c9e8..d01d1dd956 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1900,10 +1900,15 @@ many bug fixes.")
(base32
"03adv5xc84l9brcx0dpyqyffmsclans8yfrpnd357k6x3wfckjri"))))
(build-system gnu-build-system)
+ (outputs '("out" "doc"))
(arguments
`(#:configure-flags
(list
- "--disable-static")
+ "--disable-static"
+ "--enable-gtk-doc"
+ (string-append "--with-html-dir="
+ (assoc-ref %outputs "doc")
+ "/share/gtk-doc/html"))
#:make-flags
(list
"CFLAGS=-Wno-error=all")))
--
2.30.1
[-- Attachment #1.1.6: 0005-gnu-loudmouth-Change-build-system.patch --]
[-- Type: text/x-patch, Size: 1206 bytes --]
From 5729b2ecd2ba2cca687d354bf2871cd68317893c Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Wed, 24 Feb 2021 22:51:32 -0500
Subject: [PATCH 05/10] gnu: loudmouth: Change build system.
* gnu/packages/messaging.scm (loudmouth) [build-system]: Change from
gnu to glib-or-gtk.
[native-inputs]: Remove glib:bin.
---
gnu/packages/messaging.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index d01d1dd956..e28aa23f28 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1899,7 +1899,7 @@ many bug fixes.")
(sha256
(base32
"03adv5xc84l9brcx0dpyqyffmsclans8yfrpnd357k6x3wfckjri"))))
- (build-system gnu-build-system)
+ (build-system glib-or-gtk-build-system)
(outputs '("out" "doc"))
(arguments
`(#:configure-flags
@@ -1920,7 +1920,6 @@ many bug fixes.")
(native-inputs
`(("pkg-config" ,pkg-config)
("check" ,check)
- ("glib" ,glib "bin") ; gtester
("gtk-doc" ,gtk-doc)))
(home-page "https://mcabber.com/")
(description
--
2.30.1
[-- Attachment #1.1.7: 0006-gnu-mcabber-Update-to-1.1.2.patch --]
[-- Type: text/x-patch, Size: 1172 bytes --]
From c2ea93789fad77a5e2ded7ea11422ff4023280cf Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Wed, 24 Feb 2021 22:54:15 -0500
Subject: [PATCH 06/10] gnu: mcabber: Update to 1.1.2.
* gnu/packages/messaging.scm (mcabber) [version]: Update to 1.1.2.
---
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 e28aa23f28..90ef3e8a67 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1934,14 +1934,14 @@ protocol allows.")
(define-public mcabber
(package
(name "mcabber")
- (version "1.1.1")
+ (version "1.1.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://mcabber.com/files/"
name "-" version ".tar.bz2"))
(sha256
- (base32 "0ngrcc8nzpzk4vw36ni3w073149zsi0yjh922xy9cy5a7srwx2fp"))))
+ (base32 "0q1i5acyghsmzas88qswvki8kkk2nfpr8zapgnxbcd3lwcxl38f4"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags (list "--enable-otr"
--
2.30.1
[-- Attachment #1.1.8: 0007-gnu-mcabber-Add-missing-native-inputs.patch --]
[-- Type: text/x-patch, Size: 1004 bytes --]
From c32fb4d7bcbcc6a68d1a3ed1532be4851e4e1a7b Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Wed, 24 Feb 2021 22:58:51 -0500
Subject: [PATCH 07/10] gnu: mcabber: Add missing native-inputs.
* gnu/packages/messaging.scm (mcabber) [native-inputs]: Add perl and
python-wrapper.
---
gnu/packages/messaging.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 90ef3e8a67..95df1d9f40 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1955,7 +1955,9 @@ protocol allows.")
("ncurses" ,ncurses)
("loudmouth" ,loudmouth)))
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)))
(home-page "https://mcabber.com")
(description
"Mcabber is a small XMPP (Jabber) console client, which includes features
--
2.30.1
[-- Attachment #1.1.9: 0008-gnu-mcabber-Disable-static-libraries.patch --]
[-- Type: text/x-patch, Size: 1078 bytes --]
From 08776ac09eae57a6227a1819cf952bc88e99b437 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Wed, 24 Feb 2021 23:09:27 -0500
Subject: [PATCH 08/10] gnu: mcabber: Disable static libraries.
* gnu/packages/messaging.scm (mcabber) [arguments]: Add --disable-static
configure-flag.
---
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 95df1d9f40..1655fbbb8d 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1944,8 +1944,11 @@ protocol allows.")
(base32 "0q1i5acyghsmzas88qswvki8kkk2nfpr8zapgnxbcd3lwcxl38f4"))))
(build-system gnu-build-system)
(arguments
- '(#:configure-flags (list "--enable-otr"
- "--enable-aspell")))
+ `(#:configure-flags
+ (list
+ "--disable-static"
+ "--enable-otr"
+ "--enable-aspell")))
(inputs
`(("gpgme" ,gpgme)
("libotr" ,libotr)
--
2.30.1
[-- Attachment #1.1.10: 0009-gnu-mcabber-Enable-enchant-support.patch --]
[-- Type: text/x-patch, Size: 992 bytes --]
From 9e03ec84e51e3a2c78366ff41b833bfbf936ade5 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Wed, 24 Feb 2021 23:13:40 -0500
Subject: [PATCH 09/10] gnu: mcabber: Enable enchant support.
* gnu/packages/messaging.scm (mcabber) [arguments]: Add --enable-enchant
configure-flag.
[inputs]: Add enchant.
---
gnu/packages/messaging.scm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 1655fbbb8d..9dad3f1ff6 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1948,11 +1948,13 @@ protocol allows.")
(list
"--disable-static"
"--enable-otr"
+ "--enable-enchant"
"--enable-aspell")))
(inputs
`(("gpgme" ,gpgme)
("libotr" ,libotr)
("aspell" ,aspell)
+ ("enchant" ,enchant-1.6)
("libidn" ,libidn)
("glib" ,glib)
("ncurses" ,ncurses)
--
2.30.1
[-- Attachment #1.1.11: 0010-gnu-mcabber-Change-build-system.patch --]
[-- Type: text/x-patch, Size: 930 bytes --]
From fe3a1e3f041d875b857fbb88a88a610025d28633 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Wed, 24 Feb 2021 23:34:29 -0500
Subject: [PATCH 10/10] gnu: mcabber: Change build system.
* gnu/packages/messaging.scm (mcabber) [build-system]: Change from
gnu to glib-or-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 9dad3f1ff6..2870217ec1 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1942,7 +1942,7 @@ protocol allows.")
name "-" version ".tar.bz2"))
(sha256
(base32 "0q1i5acyghsmzas88qswvki8kkk2nfpr8zapgnxbcd3lwcxl38f4"))))
- (build-system gnu-build-system)
+ (build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags
(list
--
2.30.1
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [bug#46762] Make some changes to Mcabber stuff
2021-02-25 4:39 [bug#46762] Make some changes to Mcabber stuff Raghav Gururajan via Guix-patches via
@ 2021-02-26 0:30 ` Danny Milosavljevic
0 siblings, 0 replies; 2+ messages in thread
From: Danny Milosavljevic @ 2021-02-26 0:30 UTC (permalink / raw)
To: 46762; +Cc: Raghav Gururajan, 46762-done
[-- Attachment #1: Type: text/plain, Size: 129 bytes --]
Pushed to guix master as commits 866e2b121c297bafb801652b4ec856b4515a3559..703005e88e19b07d5a55e4dfd36b01e00e66fc1f.
Thanks!
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-26 0:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-25 4:39 [bug#46762] Make some changes to Mcabber stuff Raghav Gururajan via Guix-patches via
2021-02-26 0:30 ` Danny Milosavljevic
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.