[PATCH 1/2] gnu: bitlbee: Update to 3.4.2.

[PATCH 1/2] gnu: bitlbee: Update to 3.4.2.

[Andy Wingo]

* gnu/packages/messaging.scm (bitlbee): Update to 3.4.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 fbe84f5..f094f85 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -94,13 +94,13 @@ keys, no previous conversation is compromised.")
 (define-public bitlbee
   (package
     (name "bitlbee")
-    (version "3.4.1")
+    (version "3.4.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://get.bitlbee.org/src/bitlbee-"
                                   version ".tar.gz"))
               (sha256
-               (base32 "1qf0ypa9ba5jvsnpg9slmaran16hcc5fnfzbb1sdch1hjhchn2jh"))))
+               (base32 "0mza8lnfwibmklz8hdzg4f7p83hblf4h6fbf7d732kzpvra5bj39"))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)
                      ("check" ,check)))
-- 
2.7.3

[PATCH 2/2] gnu: bitlbee: Incorporate upstream pre-release patches.

[Andy Wingo]

* gnu/packages/messaging.scm (%bitlbee-buddy-nick-change-patch):
(%bitlbee-always-use-nicks-patch): New variables.
(bitlbee): Add new patches.
---
 gnu/packages/messaging.scm | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index f094f85..a79efc3 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -91,6 +91,24 @@ keys, no previous conversation is compromised.")
     (home-page "https://otr.cypherpunks.ca/")
     (license (list lgpl2.1 gpl2))))
 
+;; These patches together fix https://github.com/bitlbee/bitlbee/pull/55, are
+;; already upstream, and should be unnecessary when the next bitlbee comes
+;; out.
+(define %bitlbee-buddy-nick-change-patch
+  (origin
+    (method url-fetch)
+    (uri "https://github.com/bitlbee/bitlbee/commit/a42fda42.patch")
+    (sha256
+     (base32
+      "1mzjhcdn0rxir5mzgqz9kv142ai38p1iq2lajqx89wb7x0bp51zx"))))
+(define %bitlbee-always-use-nicks-patch
+  (origin
+    (method url-fetch)
+    (uri "https://github.com/bitlbee/bitlbee/commit/3320d6d9.patch")
+    (sha256
+     (base32
+      "14d9kb5zdzh5hzakdvrbviz83rix0j2lq9rzb58b2fn92fp8yixd"))))
+
 (define-public bitlbee
   (package
     (name "bitlbee")
@@ -100,7 +118,10 @@ keys, no previous conversation is compromised.")
               (uri (string-append "https://get.bitlbee.org/src/bitlbee-"
                                   version ".tar.gz"))
               (sha256
-               (base32 "0mza8lnfwibmklz8hdzg4f7p83hblf4h6fbf7d732kzpvra5bj39"))))
+               (base32 "0mza8lnfwibmklz8hdzg4f7p83hblf4h6fbf7d732kzpvra5bj39"))
+              (patches
+               (list %bitlbee-buddy-nick-change-patch
+                     %bitlbee-always-use-nicks-patch))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)
                      ("check" ,check)))
-- 
2.7.3

Re: [PATCH 1/2] gnu: bitlbee: Update to 3.4.2.

[Mark H Weaver]

Andy Wingo <wingo@igalia.com> writes:
> * gnu/packages/messaging.scm (bitlbee): Update to 3.4.2.

Looks good to me, please push.

    Thanks!
      Mark

Re: [PATCH 2/2] gnu: bitlbee: Incorporate upstream pre-release patches.

[Mark H Weaver]

Andy Wingo <wingo@igalia.com> writes:

> * gnu/packages/messaging.scm (%bitlbee-buddy-nick-change-patch):
> (%bitlbee-always-use-nicks-patch): New variables.
> (bitlbee): Add new patches.

Okay, please push.

     Thanks!
       Mark